All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Christian König" <deathsimple@vodafone.de>
To: Alex Deucher <alexdeucher@gmail.com>
Cc: "Michel Dänzer" <michel@daenzer.net>,
	"Maling list - DRI developers" <dri-devel@lists.freedesktop.org>
Subject: Re: [PATCH libdrm] radeon: Fix 1D tiling for CIK
Date: Wed, 18 Sep 2013 17:56:41 +0200	[thread overview]
Message-ID: <5239CD39.40307@vodafone.de> (raw)
In-Reply-To: <CADnq5_MF8+ws_XPXNHacu8Gq8cqCk7Q33agsLRyX942i9_8J=w@mail.gmail.com>

Am 18.09.2013 17:54, schrieb Alex Deucher:
> On Wed, Sep 18, 2013 at 9:51 AM, Michel Dänzer <michel@daenzer.net> wrote:
>> From: Michel Dänzer <michel.daenzer@amd.com>
>>
>> The main difference is that the tiling mode index changed for 1D tiled
>> depth/stencil surfaces.
>>
>> Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
> One comment below, other than that,
>
> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
>
>> ---
>>   include/drm/radeon_drm.h | 15 +++++++++++++++
>>   radeon/radeon_surface.c  | 15 ++++++++++++---
>>   2 files changed, 27 insertions(+), 3 deletions(-)
>>
>> diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h
>> index 86cef15..533c3dc 100644
>> --- a/include/drm/radeon_drm.h
>> +++ b/include/drm/radeon_drm.h
>> @@ -1004,4 +1004,19 @@ struct drm_radeon_info {
>>   #define SI_TILE_MODE_DEPTH_STENCIL_2D_4AA      3
>>   #define SI_TILE_MODE_DEPTH_STENCIL_2D_8AA      2
>>
>> +#define CIK_TILE_MODE_COLOR_LINEAR_ALIGNED     8
>> +#define CIK_TILE_MODE_COLOR_1D                 13
>> +#define CIK_TILE_MODE_COLOR_1D_SCANOUT         9
>> +#define CIK_TILE_MODE_COLOR_2D_8BPP            14
>> +#define CIK_TILE_MODE_COLOR_2D_16BPP           15
>> +#define CIK_TILE_MODE_COLOR_2D_32BPP           16
>> +#define CIK_TILE_MODE_COLOR_2D_64BPP           17
>> +#define CIK_TILE_MODE_COLOR_2D_SCANOUT_16BPP   11
>> +#define CIK_TILE_MODE_COLOR_2D_SCANOUT_32BPP   12
>> +#define CIK_TILE_MODE_DEPTH_STENCIL_1D         5
>> +#define CIK_TILE_MODE_DEPTH_STENCIL_2D         0
And by the way, that looks a bit strange:
>> +#define CIK_TILE_MODE_DEPTH_STENCIL_2D_2AA     3
>> +#define CIK_TILE_MODE_DEPTH_STENCIL_2D_4AA     3


Christian.

>> +#define CIK_TILE_MODE_DEPTH_STENCIL_2D_8AA     2
>> +
> Can you send a patch to add these to radeon_drm.h in the kernel as well?
>
>>   #endif
>> diff --git a/radeon/radeon_surface.c b/radeon/radeon_surface.c
>> index 818e26a..1710e34 100644
>> --- a/radeon/radeon_surface.c
>> +++ b/radeon/radeon_surface.c
>> @@ -1382,10 +1382,16 @@ static int si_surface_sanity(struct radeon_surface_manager *surf_man,
>>           break;
>>       case RADEON_SURF_MODE_1D:
>>           if (surf->flags & RADEON_SURF_SBUFFER) {
>> -            *stencil_tile_mode = SI_TILE_MODE_DEPTH_STENCIL_1D;
>> +            if (surf_man->family >= CHIP_BONAIRE)
>> +                *stencil_tile_mode = CIK_TILE_MODE_DEPTH_STENCIL_1D;
>> +            else
>> +                *stencil_tile_mode = SI_TILE_MODE_DEPTH_STENCIL_1D;
>>           }
>>           if (surf->flags & RADEON_SURF_ZBUFFER) {
>> -            *tile_mode = SI_TILE_MODE_DEPTH_STENCIL_1D;
>> +            if (surf_man->family >= CHIP_BONAIRE)
>> +                *tile_mode = CIK_TILE_MODE_DEPTH_STENCIL_1D;
>> +            else
>> +                *tile_mode = SI_TILE_MODE_DEPTH_STENCIL_1D;
>>           } else if (surf->flags & RADEON_SURF_SCANOUT) {
>>               *tile_mode = SI_TILE_MODE_COLOR_1D_SCANOUT;
>>           } else {
>> @@ -1643,7 +1649,10 @@ static int si_surface_init_2d(struct radeon_surface_manager *surf_man,
>>                   tile_mode = SI_TILE_MODE_COLOR_1D_SCANOUT;
>>                   break;
>>               case SI_TILE_MODE_DEPTH_STENCIL_2D:
>> -                tile_mode = SI_TILE_MODE_DEPTH_STENCIL_1D;
>> +                if (surf_man->family >= CHIP_BONAIRE)
>> +                    tile_mode = CIK_TILE_MODE_DEPTH_STENCIL_1D;
>> +                else
>> +                    tile_mode = SI_TILE_MODE_DEPTH_STENCIL_1D;
>>                   break;
>>               default:
>>                   return -EINVAL;
>> --
>> 1.8.4.rc3
>>
>> _______________________________________________
>> dri-devel mailing list
>> dri-devel@lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/dri-devel
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel

  reply	other threads:[~2013-09-18 15:56 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-18 13:51 [PATCH libdrm] radeon: Fix 1D tiling for CIK Michel Dänzer
2013-09-18 15:54 ` Alex Deucher
2013-09-18 15:56   ` Christian König [this message]
2013-09-18 16:02     ` Alex Deucher
2013-09-18 16:23   ` [PATCH] drm/radeon/cik: Add tiling mode index for 1D tiled depth/stencil surfaces Michel Dänzer
2013-09-18 16:26     ` Alex Deucher

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5239CD39.40307@vodafone.de \
    --to=deathsimple@vodafone.de \
    --cc=alexdeucher@gmail.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=michel@daenzer.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.