From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?ISO-8859-1?Q?Christian_K=F6nig?= Subject: Re: [PATCH libdrm] radeon: Fix 1D tiling for CIK Date: Wed, 18 Sep 2013 17:56:41 +0200 Message-ID: <5239CD39.40307@vodafone.de> References: <1379512267-9895-1-git-send-email-michel@daenzer.net> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1"; Format="flowed" Content-Transfer-Encoding: quoted-printable Return-path: Received: from smtp-01.vodafone.de (mxout.vodafone.de [80.84.1.40]) by gabe.freedesktop.org (Postfix) with ESMTP id 894A7E775A for ; Wed, 18 Sep 2013 08:56:43 -0700 (PDT) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: Alex Deucher Cc: =?ISO-8859-1?Q?Michel_D=E4nzer?= , Maling list - DRI developers List-Id: dri-devel@lists.freedesktop.org Am 18.09.2013 17:54, schrieb Alex Deucher: > On Wed, Sep 18, 2013 at 9:51 AM, Michel D=E4nzer wro= te: >> From: Michel D=E4nzer >> >> The main difference is that the tiling mode index changed for 1D tiled >> depth/stencil surfaces. >> >> Signed-off-by: Michel D=E4nzer > One comment below, other than that, > > Reviewed-by: Alex Deucher > >> --- >> 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_surfa= ce_manager *surf_man, >> break; >> case RADEON_SURF_MODE_1D: >> if (surf->flags & RADEON_SURF_SBUFFER) { >> - *stencil_tile_mode =3D SI_TILE_MODE_DEPTH_STENCIL_1D; >> + if (surf_man->family >=3D CHIP_BONAIRE) >> + *stencil_tile_mode =3D CIK_TILE_MODE_DEPTH_STENCIL_1D; >> + else >> + *stencil_tile_mode =3D SI_TILE_MODE_DEPTH_STENCIL_1D; >> } >> if (surf->flags & RADEON_SURF_ZBUFFER) { >> - *tile_mode =3D SI_TILE_MODE_DEPTH_STENCIL_1D; >> + if (surf_man->family >=3D CHIP_BONAIRE) >> + *tile_mode =3D CIK_TILE_MODE_DEPTH_STENCIL_1D; >> + else >> + *tile_mode =3D SI_TILE_MODE_DEPTH_STENCIL_1D; >> } else if (surf->flags & RADEON_SURF_SCANOUT) { >> *tile_mode =3D SI_TILE_MODE_COLOR_1D_SCANOUT; >> } else { >> @@ -1643,7 +1649,10 @@ static int si_surface_init_2d(struct radeon_surfa= ce_manager *surf_man, >> tile_mode =3D SI_TILE_MODE_COLOR_1D_SCANOUT; >> break; >> case SI_TILE_MODE_DEPTH_STENCIL_2D: >> - tile_mode =3D SI_TILE_MODE_DEPTH_STENCIL_1D; >> + if (surf_man->family >=3D CHIP_BONAIRE) >> + tile_mode =3D CIK_TILE_MODE_DEPTH_STENCIL_1D; >> + else >> + tile_mode =3D 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