Commit 731a20cb authored by Alex Hung's avatar Alex Hung Committed by Alex Deucher
Browse files

Revert "drm/amd/display: Add writeback enable field (wb_enabled)" 



This reverts commit f6893fcb.

[WHY & HOW]
The writeback series cause a regression in thunderbolt display.

Signed-off-by: default avatarAlex Hung <alex.hung@amd.com>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6d2959df

drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h

+0 −1
Original line number Diff line number Diff line
@@ -418,7 +418,6 @@ struct amdgpu_crtc { 
	struct drm_pending_vblank_event *event;



	bool wb_pending;

	bool wb_enabled;

	struct drm_writeback_connector *wb_conn;

};

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

+0 −8
Original line number Diff line number Diff line
@@ -8676,13 +8676,9 @@ static void amdgpu_dm_commit_streams(struct drm_atomic_state *state, 
		if (acrtc)

			old_crtc_state = drm_atomic_get_old_crtc_state(state, &acrtc->base);



		if (!acrtc->wb_enabled)

			continue;



		dm_old_crtc_state = to_dm_crtc_state(old_crtc_state);



		dm_clear_writeback(dm, dm_old_crtc_state);

		acrtc->wb_enabled = false;

	}



	for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state,
@@ -9260,13 +9256,9 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) 
		if (acrtc)

			new_crtc_state = drm_atomic_get_new_crtc_state(state, &acrtc->base);



		if (acrtc->wb_enabled)

			continue;



		dm_new_crtc_state = to_dm_crtc_state(new_crtc_state);



		dm_set_writeback(dm, dm_new_crtc_state, connector, new_con_state);

		acrtc->wb_enabled = true;

	}



	/* Update audio instances for each connector. */