diff options
| author | Adrian Salido-Moreno <adrianm@codeaurora.org> | 2012-09-28 15:22:37 -0700 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 20:12:44 -0700 |
| commit | 2d5f643eaf65406d176756a3e62cc98b733ebd96 (patch) | |
| tree | 376712405a0a792ac8ef11b5d03321bd9b639419 | |
| parent | dda55c4ded9b03c0cc0e3b36c654fd08e1b3f45c (diff) | |
msm: mdss: disable framebuffer memory check when not allocated
HDMI and WFD don't allocate any memory for framebuffer, in this case
there is no need to check for available framebuffer memory.
Change-Id: Id3fc6279e1b2a5d4b96d3b85e29ba6865a4dd38f
Signed-off-by: Adrian Salido-Moreno <adrianm@codeaurora.org>
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_fb.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/video/fbdev/msm/mdss_fb.c b/drivers/video/fbdev/msm/mdss_fb.c index 565674b62bb4..2e734c4a21a8 100644 --- a/drivers/video/fbdev/msm/mdss_fb.c +++ b/drivers/video/fbdev/msm/mdss_fb.c @@ -946,7 +946,6 @@ static int mdss_fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) { struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par; - u32 len; if (var->rotate != FB_ROTATE_UR) return -EINVAL; @@ -1025,9 +1024,12 @@ static int mdss_fb_check_var(struct fb_var_screeninfo *var, if ((var->xres_virtual <= 0) || (var->yres_virtual <= 0)) return -EINVAL; - len = var->xres_virtual * var->yres_virtual * (var->bits_per_pixel / 8); - if (len > info->fix.smem_len) - return -EINVAL; + if (info->fix.smem_start) { + u32 len = var->xres_virtual * var->yres_virtual * + (var->bits_per_pixel / 8); + if (len > info->fix.smem_len) + return -EINVAL; + } if ((var->xres == 0) || (var->yres == 0)) return -EINVAL; |