diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-05-08 18:49:44 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-05-08 18:49:44 -0700 |
| commit | 22dc337a69af6c8b2aceecb3cbaef9049ef4fb73 (patch) | |
| tree | f36fbf3ed2315945ddb58992bda59a71b78c5d9f /drivers/video/fbdev | |
| parent | 830b7b50b3852057fe0d2275c41d2d35f2efe4c4 (diff) | |
| parent | e85ceffc863de64fde987fa169623790c6140a26 (diff) | |
Merge "msm: mdss: mdp: mixer allocation for pluggable primary display"
Diffstat (limited to 'drivers/video/fbdev')
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_ctl.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_ctl.c b/drivers/video/fbdev/msm/mdss_mdp_ctl.c index e86f08810ba1..7a4277dfe936 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_ctl.c +++ b/drivers/video/fbdev/msm/mdss_mdp_ctl.c @@ -2579,6 +2579,7 @@ struct mdss_mdp_mixer *mdss_mdp_mixer_alloc( mixer_pool += ctl->mdata->ndspp; nmixers -= ctl->mdata->ndspp; } else if ((ctl->panel_data->panel_info.is_pluggable) && + !(ctl->panel_data->panel_info.is_prim_panel) && nmixers_active) { mixer_pool += ctl->mdata->ndspp; nmixers -= ctl->mdata->ndspp; |