summaryrefslogtreecommitdiff
path: root/src/amdgpu_kms.c
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2016-09-14 17:30:19 +0900
committerMichel Dänzer <michel@daenzer.net>2016-09-14 17:31:06 +0900
commitca1cf24d4eb773f7380c0da3fa942a5c85074422 (patch)
treec8ae13967c19efb17c76baa5064ebffa94880df2 /src/amdgpu_kms.c
parentca84c49c88235e1909d11e192eada816b782f041 (diff)
Fix cursor size for SI
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Acked-by: Edward O'Callaghan <funfunctor@folklore1984.net> (Cherry picked from commit c4364520691d18961f0a6b77071baeeffaa80a11)
Diffstat (limited to 'src/amdgpu_kms.c')
-rw-r--r--src/amdgpu_kms.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/amdgpu_kms.c b/src/amdgpu_kms.c
index 9c1d16a..23e275d 100644
--- a/src/amdgpu_kms.c
+++ b/src/amdgpu_kms.c
@@ -939,8 +939,14 @@ Bool AMDGPUPreInit_KMS(ScrnInfoPtr pScrn, int flags)
else
pAMDGPUEnt->HasCRTC2 = TRUE;
- info->cursor_w = CURSOR_WIDTH_CIK;
- info->cursor_h = CURSOR_HEIGHT_CIK;
+ if (info->ChipFamily >= CHIP_FAMILY_TAHITI &&
+ info->ChipFamily <= CHIP_FAMILY_HAINAN) {
+ info->cursor_w = CURSOR_WIDTH;
+ info->cursor_h = CURSOR_HEIGHT;
+ } else {
+ info->cursor_w = CURSOR_WIDTH_CIK;
+ info->cursor_h = CURSOR_HEIGHT_CIK;
+ }
amdgpu_query_heap_size(pAMDGPUEnt->pDev, AMDGPU_GEM_DOMAIN_GTT,
&heap_size, &max_allocation);