Commit 4139f42e authored by arun c's avatar arun c Committed by Tony Lindgren

omapfb: remove wrong scale call for gfx_plane

The gfx_plane doesn't support scaling.
Signed-off-by: default avatarArun C <arunedarath@mistralsolutions.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 7aea596f
......@@ -519,8 +519,7 @@ static int omap_dispc_set_scale(int plane,
if ((unsigned)plane > OMAPFB_PLANE_NUM)
return -ENODEV;
if (plane == OMAPFB_PLANE_GFX &&
(out_width != orig_width || out_height != orig_height))
if (out_width != orig_width || out_height != orig_height)
return -EINVAL;
enable_lcd_clocks(1);
......
......@@ -223,13 +223,15 @@ static int ctrl_change_mode(struct fb_info *fbi)
if((r = fbdev->ctrl->set_rotate(var->rotate)) < 0)
return r;
if (fbdev->ctrl->set_scale != NULL)
if ((fbdev->ctrl->set_scale != NULL) && (plane->idx > 0))
r = fbdev->ctrl->set_scale(plane->idx,
var->xres, var->yres,
plane->info.out_width,
plane->info.out_height);
if (r < 0)
return r;
return 0;
}
/*
......
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