|
|
842f3bc |
From 27043630ebb54fd1915c5d1814ab62079ca3eca9 Mon Sep 17 00:00:00 2001
|
|
|
842f3bc |
From: Hans de Goede <hdegoede@redhat.com>
|
|
|
842f3bc |
Date: Thu, 23 Mar 2017 12:54:07 +0100
|
|
|
842f3bc |
Subject: [PATCH xserver] xf86: dri2: Use va_gl as vdpau_driver for Intel i965
|
|
|
842f3bc |
GPUs
|
|
|
842f3bc |
|
|
|
842f3bc |
The modesetting driver (which now often is used with Intel GPUs),
|
|
|
842f3bc |
relies on dri2_probe_driver_name() to get the dri and vdpau driver
|
|
|
842f3bc |
names, before this commit it would always assign the same name to
|
|
|
842f3bc |
the 2 names. But the vdpau driver for i965 GPUs should be va_gl
|
|
|
842f3bc |
(i915 does not support vdpau at all).
|
|
|
842f3bc |
|
|
|
842f3bc |
This commit modifies the used lookup table and dri2_probe_driver_name()
|
|
|
842f3bc |
to set the vdpau_driver to va_gl for i965 GPUs, it leaves the 2
|
|
|
842f3bc |
names the same for all other GPUs.
|
|
|
842f3bc |
|
|
|
842f3bc |
Note this commit adds a FIXME comment for a memory leak in
|
|
|
842f3bc |
dri2_probe_driver_name(), that leak was already present and fixing
|
|
|
842f3bc |
it falls outside of the scope of this commit.
|
|
|
842f3bc |
|
|
|
842f3bc |
BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1413733
|
|
|
842f3bc |
Cc: kwizart@gmail.com
|
|
|
842f3bc |
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
|
842f3bc |
---
|
|
|
842f3bc |
hw/xfree86/dri2/dri2.c | 36 +++++++++++++++++++----------
|
|
|
842f3bc |
hw/xfree86/dri2/pci_ids/pci_id_driver_map.h | 21 +++++++++--------
|
|
|
842f3bc |
2 files changed, 35 insertions(+), 22 deletions(-)
|
|
|
842f3bc |
|
|
|
842f3bc |
diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c
|
|
|
842f3bc |
index 2165603..d0366746 100644
|
|
|
842f3bc |
--- a/hw/xfree86/dri2/dri2.c
|
|
|
842f3bc |
+++ b/hw/xfree86/dri2/dri2.c
|
|
|
842f3bc |
@@ -1437,14 +1437,19 @@ get_prime_id(void)
|
|
|
842f3bc |
|
|
|
842f3bc |
#include "pci_ids/pci_id_driver_map.h"
|
|
|
842f3bc |
|
|
|
842f3bc |
-static char *
|
|
|
842f3bc |
-dri2_probe_driver_name(ScreenPtr pScreen, DRI2InfoPtr info)
|
|
|
842f3bc |
+static void
|
|
|
842f3bc |
+dri2_probe_driver_name(ScreenPtr pScreen, DRI2InfoPtr info,
|
|
|
842f3bc |
+ const char **dri_driver_ret,
|
|
|
842f3bc |
+ const char **vdpau_driver_ret)
|
|
|
842f3bc |
{
|
|
|
842f3bc |
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
|
|
|
842f3bc |
EntityInfoPtr pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
|
|
|
842f3bc |
struct pci_device *pdev = NULL;
|
|
|
842f3bc |
int i, j;
|
|
|
842f3bc |
|
|
|
842f3bc |
+ *dri_driver_ret = NULL;
|
|
|
842f3bc |
+ *vdpau_driver_ret = NULL;
|
|
|
842f3bc |
+
|
|
|
842f3bc |
if (pEnt)
|
|
|
842f3bc |
pdev = xf86GetPciInfoForEntity(pEnt->index);
|
|
|
842f3bc |
|
|
|
842f3bc |
@@ -1454,30 +1459,37 @@ dri2_probe_driver_name(ScreenPtr pScreen, DRI2InfoPtr info)
|
|
|
842f3bc |
*/
|
|
|
842f3bc |
if (!pdev) {
|
|
|
842f3bc |
drmVersionPtr version = drmGetVersion(info->fd);
|
|
|
842f3bc |
- char *kernel_driver;
|
|
|
842f3bc |
|
|
|
842f3bc |
if (!version) {
|
|
|
842f3bc |
xf86DrvMsg(pScreen->myNum, X_ERROR,
|
|
|
842f3bc |
"[DRI2] Couldn't drmGetVersion() on non-PCI device, "
|
|
|
842f3bc |
"no driver name found.\n");
|
|
|
842f3bc |
- return NULL;
|
|
|
842f3bc |
+ return;
|
|
|
842f3bc |
}
|
|
|
842f3bc |
|
|
|
842f3bc |
- kernel_driver = strndup(version->name, version->name_len);
|
|
|
842f3bc |
+ /* FIXME this gets leaked */
|
|
|
842f3bc |
+ *dri_driver_ret = strndup(version->name, version->name_len);
|
|
|
842f3bc |
+ *vdpau_driver_ret = *dri_driver_ret;
|
|
|
842f3bc |
drmFreeVersion(version);
|
|
|
842f3bc |
- return kernel_driver;
|
|
|
842f3bc |
+ return;
|
|
|
842f3bc |
}
|
|
|
842f3bc |
|
|
|
842f3bc |
for (i = 0; driver_map[i].driver; i++) {
|
|
|
842f3bc |
if (pdev->vendor_id != driver_map[i].vendor_id)
|
|
|
842f3bc |
continue;
|
|
|
842f3bc |
|
|
|
842f3bc |
- if (driver_map[i].num_chips_ids == -1)
|
|
|
842f3bc |
- return strdup(driver_map[i].driver);
|
|
|
842f3bc |
+ if (driver_map[i].num_chips_ids == -1) {
|
|
|
842f3bc |
+ *dri_driver_ret = driver_map[i].driver;
|
|
|
842f3bc |
+ *vdpau_driver_ret = driver_map[i].vdpau_driver;
|
|
|
842f3bc |
+ return;
|
|
|
842f3bc |
+ }
|
|
|
842f3bc |
|
|
|
842f3bc |
for (j = 0; j < driver_map[i].num_chips_ids; j++) {
|
|
|
842f3bc |
- if (driver_map[i].chip_ids[j] == pdev->device_id)
|
|
|
842f3bc |
- return strdup(driver_map[i].driver);
|
|
|
842f3bc |
+ if (driver_map[i].chip_ids[j] == pdev->device_id) {
|
|
|
842f3bc |
+ *dri_driver_ret = driver_map[i].driver;
|
|
|
842f3bc |
+ *vdpau_driver_ret = driver_map[i].vdpau_driver;
|
|
|
842f3bc |
+ return;
|
|
|
842f3bc |
+ }
|
|
|
842f3bc |
}
|
|
|
842f3bc |
}
|
|
|
842f3bc |
|
|
|
842f3bc |
@@ -1485,7 +1497,6 @@ dri2_probe_driver_name(ScreenPtr pScreen, DRI2InfoPtr info)
|
|
|
842f3bc |
"[DRI2] No driver mapping found for PCI device "
|
|
|
842f3bc |
"0x%04x / 0x%04x\n",
|
|
|
842f3bc |
pdev->vendor_id, pdev->device_id);
|
|
|
842f3bc |
- return NULL;
|
|
|
842f3bc |
}
|
|
|
842f3bc |
|
|
|
842f3bc |
Bool
|
|
|
842f3bc |
@@ -1606,7 +1617,8 @@ DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info)
|
|
|
842f3bc |
if (info->driverName) {
|
|
|
842f3bc |
ds->driverNames[0] = info->driverName;
|
|
|
842f3bc |
} else {
|
|
|
842f3bc |
- ds->driverNames[0] = ds->driverNames[1] = dri2_probe_driver_name(pScreen, info);
|
|
|
842f3bc |
+ dri2_probe_driver_name(pScreen, info,
|
|
|
842f3bc |
+ &ds->driverNames[0], &ds->driverNames[1]);
|
|
|
842f3bc |
if (!ds->driverNames[0])
|
|
|
842f3bc |
return FALSE;
|
|
|
842f3bc |
}
|
|
|
842f3bc |
diff --git a/hw/xfree86/dri2/pci_ids/pci_id_driver_map.h b/hw/xfree86/dri2/pci_ids/pci_id_driver_map.h
|
|
|
842f3bc |
index da7ea1c..7036d10 100644
|
|
|
842f3bc |
--- a/hw/xfree86/dri2/pci_ids/pci_id_driver_map.h
|
|
|
842f3bc |
+++ b/hw/xfree86/dri2/pci_ids/pci_id_driver_map.h
|
|
|
842f3bc |
@@ -66,21 +66,22 @@ static const int vmwgfx_chip_ids[] = {
|
|
|
842f3bc |
static const struct {
|
|
|
842f3bc |
int vendor_id;
|
|
|
842f3bc |
const char *driver;
|
|
|
842f3bc |
+ const char *vdpau_driver;
|
|
|
842f3bc |
const int *chip_ids;
|
|
|
842f3bc |
int num_chips_ids;
|
|
|
842f3bc |
} driver_map[] = {
|
|
|
842f3bc |
- { 0x8086, "i915", i915_chip_ids, ARRAY_SIZE(i915_chip_ids) },
|
|
|
842f3bc |
- { 0x8086, "i965", i965_chip_ids, ARRAY_SIZE(i965_chip_ids) },
|
|
|
842f3bc |
+ { 0x8086, "i915", "i915", i915_chip_ids, ARRAY_SIZE(i915_chip_ids) },
|
|
|
842f3bc |
+ { 0x8086, "i965", "va_gl", i965_chip_ids, ARRAY_SIZE(i965_chip_ids) },
|
|
|
842f3bc |
#ifndef DRIVER_MAP_GALLIUM_ONLY
|
|
|
842f3bc |
- { 0x1002, "radeon", r100_chip_ids, ARRAY_SIZE(r100_chip_ids) },
|
|
|
842f3bc |
- { 0x1002, "r200", r200_chip_ids, ARRAY_SIZE(r200_chip_ids) },
|
|
|
842f3bc |
+ { 0x1002, "radeon", "radeon", r100_chip_ids, ARRAY_SIZE(r100_chip_ids) },
|
|
|
842f3bc |
+ { 0x1002, "r200", "r200", r200_chip_ids, ARRAY_SIZE(r200_chip_ids) },
|
|
|
842f3bc |
#endif
|
|
|
842f3bc |
- { 0x1002, "r300", r300_chip_ids, ARRAY_SIZE(r300_chip_ids) },
|
|
|
842f3bc |
- { 0x1002, "r600", r600_chip_ids, ARRAY_SIZE(r600_chip_ids) },
|
|
|
842f3bc |
- { 0x1002, "radeonsi", radeonsi_chip_ids, ARRAY_SIZE(radeonsi_chip_ids) },
|
|
|
842f3bc |
- { 0x10de, "nouveau", NULL, -1 },
|
|
|
842f3bc |
- { 0x1af4, "virtio_gpu", virtio_gpu_chip_ids, ARRAY_SIZE(virtio_gpu_chip_ids) },
|
|
|
842f3bc |
- { 0x15ad, "vmwgfx", vmwgfx_chip_ids, ARRAY_SIZE(vmwgfx_chip_ids) },
|
|
|
842f3bc |
+ { 0x1002, "r300", "r300", r300_chip_ids, ARRAY_SIZE(r300_chip_ids) },
|
|
|
842f3bc |
+ { 0x1002, "r600","r600", r600_chip_ids, ARRAY_SIZE(r600_chip_ids) },
|
|
|
842f3bc |
+ { 0x1002, "radeonsi", "radeonsi", radeonsi_chip_ids, ARRAY_SIZE(radeonsi_chip_ids) },
|
|
|
842f3bc |
+ { 0x10de, "nouveau", "nouveau", NULL, -1 },
|
|
|
842f3bc |
+ { 0x1af4, "virtio_gpu", "virtio_gpu", virtio_gpu_chip_ids, ARRAY_SIZE(virtio_gpu_chip_ids) },
|
|
|
842f3bc |
+ { 0x15ad, "vmwgfx", "vmwgfx", vmwgfx_chip_ids, ARRAY_SIZE(vmwgfx_chip_ids) },
|
|
|
842f3bc |
{ 0x0000, NULL, NULL, 0 },
|
|
|
842f3bc |
};
|
|
|
842f3bc |
|
|
|
842f3bc |
--
|
|
|
842f3bc |
2.9.3
|
|
|
842f3bc |
|