OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i915c: Add a symlink for i830_dri.so

Browse Source 
The gallium driver doesn't support gen2, so let's make it possible to
keep both i915g and i830 drivers installed in parallel.

Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10554>
This commit is contained in:
Adam Jackson
2021-04-30 14:43:23 -04:00
committed by Marge Bot
parent 61b7e6578a
commit ceba7f6952
7 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/pci_ids/i830_pci_ids.h Normal file
View File

@@ -0,0 +1,4 @@
CHIPSET(0x3577, I830_M, "Intel(R) 830M")
CHIPSET(0x2562, 845_G, "Intel(R) 845G")
CHIPSET(0x3582, I855_GM, "Intel(R) 852GM/855GM")
CHIPSET(0x2572, I865_G, "Intel(R) 865G")

4
include/pci_ids/i915_pci_ids.h
View File

@@ -1,7 +1,3 @@
CHIPSET(0x3577, I830_M, "Intel(R) 830M")
CHIPSET(0x2562, 845_G, "Intel(R) 845G")
CHIPSET(0x3582, I855_GM, "Intel(R) 852GM/855GM")
CHIPSET(0x2572, I865_G, "Intel(R) 865G")
CHIPSET(0x2582, I915_G, "Intel(R) 915G") CHIPSET(0x2582, I915_G, "Intel(R) 915G")
CHIPSET(0x258A, E7221_G, "Intel(R) E7221G (i915)") CHIPSET(0x258A, E7221_G, "Intel(R) E7221G (i915)")
CHIPSET(0x2592, I915_GM, "Intel(R) 915GM") CHIPSET(0x2592, I915_GM, "Intel(R) 915GM")

7
src/loader/pci_id_driver_map.h
View File

@@ -8,6 +8,12 @@
# error "Only include from loader.c" # error "Only include from loader.c"
#endif #endif
static const int i830_chip_ids[] = {
#define CHIPSET(chip, desc, name) chip,
#include "pci_ids/i830_pci_ids.h"
#undef CHIPSET
};
static const int i915_chip_ids[] = { static const int i915_chip_ids[] = {
#define CHIPSET(chip, desc, name) chip, #define CHIPSET(chip, desc, name) chip,
#include "pci_ids/i915_pci_ids.h" #include "pci_ids/i915_pci_ids.h"
@@ -66,6 +72,7 @@ static const struct {
int num_chips_ids; int num_chips_ids;
bool (*predicate)(int fd); bool (*predicate)(int fd);
} driver_map[] = { } driver_map[] = {
{ 0x8086, "i830", i830_chip_ids, ARRAY_SIZE(i830_chip_ids) },
{ 0x8086, "i915", i915_chip_ids, ARRAY_SIZE(i915_chip_ids) }, { 0x8086, "i915", i915_chip_ids, ARRAY_SIZE(i915_chip_ids) },
{ 0x8086, "i965", i965_chip_ids, ARRAY_SIZE(i965_chip_ids) }, { 0x8086, "i965", i965_chip_ids, ARRAY_SIZE(i965_chip_ids) },
{ 0x8086, "iris", NULL, -1, is_kernel_i915 }, { 0x8086, "iris", NULL, -1, is_kernel_i915 },

1
src/mesa/drivers/dri/i915/intel_context.c
View File

@@ -72,6 +72,7 @@ i915_get_renderer_string(unsigned deviceID)
switch (deviceID) { switch (deviceID) {
#undef CHIPSET #undef CHIPSET
#define CHIPSET(id, symbol, str) case id: chipset = str; break; #define CHIPSET(id, symbol, str) case id: chipset = str; break;
#include "pci_ids/i830_pci_ids.h"
#include "pci_ids/i915_pci_ids.h" #include "pci_ids/i915_pci_ids.h"
default: default:
chipset = "Unknown Intel Chipset"; chipset = "Unknown Intel Chipset";

7
src/mesa/drivers/dri/i915/intel_screen.c
View File

@@ -1271,3 +1271,10 @@ PUBLIC const __DRIextension **__driDriverGetExtensions_i915(void)
return i915_driver_extensions; return i915_driver_extensions;
} }
PUBLIC const __DRIextension **__driDriverGetExtensions_i830(void)
{
globalDriverAPI = &i915_driver_api;
return i915_driver_extensions;
}

1
src/mesa/drivers/dri/i915/intel_screen.h
View File

@@ -158,6 +158,7 @@ extern void intelDestroyContext(__DRIcontext * driContextPriv);
extern GLboolean intelUnbindContext(__DRIcontext * driContextPriv); extern GLboolean intelUnbindContext(__DRIcontext * driContextPriv);
const __DRIextension **__driDriverGetExtensions_i830(void);
const __DRIextension **__driDriverGetExtensions_i915(void); const __DRIextension **__driDriverGetExtensions_i915(void);
extern const __DRI2fenceExtension intelFenceExtension; extern const __DRI2fenceExtension intelFenceExtension;

1
src/mesa/drivers/dri/meson.build
View File

@@ -25,6 +25,7 @@ _dri_link = []
if with_dri_i915 if with_dri_i915
subdir('i915') subdir('i915')
_dri_drivers += libi915 _dri_drivers += libi915
_dri_link += 'i830_dri.so'
_dri_link += 'i915_dri.so' _dri_link += 'i915_dri.so'
endif endif
if with_dri_i965 if with_dri_i965