Merge "msm: mdss: fb: remove check for allocated during resolution switch" (c4ff7457) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/video/msm/mdss/mdss_fb.c

+4 −9

Original line number	Diff line number	Diff line
		@@ -3353,13 +3353,6 @@ static int mdss_fb_check_var(struct fb_var_screeninfo *var,
		if ((var->xres_virtual <= 0) \|\| (var->yres_virtual <= 0))
		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;

		@@ -3449,6 +3442,8 @@ static int mdss_fb_set_par(struct fb_info *info)
		else
		mfd->fbi->fix.line_length = var->xres * var->bits_per_pixel / 8;

		/* if memory is not allocated yet, change memory size for fb */
		if (!info->fix.smem_start)
		mfd->fbi->fix.smem_len = PAGE_ALIGN(mfd->fbi->fix.line_length *
		mfd->fbi->var.yres) * mfd->fb_page;