FAILED: patch "[PATCH] drm/amd/display: fix hw rotated modes when PSR-SU is enabled" failed to apply to 6.6-stable tree
[email protected]
maintainerThe patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x 0497ae6f8830816d9277a8d5c8d9bf5966f292e1
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2024012729-directive-freeness-e772@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
Possible dependencies:
0497ae6f8830 ("drm/amd/display: fix hw rotated modes when PSR-SU is enabled")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 0497ae6f8830816d9277a8d5c8d9bf5966f292e1 Mon Sep 17 00:00:00 2001
From: Hamza Mahfooz <[email protected]>
Date: Tue, 5 Dec 2023 14:55:04 -0500
Subject: [PATCH] drm/amd/display: fix hw rotated modes when PSR-SU is enabled
We currently don't support dirty rectangles on hardware rotated modes. So, if a user is using hardware rotated modes with PSR-SU enabled, use PSR-SU FFU for all rotated planes (including cursor planes).
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3 -0
@@ -5241,6 +5241,9 @@ static void fill_dc_dirty_rects(struct drm_plane *plane,if (plane->type ==DRM_PLANE_TYPE_CURSOR )return ; +if (new_plane_state->rotation !=DRM_MODE_ROTATE_0 ) + goto ffu; + num_clips =drm_plane_get_damage_clips_count (new_plane_state); clips =drm_plane_get_damage_clips (new_plane_state);
drivers/gpu/drm/amd/display/dc/dc_hw_types.h +1 -0
@@ -465,6 +465,7 @@ struct dc_cursor_mi_param {struct fixed31_32 v_scale_ratio;enum dc_rotation_angle rotation;bool mirror; +struct dc_stream_state *stream; };/* IPP related types */
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c +10 -2
@@ -1077,8 +1077,16 @@ void hubp2_cursor_set_position(if (src_y_offset <0 ) src_y_offset =0 ;/* Save necessary cursor info x, y position. w, h is saved in attribute func. */ - hubp->cur_rect.x = src_x_offset + param->viewport.x; - hubp->cur_rect.y = src_y_offset + param->viewport.y; +if (param->stream->link->psr_settings.psr_version >=DC_PSR_VERSION_SU_1 && + param->rotation !=ROTATION_ANGLE_0 ) { + hubp->cur_rect.x =0 ; + hubp->cur_rect.y =0 ; + hubp->cur_rect.w = param->stream->timing.h_addressable; + hubp->cur_rect.h = param->stream->timing.v_addressable; + }else { + hubp->cur_rect.x = src_x_offset + param->viewport.x; + hubp->cur_rect.y = src_y_offset + param->viewport.y; + } }void hubp2_clk_cntl (struct hubp *hubp,bool enable)
drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c +2 -1
@@ -3417,7 +3417,8 @@ void dcn10_set_cursor_position(struct pipe_ctx *pipe_ctx) .h_scale_ratio = pipe_ctx->plane_res.scl_data.ratios.horz, .v_scale_ratio = pipe_ctx->plane_res.scl_data.ratios.vert, .rotation = pipe_ctx->plane_state->rotation, - .mirror = pipe_ctx->plane_state->horizontal_mirror + .mirror = pipe_ctx->plane_state->horizontal_mirror, + .stream = pipe_ctx->stream, };bool pipe_split_on = false; bool odm_combine_on = (pipe_ctx->next_odm_pipe != NULL) ||