From: Tony Lindgren <tony@atomide.com>
To: arun c <arunedarath@mistralsolutions.com>
Cc: "linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>
Subject: Re: [PATCH] omapfb: remove wrong scale call for gfx_plane
Date: Wed, 10 Sep 2008 10:53:00 -0700 [thread overview]
Message-ID: <20080910175259.GD21163@atomide.com> (raw)
In-Reply-To: <c656a4d20809090043g27d7a73eqf345588b4575c68d@mail.gmail.com>
* arun c <arunedarath@mistralsolutions.com> [080909 00:47]:
> The gfx_plane doesn't support scaling.
Pushing today.
Tony
>
> Signed-off-by: Arun C <arunedarath@mistralsolutions.com>
> ---
> drivers/video/omap/dispc.c | 3 +--
> drivers/video/omap/omapfb_main.c | 6 ++++--
> 2 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c
> index 82ba030..ce4c4de 100644
> --- a/drivers/video/omap/dispc.c
> +++ b/drivers/video/omap/dispc.c
> @@ -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);
> diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c
> index 1ffe74c..d176a2c 100644
> --- a/drivers/video/omap/omapfb_main.c
> +++ b/drivers/video/omap/omapfb_main.c
> @@ -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 r;
> + return 0;
> }
>
> /*
> --
> 1.5.3.4
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
prev parent reply other threads:[~2008-09-10 17:53 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-09 7:43 [PATCH] omapfb: remove wrong scale call for gfx_plane arun c
2008-09-10 17:53 ` Tony Lindgren [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080910175259.GD21163@atomide.com \
--to=tony@atomide.com \
--cc=arunedarath@mistralsolutions.com \
--cc=linux-omap@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox