drm/amd/display: Assign normalized_pix_clk when color depth = 14

commit 79e31396fdd7037c503e6add15af7cb00633ea92 upstream.

[WHY & HOW]
A warning message "WARNING: CPU: 4 PID: 459 at ... /dc_resource.c:3397
calculate_phy_pix_clks+0xef/0x100 [amdgpu]" occurs because the
display_color_depth == COLOR_DEPTH_141414 is not handled. This is
observed in Radeon RX 6600 XT.

It is fixed by assigning pix_clk * (14 * 3) / 24 - same as the rests.

Also fixes the indentation in get_norm_pix_clk.

Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Hung <alex.hung@amd.com>
Signed-off-by: Tom Chung <chiahsuan.chung@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 274a87eb389f58eddcbc5659ab0b180b37e92775)
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
index 3af9591baa767e17e12401a60344d8967064aa9e..b619ebd452ad4f4ecf067f070549809dd2f3c0d1 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -1975,10 +1975,13 @@ static int get_norm_pix_clk(const struct dc_crtc_timing *timing)
                        break;
                case COLOR_DEPTH_121212:
                        normalized_pix_clk = (pix_clk * 36) / 24;
-               break;
+                       break;
+               case COLOR_DEPTH_141414:
+                       normalized_pix_clk = (pix_clk * 42) / 24;
+                       break;
                case COLOR_DEPTH_161616:
                        normalized_pix_clk = (pix_clk * 48) / 24;
-               break;
+                       break;
                default:
                        ASSERT(0);
                break;