diff --git a/sys/dev/drm/amd/display/dc/dcn10/dcn10_hubp.c b/sys/dev/drm/amd/display/dc/dcn10/dcn10_hubp.c
--- a/sys/dev/drm/amd/display/dc/dcn10/dcn10_hubp.c
+++ b/sys/dev/drm/amd/display/dc/dcn10/dcn10_hubp.c
@@ -168,7 +168,8 @@
 		ASSERT(plane_size->video.chroma_pitch != 0);
 		/* Chroma pitch zero can cause system hang! */
 
-		pitch = plane_size->video.luma_pitch - 1;
+		pitch = (plane_size->video.luma_pitch == 0) ? 0 :
+			 plane_size->video.luma_pitch - 1;
 		meta_pitch = dcc->video.meta_pitch_l - 1;
 		pitch_c = plane_size->video.chroma_pitch - 1;
 		meta_pitch_c = dcc->video.meta_pitch_c - 1;