mirror of
https://github.com/X11Libre/xf86-video-amdgpu.git
synced 2026-03-24 01:24:31 +00:00
drop checks for XF86_PDEV_SERVER_FD
It's always defined in the Xserver SDK since over a decade now. No need to keep workarounds for ancien Xserver versions. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
committed by
Enrico Weigelt
parent
cd40763e9f
commit
783c383754
@@ -1818,11 +1818,9 @@ static Bool amdgpu_set_drm_master(ScrnInfoPtr pScrn)
|
||||
AMDGPUEntPtr pAMDGPUEnt = AMDGPUEntPriv(pScrn);
|
||||
int err;
|
||||
|
||||
#ifdef XF86_PDEV_SERVER_FD
|
||||
if (pAMDGPUEnt->platform_dev &&
|
||||
(pAMDGPUEnt->platform_dev->flags & XF86_PDEV_SERVER_FD))
|
||||
return TRUE;
|
||||
#endif
|
||||
|
||||
err = drmSetMaster(pAMDGPUEnt->fd);
|
||||
if (err)
|
||||
@@ -1835,11 +1833,9 @@ static void amdgpu_drop_drm_master(ScrnInfoPtr pScrn)
|
||||
{
|
||||
AMDGPUEntPtr pAMDGPUEnt = AMDGPUEntPriv(pScrn);
|
||||
|
||||
#ifdef XF86_PDEV_SERVER_FD
|
||||
if (pAMDGPUEnt->platform_dev &&
|
||||
(pAMDGPUEnt->platform_dev->flags & XF86_PDEV_SERVER_FD))
|
||||
return;
|
||||
#endif
|
||||
|
||||
drmDropMaster(pAMDGPUEnt->fd);
|
||||
}
|
||||
|
||||
@@ -173,7 +173,7 @@ static int amdgpu_kernel_open_fd(ScrnInfoPtr pScrn,
|
||||
|
||||
void amdgpu_kernel_close_fd(AMDGPUEntPtr pAMDGPUEnt)
|
||||
{
|
||||
#if defined(XSERVER_PLATFORM_BUS) && defined(XF86_PDEV_SERVER_FD)
|
||||
#if defined(XSERVER_PLATFORM_BUS)
|
||||
if (!(pAMDGPUEnt->platform_dev &&
|
||||
pAMDGPUEnt->platform_dev->flags & XF86_PDEV_SERVER_FD))
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user