From: Leo Liu <leo.liu@amd.com>
Date: Tue, 5 Sep 2017 17:30:57 +0000 (-0400)
Subject: radeon/uvd: fix the assertion check for YUYV format
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e1e3c0384bb7243f339e0f7405c432a45cf92ff4;p=mesa.git

radeon/uvd: fix the assertion check for YUYV format

Fixes:7319ff87("radeon/uvd: add YUYV format support for target buffer")

Signed-off-by: Leo Liu <leo.liu@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
---

diff --git a/src/gallium/drivers/radeon/radeon_uvd.c b/src/gallium/drivers/radeon/radeon_uvd.c
index 00d62670182..fabc73e3834 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));