From: Grant Likely <grant.likely@secretlab.ca>
To: Anatolij Gustschin <agust@denx.de>
Cc: linux-fbdev@vger.kernel.org, wd@denx.de, dzu@denx.de,
jrigby@gmail.com, linuxppc-dev@ozlabs.org, yorksun@freescale.com
Subject: Re: [PATCH 2/3] fbdev: fsl-diu-fb.c: allow setting panel video mode
Date: Sun, 28 Feb 2010 06:52:57 +0000 [thread overview]
Message-ID: <fa686aa41002272252t7d62dcd2p26f5fe1480ab53e6@mail.gmail.com> (raw)
In-Reply-To: <1267307902-31939-3-git-send-email-agust@denx.de>
On Sat, Feb 27, 2010 at 2:58 PM, Anatolij Gustschin <agust@denx.de> wrote:
> Add support for specifying display panel data in the device
> tree. If no panel data is provided in the device tree, default
> video mode will be used as usual.
>
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
This one seems okay, but the binding in the first patch first needs to
get resolved.
g.
> ---
> drivers/video/Kconfig | 1 +
> drivers/video/fsl-diu-fb.c | 63 +++++++++++++++++++++++++-------------------
> 2 files changed, 37 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
> index dc1beb0..c805ecd 100644
> --- a/drivers/video/Kconfig
> +++ b/drivers/video/Kconfig
> @@ -1850,6 +1850,7 @@ config FB_FSL_DIU
> select FB_CFB_COPYAREA
> select FB_CFB_IMAGEBLIT
> select PPC_LIB_RHEAP
> + select FB_OF_MODE
> ---help---
> Framebuffer driver for the Freescale SoC DIU
>
> diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
> index 4637bcb..19ca1da 100644
> --- a/drivers/video/fsl-diu-fb.c
> +++ b/drivers/video/fsl-diu-fb.c
> @@ -36,6 +36,8 @@
> #include <sysdev/fsl_soc.h>
> #include "fsl-diu-fb.h"
>
> +#include "ofmode.h"
> +
> /*
> * These parameters give default parameters
> * for video output 1024x768,
> @@ -1168,7 +1170,7 @@ static int init_fbinfo(struct fb_info *info)
> return 0;
> }
>
> -static int __devinit install_fb(struct fb_info *info)
> +static int __devinit install_fb(struct device_node *np, struct fb_info *info)
> {
> int rc;
> struct mfb_info *mfbi = info->par;
> @@ -1177,33 +1179,40 @@ static int __devinit install_fb(struct fb_info *info)
> if (init_fbinfo(info))
> return -EINVAL;
>
> - if (mfbi->index = 0) /* plane 0 */
> - aoi_mode = fb_mode;
> - else
> + if (mfbi->index = 0) { /* plane 0 */
> + /* use default mode for plane0 if there is no mode in DTB */
> + if (of_get_video_mode(np, info) < 0)
> + aoi_mode = fb_mode;
> + else
> + aoi_mode = NULL;
> + } else
> aoi_mode = init_aoi_mode;
> - pr_debug("mode used = %s\n", aoi_mode);
> - rc = fb_find_mode(&info->var, info, aoi_mode, fsl_diu_mode_db,
> - ARRAY_SIZE(fsl_diu_mode_db), &fsl_diu_default_mode, default_bpp);
>
> - switch (rc) {
> - case 1:
> - pr_debug("using mode specified in @mode\n");
> - break;
> - case 2:
> - pr_debug("using mode specified in @mode "
> - "with ignored refresh rate\n");
> - break;
> - case 3:
> - pr_debug("using mode default mode\n");
> - break;
> - case 4:
> - pr_debug("using mode from list\n");
> - break;
> - default:
> - pr_debug("rc = %d\n", rc);
> - pr_debug("failed to find mode\n");
> - return -EINVAL;
> - break;
> + if (aoi_mode) {
> + pr_debug("mode used = %s\n", aoi_mode);
> + rc = fb_find_mode(&info->var, info, aoi_mode, fsl_diu_mode_db,
> + ARRAY_SIZE(fsl_diu_mode_db),
> + &fsl_diu_default_mode, default_bpp);
> + switch (rc) {
> + case 1:
> + pr_debug("using mode specified in @mode\n");
> + break;
> + case 2:
> + pr_debug("using mode specified in @mode "
> + "with ignored refresh rate\n");
> + break;
> + case 3:
> + pr_debug("using mode default mode\n");
> + break;
> + case 4:
> + pr_debug("using mode from list\n");
> + break;
> + default:
> + pr_debug("rc = %d\n", rc);
> + pr_debug("failed to find mode\n");
> + return -EINVAL;
> + break;
> + }
> }
>
> pr_debug("xres_virtual %d\n", info->var.xres_virtual);
> @@ -1521,7 +1530,7 @@ static int __devinit fsl_diu_probe(struct of_device *ofdev,
> mfbi->ad = (struct diu_ad *)((u32)pool.ad.vaddr
> + pool.ad.offset) + i;
> mfbi->ad->paddr = pool.ad.paddr + i * sizeof(struct diu_ad);
> - ret = install_fb(machine_data->fsl_diu_info[i]);
> + ret = install_fb(np, machine_data->fsl_diu_info[i]);
> if (ret) {
> dev_err(&ofdev->dev,
> "Failed to register framebuffer %d\n",
> --
> 1.6.3.3
>
>
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
next prev parent reply other threads:[~2010-02-28 6:52 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <fa686aa41002161006l3b301febt94fe990df4bddfe9@mail.gmail.com>
2010-02-27 21:58 ` [PATCH 0/3] Rework MPC5121 DIU support (for 2.6.34) Anatolij Gustschin
2010-02-28 7:04 ` Grant Likely
2010-02-28 14:32 ` sun york-R58495
2010-02-27 21:58 ` [PATCH 1/3] video: add support for getting video mode from device tree Anatolij Gustschin
2010-02-28 6:30 ` [PATCH 1/3] video: add support for getting video mode from device Grant Likely
[not found] ` <fa686aa41002272230s7f900c0fv1aabf0e26ccbf84c-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2010-02-28 8:44 ` Mitch Bradley
[not found] ` <4B8A2CD7.7070305-D5eQfiDGL7eakBO8gow8eQ@public.gmane.org>
2010-02-28 14:47 ` Grant Likely
2010-03-01 3:45 ` [PATCH 1/3] video: add support for getting video mode from Benjamin Herrenschmidt
2010-04-28 13:43 ` Anatolij Gustschin
2010-05-19 21:19 ` [PATCH 1/3] video: add support for getting video mode from device Grant Likely
2010-02-27 21:58 ` [PATCH 2/3] fbdev: fsl-diu-fb.c: allow setting panel video mode from DT Anatolij Gustschin
2010-02-28 6:52 ` Grant Likely [this message]
2010-02-27 21:58 ` [PATCH 3/3] powerpc/mpc5121: shared DIU framebuffer support Anatolij Gustschin
2010-02-28 6:50 ` Grant Likely
2010-04-28 20:28 ` Anatolij Gustschin
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=fa686aa41002272252t7d62dcd2p26f5fe1480ab53e6@mail.gmail.com \
--to=grant.likely@secretlab.ca \
--cc=agust@denx.de \
--cc=dzu@denx.de \
--cc=jrigby@gmail.com \
--cc=linux-fbdev@vger.kernel.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=wd@denx.de \
--cc=yorksun@freescale.com \
/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;
as well as URLs for NNTP newsgroup(s).