[Mesa-dev] [PATCH] radeon/uvd: fix the assertion check for YUYV format

[Christian König]

Am 05.09.2017 um 19:37 schrieb Leo Liu:
> Fixes:7319ff87("radeon/uvd: add YUYV format support for target buffer")
>
> Signed-off-by: Leo Liu <leo.liu at amd.com>

Reviewed-by: Christian König <christian.koenig at amd.com>

> ---
>   src/gallium/drivers/radeon/radeon_uvd.c | 8 +++++---
>   1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/src/gallium/drivers/radeon/radeon_uvd.c b/src/gallium/drivers/radeon/radeon_uvd.c
> index 00d6267018..5330b03872 100644
> --- a/src/gallium/drivers/radeon/radeon_uvd.c
> +++ b/src/gallium/drivers/radeon/radeon_uvd.c
> @@ -1588,9 +1588,11 @@ void ruvd_set_dt_surfaces(struct ruvd_msg *msg, struct radeon_surf *luma,
>   			msg->body.decode.dt_chroma_bottom_offset = msg->body.decode.dt_chroma_top_offset;
>   		}
>   
> -		assert(luma->u.legacy.bankw == chroma->u.legacy.bankw);
> -		assert(luma->u.legacy.bankh == chroma->u.legacy.bankh);
> -		assert(luma->u.legacy.mtilea == chroma->u.legacy.mtilea);
> +		if (chroma)
> +			assert(luma->u.legacy.bankw == chroma->u.legacy.bankw);
> +			assert(luma->u.legacy.bankh == chroma->u.legacy.bankh);
> +			assert(luma->u.legacy.mtilea == chroma->u.legacy.mtilea);
> +		}
>   
>   		msg->body.decode.dt_surf_tile_config |= RUVD_BANK_WIDTH(bank_wh(luma->u.legacy.bankw));
>   		msg->body.decode.dt_surf_tile_config |= RUVD_BANK_HEIGHT(bank_wh(luma->u.legacy.bankh));