AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

classic/nouveau: Remove driver

Browse Source 
This will now only be available in the Amber branch

Reviewed-by: Emma Anholt <emma@anholt.net>
Acked-by: Jason Ekstrand <jason@jlekstrand.net>
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10153>
This commit is contained in:
Dylan Baker
2021-04-09 09:51:38 -07:00
committed by Marge Bot
parent 184a690fca
commit f464871932
71 changed files with 7 additions and 18904 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/loader/meson.build
+1 -1
View File
@@ -51,7 +51,7 @@ endif
libloader = static_library(
'loader',
['loader_dri_helper.c', 'loader.c', 'pci_id_driver_map.c'],
['loader_dri_helper.c', 'loader.c'],
c_args : loader_c_args,
gnu_symbol_visibility : 'hidden',
include_directories : [inc_include, inc_src, inc_util],
src/loader/pci_id_driver_map.c
-59
View File
@@ -1,59 +0,0 @@
/*
* Copyright 2014 Ilia Mirkin
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
#include <stdbool.h>
bool is_nouveau_vieux(int fd);
#ifdef HAVE_LIBDRM
#include <stdlib.h>
#include <xf86drm.h>
#include <nouveau_drm.h>
static int
nouveau_chipset(int fd)
{
struct drm_nouveau_getparam gp = { NOUVEAU_GETPARAM_CHIPSET_ID, 0 };
int ret;
ret = drmCommandWriteRead(fd, DRM_NOUVEAU_GETPARAM, &gp, sizeof(gp));
if (ret)
return -1;
return gp.value;
}
bool
is_nouveau_vieux(int fd)
{
int chipset = nouveau_chipset(fd);
return (chipset > 0 && chipset < 0x30) ||
(chipset < 0x40 && getenv("NOUVEAU_VIEUX") != NULL);
}
#else
bool is_nouveau_vieux(int fd) { return false; }
#endif
src/loader/pci_id_driver_map.h
-2
View File
@@ -56,7 +56,6 @@ static const int vmwgfx_chip_ids[] = {
#undef CHIPSET
};
bool is_nouveau_vieux(int fd);
bool is_kernel_i915(int fd);
static const struct {
@@ -74,7 +73,6 @@ static const struct {
{ 0x1002, "r300", r300_chip_ids, ARRAY_SIZE(r300_chip_ids) },
{ 0x1002, "r600", r600_chip_ids, ARRAY_SIZE(r600_chip_ids) },
{ 0x1002, "radeonsi", NULL, -1 },
{ 0x10de, "nouveau_vieux", NULL, -1, is_nouveau_vieux },
{ 0x10de, "nouveau", NULL, -1, },
{ 0x1af4, "virtio_gpu", virtio_gpu_chip_ids, ARRAY_SIZE(virtio_gpu_chip_ids) },
{ 0x15ad, "vmwgfx", vmwgfx_chip_ids, ARRAY_SIZE(vmwgfx_chip_ids) },