drm/amd/display: Remove OPTC lock check
At some point, we decided to blank HUBP during pixel data blank, and to handle that, we added some OPTC lock checks. Later, we realized that this change caused multiple regression, and we removed it. Nevertheless, we still have some leftovers that might affect some ASIC behavior, and this commit drops those changes to keep the code consistent. Reviewed-by: Aurabindo Pillai <aurabindo.pillai@amd.com> Signed-off-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
9114b55fab
commit
b33cd65df1
@ -679,16 +679,6 @@ void optc1_unlock(struct timing_generator *optc)
|
||||
OTG_MASTER_UPDATE_LOCK, 0);
|
||||
}
|
||||
|
||||
bool optc1_is_locked(struct timing_generator *optc)
|
||||
{
|
||||
struct optc *optc1 = DCN10TG_FROM_TG(optc);
|
||||
uint32_t locked;
|
||||
|
||||
REG_GET(OTG_MASTER_UPDATE_LOCK, UPDATE_LOCK_STATUS, &locked);
|
||||
|
||||
return (locked == 1);
|
||||
}
|
||||
|
||||
void optc1_get_position(struct timing_generator *optc,
|
||||
struct crtc_position *position)
|
||||
{
|
||||
@ -1583,7 +1573,6 @@ static const struct timing_generator_funcs dcn10_tg_funcs = {
|
||||
.enable_crtc_reset = optc1_enable_crtc_reset,
|
||||
.disable_reset_trigger = optc1_disable_reset_trigger,
|
||||
.lock = optc1_lock,
|
||||
.is_locked = optc1_is_locked,
|
||||
.unlock = optc1_unlock,
|
||||
.enable_optc_clock = optc1_enable_optc_clock,
|
||||
.set_drr = optc1_set_drr,
|
||||
|
@ -654,7 +654,6 @@ void optc1_set_blank(struct timing_generator *optc,
|
||||
bool enable_blanking);
|
||||
|
||||
bool optc1_is_blanked(struct timing_generator *optc);
|
||||
bool optc1_is_locked(struct timing_generator *optc);
|
||||
|
||||
void optc1_program_blank_color(
|
||||
struct timing_generator *optc,
|
||||
|
@ -319,7 +319,6 @@ static struct timing_generator_funcs dcn30_tg_funcs = {
|
||||
.enable_crtc_reset = optc1_enable_crtc_reset,
|
||||
.disable_reset_trigger = optc1_disable_reset_trigger,
|
||||
.lock = optc3_lock,
|
||||
.is_locked = optc1_is_locked,
|
||||
.unlock = optc1_unlock,
|
||||
.lock_doublebuffer_enable = optc3_lock_doublebuffer_enable,
|
||||
.lock_doublebuffer_disable = optc3_lock_doublebuffer_disable,
|
||||
|
@ -260,7 +260,6 @@ static struct timing_generator_funcs dcn31_tg_funcs = {
|
||||
.enable_crtc_reset = optc1_enable_crtc_reset,
|
||||
.disable_reset_trigger = optc1_disable_reset_trigger,
|
||||
.lock = optc3_lock,
|
||||
.is_locked = optc1_is_locked,
|
||||
.unlock = optc1_unlock,
|
||||
.lock_doublebuffer_enable = optc3_lock_doublebuffer_enable,
|
||||
.lock_doublebuffer_disable = optc3_lock_doublebuffer_disable,
|
||||
|
@ -439,7 +439,6 @@ struct pipe_ctx {
|
||||
union pipe_update_flags update_flags;
|
||||
struct dwbc *dwbc;
|
||||
struct mcif_wb *mcif_wb;
|
||||
bool vtp_locked;
|
||||
};
|
||||
|
||||
/* Data used for dynamic link encoder assignment.
|
||||
|
@ -209,7 +209,6 @@ struct timing_generator_funcs {
|
||||
void (*set_blank)(struct timing_generator *tg,
|
||||
bool enable_blanking);
|
||||
bool (*is_blanked)(struct timing_generator *tg);
|
||||
bool (*is_locked)(struct timing_generator *tg);
|
||||
void (*set_overscan_blank_color) (struct timing_generator *tg, const struct tg_color *color);
|
||||
void (*set_blank_color)(struct timing_generator *tg, const struct tg_color *color);
|
||||
void (*set_colors)(struct timing_generator *tg,
|
||||
|
Loading…
x
Reference in New Issue
Block a user