diff options
| author | Robert Millan <rmh@freebsd.org> | 2013-12-20 10:55:09 +0000 |
|---|---|---|
| committer | Michel Dänzer <michel.daenzer@amd.com> | 2013-12-24 11:07:57 +0900 |
| commit | 796c9a0cb587f528326bede11fa3f3eb7d3edaf1 (patch) | |
| tree | 342f44e640c19aae2f44e556b582f823b5a35c80 | |
| parent | d571d6af70ef27efd1ed6420eb892bdde963ed7a (diff) | |
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 <rmh@freebsd.org>
| -rw-r--r-- | src/radeon_kms.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/radeon_kms.c b/src/radeon_kms.c index 44a0139f..21a420f3 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, |