From: Tony Cheng <tony.cheng@amd.com>
Date: Sat, 14 Jan 2017 06:44:52 +0000 (-0500)
Subject: drm/amd/display: assert if mask is 0 in set_reg_field_value_ex
X-Git-Tag: v4.15-rc1~56^2~23^2~771
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bf72726358adfedcf1c268690521891809332151;p=thirdparty%2Fkernel%2Flinux.git

drm/amd/display: assert if mask is 0 in set_reg_field_value_ex

-  mask = 0 means something is wrong in caller and no register field will be updated

Signed-off-by: Tony Cheng <tony.cheng@amd.com>
Reviewed-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/display/dc/dm_services.h b/drivers/gpu/drm/amd/display/dc/dm_services.h
index 11a0abfd34187..052a43af1bd34 100644
--- a/drivers/gpu/drm/amd/display/dc/dm_services.h
+++ b/drivers/gpu/drm/amd/display/dc/dm_services.h
@@ -165,6 +165,7 @@ static inline uint32_t set_reg_field_value_ex(
 	uint32_t mask,
 	uint8_t shift)
 {
+	ASSERT(mask != 0);
 	return (reg_value & ~mask) | (mask & (value << shift));
 }