]> www.infradead.org Git - users/hch/misc.git/commitdiff
drm/amd/display: Assign normalized_pix_clk when color depth = 14
authorAlex Hung <alex.hung@amd.com>
Thu, 27 Feb 2025 23:36:25 +0000 (16:36 -0700)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 10 Mar 2025 18:13:16 +0000 (14:13 -0400)
[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
drivers/gpu/drm/amd/display/dc/core/dc_resource.c

index a45037cb4cc01b1e79cc218834784495bcf13ce8..298668e9729c767072559d4b5032a059aea8110b 100644 (file)
@@ -3389,10 +3389,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;