diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-09-13 10:58:14 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-09-13 10:58:14 -0700 |
| commit | 288edc578d8b4cc6333dc93cc63597361727c838 (patch) | |
| tree | f3b2a790f775ced388e9aeed45ce42647ad4a1a9 | |
| parent | 0dc637a1af2e72130c80fb69a6df4b5cfa23d486 (diff) | |
| parent | 5475f94ca5d5780a5920871c183f1f743b8a98af (diff) | |
Merge "msm: mdss: Increase the max layer count to 13"
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_fb.c | 1 | ||||
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/fbdev/msm/mdss_fb.c b/drivers/video/fbdev/msm/mdss_fb.c index fe1289633291..d35858137191 100644 --- a/drivers/video/fbdev/msm/mdss_fb.c +++ b/drivers/video/fbdev/msm/mdss_fb.c @@ -4697,6 +4697,7 @@ static int mdss_fb_atomic_commit_ioctl(struct fb_info *info, input_layer_list = commit.commit_v1.input_layers; if (layer_count > MAX_LAYER_COUNT) { + pr_err("invalid layer count :%d\n", layer_count); ret = -EINVAL; goto err; } else if (layer_count) { diff --git a/drivers/video/fbdev/msm/mdss_mdp.h b/drivers/video/fbdev/msm/mdss_mdp.h index feea8986af91..9796121bbabf 100644 --- a/drivers/video/fbdev/msm/mdss_mdp.h +++ b/drivers/video/fbdev/msm/mdss_mdp.h @@ -86,7 +86,7 @@ #define XIN_HALT_TIMEOUT_US 0x4000 -#define MAX_LAYER_COUNT 0xC +#define MAX_LAYER_COUNT 0xD /* For SRC QSEED3, when user space does not send the scaler information, * this flag allows pixel _extension to be programmed when scaler is disabled |