Commit edf72afe authored by Jammy Zhou's avatar Jammy Zhou Committed by Michel Dänzer

Fix crash in PCI probe path (v4)

The crash is caused by the NULL value returned by AMDGPUPTR(pScrn),
because the driverPrivate is not allocated yet in PciProbe phase,
and it is usually done in the PreInit phase.

Use pAMDGPUEnt->fd instead of info->dri2.drm_fd to avoid AMDGPUInfoPtr
related code in amdgpu_open_drm_master, so that the crash can be fixed.

v4: (md) Remove unused parameter entity_num, split out logically
    separate changes
v3: some more cleanup
v2: switch to pAMDGPUEnt->fd, and update the commit message
Signed-off-by: Jammy Zhou's avatarJammy Zhou <Jammy.Zhou@amd.com>
Signed-off-by: Michel Dänzer's avatarMichel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com> (v3)
parent cef72512
......@@ -147,14 +147,14 @@ static int amdgpu_kernel_open_fd(ScrnInfoPtr pScrn, struct pci_device *dev,
return fd;
}
static Bool amdgpu_open_drm_master(ScrnInfoPtr pScrn)
static Bool amdgpu_open_drm_master(ScrnInfoPtr pScrn, AMDGPUEntPtr pAMDGPUEnt,
struct pci_device *pci_dev)
{
AMDGPUInfoPtr info = AMDGPUPTR(pScrn);
drmSetVersion sv;
int err;
info->dri2.drm_fd = amdgpu_kernel_open_fd(pScrn, info->PciInfo, NULL);
if (info->dri2.drm_fd == -1)
pAMDGPUEnt->fd = amdgpu_kernel_open_fd(pScrn, pci_dev, NULL);
if (pAMDGPUEnt->fd == -1)
return FALSE;
/* Check that what we opened was a master or a master-capable FD,
......@@ -165,11 +165,11 @@ static Bool amdgpu_open_drm_master(ScrnInfoPtr pScrn)
sv.drm_di_minor = 1;
sv.drm_dd_major = -1;
sv.drm_dd_minor = -1;
err = drmSetInterfaceVersion(info->dri2.drm_fd, &sv);
err = drmSetInterfaceVersion(pAMDGPUEnt->fd, &sv);
if (err != 0) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"[drm] failed to set drm interface version.\n");
drmClose(info->dri2.drm_fd);
drmClose(pAMDGPUEnt->fd);
return FALSE;
}
......@@ -226,11 +226,12 @@ static Bool amdgpu_get_scrninfo(int entity_num, void *pci_dev)
uint32_t minor_version;
pPriv->ptr = xnfcalloc(sizeof(AMDGPUEntRec), 1);
pAMDGPUEnt = pPriv->ptr;
if (!pPriv->ptr)
return FALSE;
if (amdgpu_open_drm_master(pScrn)) {
pAMDGPUEnt = pPriv->ptr;
if (!amdgpu_open_drm_master(pScrn, pAMDGPUEnt, pci_dev))
goto error_fd;
}
pAMDGPUEnt->fd_ref = 1;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment