[PATCH xf86-video-amdgpu] Fix cursor size for SI

[Edward O'Callaghan]

Acked-by: Edward O'Callaghan <funfunctor at folklore1984.net>

Perhaps a follow up that queries the kernel instead, however better this
than broken.

On 08/19/2016 08:43 PM, Marek Olšák wrote:
> From: Marek Olšák <marek.olsak at amd.com>
> 
> This doesn't fix the missing cursor, which seems to be a kernel issue,
> because it's missing with modesetting as well.
> ---
>  src/amdgpu_kms.c | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/src/amdgpu_kms.c b/src/amdgpu_kms.c
> index 9ee48df..d9f15a4 100644
> --- a/src/amdgpu_kms.c
> +++ b/src/amdgpu_kms.c
> @@ -922,22 +922,28 @@ Bool AMDGPUPreInit_KMS(ScrnInfoPtr pScrn, int flags)
>  		goto fail;
>  	}
>  
>  	AMDGPUSetupCapabilities(pScrn);
>  
>  	if (info->drmmode.count_crtcs == 1)
>  		pAMDGPUEnt->HasCRTC2 = FALSE;
>  	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);
>  	info->gart_size = heap_size;
>  	amdgpu_query_heap_size(pAMDGPUEnt->pDev, AMDGPU_GEM_DOMAIN_VRAM,
>  				&heap_size, &max_allocation);
>  	info->vram_size = max_allocation;
>  
>  	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
>  		   "mem size init: gart size :%llx vram size: s:%llx visible:%llx\n",
> 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20160820/861abaec/attachment.sig>