Commit 5db0f6e8 authored by Stephane Viau's avatar Stephane Viau Committed by Rob Clark
Browse files

drm/msm/mdp5: fixup "drm/msm: fix fallout of atomic dpms changes" 



Commit 0b776d45 ("drm/msm: fix fallout of atomic dpms
changes") has a typo in both mdp5_encoder_helper_funcs and
mdp5_crtc_helper_funcs definitions:

	.dpms entry should be replaced by .disable and .enable

Also fixed a typo in mdp5_encoder_enable().

Note that these typos are only present for MDP5. MDP4 is fine.

Signed-off-by: default avatarStephane Viau <sviau@codeaurora.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent ed9ed50c

drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c

+2 −2
Original line number Diff line number Diff line
@@ -544,8 +544,8 @@ static const struct drm_crtc_funcs mdp5_crtc_funcs = { 
static const struct drm_crtc_helper_funcs mdp5_crtc_helper_funcs = {

	.mode_fixup = mdp5_crtc_mode_fixup,

	.mode_set_nofb = mdp5_crtc_mode_set_nofb,

	.prepare = mdp5_crtc_disable,

	.commit = mdp5_crtc_enable,

	.disable = mdp5_crtc_disable,

	.enable = mdp5_crtc_enable,

	.atomic_check = mdp5_crtc_atomic_check,

	.atomic_begin = mdp5_crtc_atomic_begin,

	.atomic_flush = mdp5_crtc_atomic_flush,

drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c

+3 −3
Original line number Diff line number Diff line
@@ -267,14 +267,14 @@ static void mdp5_encoder_enable(struct drm_encoder *encoder) 
	mdp5_write(mdp5_kms, REG_MDP5_INTF_TIMING_ENGINE_EN(intf), 1);

	spin_unlock_irqrestore(&mdp5_encoder->intf_lock, flags);



	mdp5_encoder->enabled = false;

	mdp5_encoder->enabled = true;

}



static const struct drm_encoder_helper_funcs mdp5_encoder_helper_funcs = {

	.mode_fixup = mdp5_encoder_mode_fixup,

	.mode_set = mdp5_encoder_mode_set,

	.prepare = mdp5_encoder_disable,

	.commit = mdp5_encoder_enable,

	.disable = mdp5_encoder_disable,

	.enable = mdp5_encoder_enable,

};



/* initialize encoder */

CRA Git | Maintained and supported by SUSTech CRA and CCSE