diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2024-01-01 23:45:09 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2024-01-01 23:45:09 +0000 |
| commit | bf7dcb5c2f44cb3dd086b42b6b72934d9217316e (patch) | |
| tree | 69aea09b524bd3b42a47e5424bcc9fdb5ea86ce4 | |
| parent | 2117ce5a711c11d0419873da27c38ad88ad59612 (diff) | |
drm/amd/display: fix hw rotated modes when PSR-SU is enabled
From Hamza Mahfooz
913463f8e6cd8b0567c44d7eef350b9592a369dd in linux-6.1.y/6.1.70
f528ee145bd0076cd0ed7e7b2d435893e6329e98 in mainline linux
4 files changed, 16 insertions, 3 deletions
diff --git a/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 8f4b44f4344..84dadf3eb1f 100644 --- a/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -5106,6 +5106,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); diff --git a/sys/dev/pci/drm/amd/display/dc/dc_hw_types.h b/sys/dev/pci/drm/amd/display/dc/dc_hw_types.h index 848db8676ad..46c2b991aa1 100644 --- a/sys/dev/pci/drm/amd/display/dc/dc_hw_types.h +++ b/sys/dev/pci/drm/amd/display/dc/dc_hw_types.h @@ -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 */ diff --git a/sys/dev/pci/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c b/sys/dev/pci/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c index d84579da640..009b5861a3f 100644 --- a/sys/dev/pci/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +++ b/sys/dev/pci/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c @@ -3427,7 +3427,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) || diff --git a/sys/dev/pci/drm/amd/display/dc/dcn20/dcn20_hubp.c b/sys/dev/pci/drm/amd/display/dc/dcn20/dcn20_hubp.c index 4566bc7abf1..aa252dc2632 100644 --- a/sys/dev/pci/drm/amd/display/dc/dcn20/dcn20_hubp.c +++ b/sys/dev/pci/drm/amd/display/dc/dcn20/dcn20_hubp.c @@ -1075,8 +1075,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) |