drm/amd/display: use actual cursor size instead of max for CAB allocation
authorAurabindo Pillai <aurabindo.pillai@amd.com>
Thu, 18 Aug 2022 21:55:01 +0000 (17:55 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 30 Aug 2022 21:04:09 +0000 (17:04 -0400)
[Why&How]
When calculating allocation for cursor size, get the real cursor through
the HUBP instead of using the maximum cursor size for more optimal
allocation

Reviewed-by: Alvin Lee <Alvin.Lee2@amd.com>
Reviewed-by: Nicholas Kazlauskas <Nicholas.Kazlauskas@amd.com>
Acked-by: Brian Chang <Brian.Chang@amd.com>
Signed-off-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c

index dc296aa..1828774 100644 (file)
@@ -295,7 +295,20 @@ static uint32_t dcn32_calculate_cab_allocation(struct dc *dc, struct dc_state *c
                }
 
                // Include cursor size for CAB allocation
-               cursor_size = dc->caps.max_cursor_size * dc->caps.max_cursor_size;
+               for (i = 0; i < dc->res_pool->pipe_count; i++) {
+                       struct pipe_ctx *pipe = &ctx->res_ctx.pipe_ctx[i];
+                       struct hubp *hubp = pipe->plane_res.hubp;
+
+                       if (pipe->stream && pipe->plane_state && hubp)
+                               /* Find the cursor plane and use the exact size instead of
+                                * using the max for calculation
+                                */
+                               if (hubp->curs_attr.width > 0) {
+                                       cursor_size = hubp->curs_attr.width * hubp->curs_attr.height;
+                                       break;
+                               }
+               }
+
                switch (stream->cursor_attributes.color_format) {
                case CURSOR_MODE_MONO:
                        cursor_size /= 2;