Commit 3b58f22e authored by Roman Li's avatar Roman Li Committed by Alex Deucher
Browse files

drm/amd/display: Remove PSR dependency on swizzle mode 



[Why]
The PSR enablement was dependent on swizzle as a workaround for
non-pageflipping fb console. It's no longer required.

[How]
Remove PSR-enable dependency on swizzle mode.

Signed-off-by: default avatarRoman Li <roman.li@amd.com>
Reviewed-by: default avatarNicholas Kazlauskas <Nicholas.Kazlauskas@amd.com>
Acked-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2d673560

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+1 −6
Original line number Diff line number Diff line
@@ -6540,7 +6540,6 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, 
	uint32_t target_vblank, last_flip_vblank;

	bool vrr_active = amdgpu_dm_vrr_active(acrtc_state);

	bool pflip_present = false;

	bool swizzle = true;

	struct {

		struct dc_surface_update surface_updates[MAX_SURFACES];

		struct dc_plane_info plane_infos[MAX_SURFACES];
@@ -6586,9 +6585,6 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, 


		dc_plane = dm_new_plane_state->dc_state;



		if (dc_plane && !dc_plane->tiling_info.gfx9.swizzle)

			swizzle = false;



		bundle->surface_updates[planes_count].surface = dc_plane;

		if (new_pcrtc_state->color_mgmt_changed) {

			bundle->surface_updates[planes_count].gamma = dc_plane->gamma_correction;
@@ -6797,8 +6793,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, 
			amdgpu_dm_link_setup_psr(acrtc_state->stream);

		else if ((acrtc_state->update_type == UPDATE_TYPE_FAST) &&

						acrtc_state->stream->link->psr_feature_enabled &&

						!acrtc_state->stream->link->psr_allow_active &&

						swizzle) {

						!acrtc_state->stream->link->psr_allow_active) {

			amdgpu_dm_psr_enable(acrtc_state->stream);

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE