[Mesa-dev] [PATCH 4/4] gallium/radeon: Multiply bpe by nsamples in surf_winsys_to_drm

[Marek Olšák]

If you incorporate Dieter's suggestion to fix FMASK, the series is:

Reviewed-by: Marek Olšák <marek.olsak at amd.com>

Sorry for breaking it so badly. Testing SI on GBM apparently wasn't enough.

Marek


On Wed, Nov 2, 2016 at 5:09 PM, Nicolai Hähnle <nhaehnle at gmail.com> wrote:
> For the series:
>
> Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>
>
>
> On 02.11.2016 12:11, Michel Dänzer wrote:
>>
>> From: Michel Dänzer <michel.daenzer at amd.com>
>>
>> For symmetry with surf_drm_to_winsys.
>>
>> Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
>> ---
>>  src/gallium/winsys/radeon/drm/radeon_drm_surface.c | 7 +++++--
>>  1 file changed, 5 insertions(+), 2 deletions(-)
>>
>> diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_surface.c
>> b/src/gallium/winsys/radeon/drm/radeon_drm_surface.c
>> index 6836a1b..8324d28 100644
>> --- a/src/gallium/winsys/radeon/drm/radeon_drm_surface.c
>> +++ b/src/gallium/winsys/radeon/drm/radeon_drm_surface.c
>> @@ -157,7 +157,9 @@ static void surf_winsys_to_drm(struct radeon_surface
>> *surf_drm,
>>      surf_drm->tile_split = surf_ws->tile_split;
>>
>>      for (i = 0; i <= surf_drm->last_level; i++) {
>> -        surf_level_winsys_to_drm(&surf_drm->level[i], &surf_ws->level[i],
>> bpe);
>> +        surf_level_winsys_to_drm(&surf_drm->level[i], &surf_ws->level[i],
>> +                                 bpe * surf_drm->nsamples);
>> +
>>          surf_drm->tiling_index[i] = surf_ws->tiling_index[i];
>>      }
>>
>> @@ -166,7 +168,8 @@ static void surf_winsys_to_drm(struct radeon_surface
>> *surf_drm,
>>
>>          for (i = 0; i <= surf_drm->last_level; i++) {
>>              surf_level_winsys_to_drm(&surf_drm->stencil_level[i],
>> -                                     &surf_ws->stencil_level[i], bpe);
>> +                                     &surf_ws->stencil_level[i],
>> +                                     surf_drm->nsamples);
>>              surf_drm->stencil_tiling_index[i] =
>> surf_ws->stencil_tiling_index[i];
>>          }
>>      }
>>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev