>From 87ad904f676b1a6ce2adb75a977941305b003f46 Mon Sep 17 00:00:00 2001 From: Robert Millan <[email protected]> Date: Fri, 20 Dec 2013 10:55:09 +0000 Subject: [PATCH 1/2] radeon: Set first parameter of drmOpen() to NULL
Since the introduction of a call to drmCheckModesettingSupported() in radeon_kernel_mode_enabled(), with abort condition if such call fails, the first argument to drmOpen() call in radeon_open_drm_master() has become a no-op red herring. Such argument (a kernel module name) is supposed to result in load of specified kernel module. However, this will never happen. The problem is that if the code containing drmOpen() call is reached, it means that drmCheckModesettingSupported() check has previously succeeded, which implies the module is already loaded. So, drmOpen() will never load a kernel module. But it gives the impression that it will. In order to avoid this confusion, this commit replaces it with NULL, like xf86-video-intel driver does. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=72849 Signed-off-by: Robert Millan <[email protected]> --- src/radeon_kms.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/radeon_kms.c b/src/radeon_kms.c index 44a0139..21a420f 100644 --- a/src/radeon_kms.c +++ b/src/radeon_kms.c @@ -607,7 +607,7 @@ static Bool radeon_open_drm_master(ScrnInfoPtr pScrn) dev->domain, dev->bus, dev->dev, dev->func); #endif - info->dri2.drm_fd = drmOpen("radeon", busid); + info->dri2.drm_fd = drmOpen(NULL, busid); if (info->dri2.drm_fd == -1) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -- 1.7.10.4
_______________________________________________ xorg-driver-ati mailing list [email protected] http://lists.x.org/mailman/listinfo/xorg-driver-ati
