Commit 00ce1036 authored by Alex Hung's avatar Alex Hung Committed by Alex Deucher
Browse files

Revert "drm/amd/display: Add new set_fc_enable to struct dwbc_funcs" 



This reverts commit b79a00a4.

[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 7086af68

drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb.c

+0 −23
Original line number Diff line number Diff line
@@ -130,28 +130,6 @@ bool dwb3_disable(struct dwbc *dwbc) 
	return true;

}



void dwb3_set_fc_enable(struct dwbc *dwbc, enum dwb_frame_capture_enable enable)

{

	struct dcn30_dwbc *dwbc30 = TO_DCN30_DWBC(dwbc);

	unsigned int pre_locked;



	REG_GET(DWB_UPDATE_CTRL, DWB_UPDATE_LOCK, &pre_locked);



	/* Lock DWB registers */

	if (pre_locked == 0)

		REG_UPDATE(DWB_UPDATE_CTRL, DWB_UPDATE_LOCK, 1);



	/* Disable FC */

	REG_UPDATE(FC_MODE_CTRL, FC_FRAME_CAPTURE_EN, enable);



	/* Unlock DWB registers */

	if (pre_locked == 0)

		REG_UPDATE(DWB_UPDATE_CTRL, DWB_UPDATE_LOCK, 0);



	DC_LOG_DWB("%s dwb3_fc_disabled at inst = %d", __func__, dwbc->inst);

}





bool dwb3_update(struct dwbc *dwbc, struct dc_dwb_params *params)

{

	struct dcn30_dwbc *dwbc30 = TO_DCN30_DWBC(dwbc);
@@ -248,7 +226,6 @@ static const struct dwbc_funcs dcn30_dwbc_funcs = { 
	.disable		= dwb3_disable,

	.update			= dwb3_update,

	.is_enabled		= dwb3_is_enabled,

	.set_fc_enable		= dwb3_set_fc_enable,

	.set_stereo		= dwb3_set_stereo,

	.set_new_content	= dwb3_set_new_content,

	.dwb_program_output_csc	= NULL,

drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb.h

+0 −2
Original line number Diff line number Diff line
@@ -877,8 +877,6 @@ bool dwb3_update(struct dwbc *dwbc, struct dc_dwb_params *params); 


bool dwb3_is_enabled(struct dwbc *dwbc);



void dwb3_set_fc_enable(struct dwbc *dwbc, enum dwb_frame_capture_enable enable);



void dwb3_set_stereo(struct dwbc *dwbc,

	struct dwb_stereo_params *stereo_params);

drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h

+0 −4
Original line number Diff line number Diff line
@@ -188,10 +188,6 @@ struct dwbc_funcs { 
	bool (*is_enabled)(

		struct dwbc *dwbc);



	void (*set_fc_enable)(

		struct dwbc *dwbc,

		enum dwb_frame_capture_enable enable);



	void (*set_stereo)(

		struct dwbc *dwbc,

		struct dwb_stereo_params *stereo_params);