[PATCH 0/1] AMDGPU SI support almost fixed

[Deucher, Alexander]

> -----Original Message-----
> From: amd-gfx [mailto:amd-gfx-bounces at lists.freedesktop.org] On Behalf
> Of Marek Olšák
> Sent: Friday, August 19, 2016 5:25 AM
> To: Michel Dänzer
> Cc: amd-gfx at lists.freedesktop.org
> Subject: Re: [PATCH 0/1] AMDGPU SI support almost fixed
> 
> I've added this. The dmesg message is gone, but the cursor is still missing.
> 
> 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
> @@ -929,8 +929,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;
> +       }

At some point I added code to either radeon or modesetting to query the cursor size from the kernel.  That would probably be better than hardcoding it in case it ever changes again.

Alex

> 
>         amdgpu_query_heap_size(pAMDGPUEnt->pDev,
> AMDGPU_GEM_DOMAIN_GTT,
>                                 &heap_size, &max_allocation);
> 
> Marek
> 
> 
> 
> 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
> @@ -929,8 +929,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);
> 
> On Fri, Aug 19, 2016 at 11:14 AM, Michel Dänzer <michel at daenzer.net>
> wrote:
> > On 19/08/16 06:01 PM, Marek Olšák wrote:
> >> Hi,
> >>
> >> This amdgpu patch fixes DCE support. Now only the cursor is broken:
> >>
> >> [   37.936022] [drm:dce_v6_0_crtc_cursor_set2 [amdgpu]] *ERROR* bad
> cursor width or height 128 x 128
> >
> > The DDX driver's AMDGPUPreInit_KMS is hardcoding the >= CIK cursor size.
> >
> >
> > --
> > Earthling Michel Dänzer               |               http://www.amd.com
> > Libre software enthusiast             |             Mesa and X developer
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx