Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sanity check that the driver is an i915.ko GEM device before claiming it 

This fixes an issue with us claiming Poulsbo and friends even though we
do not speak their language.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2012-08-20 12:01:39 +01:00
parent 74f998136b
commit b5b76ad849
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/intel_module.c
View File

@ -31,6 +31,7 @@
#include <xf86_OSproc.h>
#include <xf86Parser.h>
#include <xf86drmMode.h>
#include <i915_drm.h>
#include <xorgVersion.h>
@ -369,20 +370,35 @@ static Bool intel_driver_func(ScrnInfoPtr pScrn,
static Bool has_kernel_mode_setting(struct pci_device *dev)
{
char id[20];
int ret;
int ret, fd;
snprintf(id, sizeof(id),
"pci:%04x:%02x:%02x.%d",
dev->domain, dev->bus, dev->dev, dev->func);
ret = drmCheckModesettingSupported(id);
if (ret && xf86LoadKernelModule("i915"))
ret = drmCheckModesettingSupported(id);
/* Be nice to the user and load fbcon too */
if (!ret)
if (ret) {
if (xf86LoadKernelModule("i915"))
ret = drmCheckModesettingSupported(id);
if (ret)
return FALSE;
/* Be nice to the user and load fbcon too */
(void)xf86LoadKernelModule("fbcon");
}
return ret == 0;
/* Confirm that this is a i915.ko device with GEM/KMS enabled */
ret = FALSE;
fd = drmOpen(NULL, id);
if (fd != -1) {
struct drm_i915_getparam gp;
gp.param = I915_PARAM_HAS_GEM;
gp.value = &ret;
(void)drmIoctl(fd, DRM_IOCTL_I915_GETPARAM, &gp, sizeof(gp));
close(fd);
}
return ret;
}
extern XF86ConfigPtr xf86configptr;