diff options
| author | Tom St Denis <tom.stdenis@amd.com> | 2015-10-05 10:00:09 -0400 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2015-10-06 16:54:37 +0900 |
| commit | 4b92b960c7705be8b3a5dee17b2341864d7ca9bb (patch) | |
| tree | 790aa8490a2d6e954d13bbbe5a2a3fe41b1175fa /src | |
| parent | fe100fd6bf483228eaf64b959c56a68e8dac4447 (diff) | |
cleanup the entity rec
Based on radeon commit: b32a0a3de84a44b9af4f1ca8be19f10d7fa31b12
Some of these were set, some of them were
always opposites, so clean things up.
Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/amdgpu_drv.h | 1 | ||||
| -rw-r--r-- | src/amdgpu_kms.c | 5 | ||||
| -rw-r--r-- | src/amdgpu_probe.c | 4 | ||||
| -rw-r--r-- | src/amdgpu_probe.h | 3 | ||||
| -rw-r--r-- | src/drmmode_display.c | 2 |
5 files changed, 1 insertions, 14 deletions
diff --git a/src/amdgpu_drv.h b/src/amdgpu_drv.h index ff3bc02..4797693 100644 --- a/src/amdgpu_drv.h +++ b/src/amdgpu_drv.h @@ -223,7 +223,6 @@ typedef struct { #endif Bool IsSecondary; - Bool IsPrimary; Bool shadow_fb; void *fb_shadow; diff --git a/src/amdgpu_kms.c b/src/amdgpu_kms.c index 19ee1b1..32a34cb 100644 --- a/src/amdgpu_kms.c +++ b/src/amdgpu_kms.c @@ -724,7 +724,6 @@ Bool AMDGPUPreInit_KMS(ScrnInfoPtr pScrn, int flags) info = AMDGPUPTR(pScrn); info->IsSecondary = FALSE; - info->IsPrimary = FALSE; info->pEnt = xf86GetEntityInfo(pScrn->entityList[pScrn->numEntities - 1]); if (info->pEnt->location.type != BUS_PCI @@ -741,12 +740,8 @@ Bool AMDGPUPreInit_KMS(ScrnInfoPtr pScrn, int flags) if (xf86IsEntityShared(pScrn->entityList[0])) { if (xf86IsPrimInitDone(pScrn->entityList[0])) { info->IsSecondary = TRUE; - pAMDGPUEnt->pSecondaryScrn = pScrn; } else { - info->IsPrimary = TRUE; xf86SetPrimInitDone(pScrn->entityList[0]); - pAMDGPUEnt->pPrimaryScrn = pScrn; - pAMDGPUEnt->HasSecondary = FALSE; } } diff --git a/src/amdgpu_probe.c b/src/amdgpu_probe.c index 7a1a556..481271b 100644 --- a/src/amdgpu_probe.c +++ b/src/amdgpu_probe.c @@ -237,7 +237,6 @@ static Bool amdgpu_get_scrninfo(int entity_num, void *pci_dev) pPriv->ptr = xnfcalloc(sizeof(AMDGPUEntRec), 1); pAMDGPUEnt = pPriv->ptr; - pAMDGPUEnt->HasSecondary = FALSE; if (amdgpu_open_drm_master(pScrn)) { goto error_fd; @@ -255,7 +254,6 @@ static Bool amdgpu_get_scrninfo(int entity_num, void *pci_dev) } } else { pAMDGPUEnt = pPriv->ptr; - pAMDGPUEnt->HasSecondary = TRUE; } xf86SetEntityInstanceForScreen(pScrn, pEnt->index, @@ -356,7 +354,6 @@ amdgpu_platform_probe(DriverPtr pDriver, pPriv->ptr = xnfcalloc(sizeof(AMDGPUEntRec), 1); pAMDGPUEnt = pPriv->ptr; - pAMDGPUEnt->HasSecondary = FALSE; pAMDGPUEnt->fd = amdgpu_kernel_open_fd(pScrn, dev->pdev, dev); if (pAMDGPUEnt->fd < 0) goto error_fd; @@ -373,7 +370,6 @@ amdgpu_platform_probe(DriverPtr pDriver, } } else { pAMDGPUEnt = pPriv->ptr; - pAMDGPUEnt->HasSecondary = TRUE; } pAMDGPUEnt->platform_dev = dev; diff --git a/src/amdgpu_probe.h b/src/amdgpu_probe.h index 6c187ce..4b4fefb 100644 --- a/src/amdgpu_probe.h +++ b/src/amdgpu_probe.h @@ -75,11 +75,8 @@ typedef struct { } AMDGPUCardInfo; typedef struct { - Bool HasSecondary; Bool HasCRTC2; /* All cards except original Radeon */ - ScrnInfoPtr pSecondaryScrn; - ScrnInfoPtr pPrimaryScrn; amdgpu_device_handle pDev; int fd; /* for sharing across zaphod heads */ diff --git a/src/drmmode_display.c b/src/drmmode_display.c index 35c0453..d75a629 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -1523,7 +1523,7 @@ drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, drmModeResPtr mode_r if (!AMDGPUZaphodStringMatches(pScrn, s, name)) goto out_free_encoders; } else { - if (info->IsPrimary && (num != 0)) + if (!info->IsSecondary && (num != 0)) goto out_free_encoders; else if (info->IsSecondary && (num != 1)) goto out_free_encoders; |