Commit 0ddc3a63 authored by Archit Taneja's avatar Archit Taneja Committed by Rob Clark

drm/msm/mdp5: Start using parameters from CRTC state

In the last few commits, we've been adding params to mdp5_crtc_state, and
assigning them in the atomic_check() funcs. Now it's time to actually
start using them.

Remove the duplicated params from the mdp5_crtc struct, and start using
them in the mdp5_crtc code. The majority of the references to these params
is in code that executes after the atomic swap has occurred, so it's okay
to use crtc->state in them. There are a couple of legacy LM cursor ops that
may not use the updated state, but (I think) it's okay to live with that.

Now that we dynamically allocate a mixer to the CRTC, we can also remove
the static assignment to it in mdp5_crtc_init, and also drop the code that
skipped init-ing WB bound mixers (those will now be rejected by
mdp5_mixer_assign()).
Signed-off-by: default avatarArchit Taneja <architt@codeaurora.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent bcb877b7
This diff is collapsed.
...@@ -849,10 +849,6 @@ static int hwmixer_init(struct mdp5_kms *mdp5_kms) ...@@ -849,10 +849,6 @@ static int hwmixer_init(struct mdp5_kms *mdp5_kms)
return ret; return ret;
} }
/* Don't create LMs connected to WB for now */
if (!mixer)
continue;
mixer->idx = mdp5_kms->num_hwmixers; mixer->idx = mdp5_kms->num_hwmixers;
mdp5_kms->hwmixers[mdp5_kms->num_hwmixers++] = mixer; mdp5_kms->hwmixers[mdp5_kms->num_hwmixers++] = mixer;
} }
......
...@@ -84,10 +84,6 @@ struct mdp5_hw_mixer *mdp5_mixer_init(const struct mdp5_lm_instance *lm) ...@@ -84,10 +84,6 @@ struct mdp5_hw_mixer *mdp5_mixer_init(const struct mdp5_lm_instance *lm)
{ {
struct mdp5_hw_mixer *mixer; struct mdp5_hw_mixer *mixer;
/* ignore WB bound mixers for now */
if (lm->caps & MDP_LM_CAP_WB)
return NULL;
mixer = kzalloc(sizeof(*mixer), GFP_KERNEL); mixer = kzalloc(sizeof(*mixer), GFP_KERNEL);
if (!mixer) if (!mixer)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment