| Message ID | 1300782452-528-4-git-send-email-hs@denx.de (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Tue, Mar 22, 2011 at 09:27:29AM +0100, Heiko Schocher wrote: > - add commandline options: > sm501fb.mode: > Specify resolution as "<xres>x<yres>[-<bpp>][@<refresh>]" > sm501fb.bpp: > Specify bit-per-pixel if not specified mode > > - Add support for encoding display mode information > in the device tree using verbatim EDID block. > > If the "edid" entry in the "smi,sm501" node is present, > the driver will build mode database using EDID data > and allow setting the display modes from this database. > > Signed-off-by: Heiko Schocher <hs@denx.de> Merged, thanks. g. > cc: Wolfram Sang <w.sang@pengutronix.de> > cc: Grant Likely <grant.likely@secretlab.ca> > cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> > cc: linux-fbdev@vger.kernel.org > cc: devicetree-discuss@ozlabs.org > cc: Ben Dooks <ben@simtec.co.uk> > cc: Vincent Sanders <vince@simtec.co.uk> > cc: Samuel Ortiz <sameo@linux.intel.com> > cc: linux-kernel@vger.kernel.org > cc: Randy Dunlap <rdunlap@xenotime.net> > cc: Wolfgang Denk <wd@denx.de> > cc: Paul Mundt <lethal@linux-sh.org> > --- > - changes since v1: > add Ben Dooks, Vincent Sanders and Samuel Ortiz to cc, as suggested from > Paul Mundt. > - changes since v2: > add comments from Randy Dunlap: > - move parameter documentation to Documentation/fb/sm501.txt > - changes since v3: > - rebased against v2.6.38-rc2 > - split in 3 patches > - of support patch > - i/o routine patch > - edid support patch > - changes since v4: > - add "info->pdata = &sm501fb_def_pdata;" in sm501fb_probe() > as Paul Mundt suggested (and I wrongly deleted) > - move kfree(info->edid_data); to patch 3/4 > as edid_data is only allocated in the CONFIG_OF case > - changes for v6: > - repost complete patchserie > - rebased against current head > > Documentation/fb/sm501.txt | 10 +++++++ > drivers/video/sm501fb.c | 65 ++++++++++++++++++++++++++++++++++++++++--- > 2 files changed, 70 insertions(+), 5 deletions(-) > create mode 100644 Documentation/fb/sm501.txt > > diff --git a/Documentation/fb/sm501.txt b/Documentation/fb/sm501.txt > new file mode 100644 > index 0000000..8d17aeb > --- /dev/null > +++ b/Documentation/fb/sm501.txt > @@ -0,0 +1,10 @@ > +Configuration: > + > +You can pass the following kernel command line options to sm501 videoframebuffer: > + > + sm501fb.bpp= SM501 Display driver: > + Specifiy bits-per-pixel if not specified by 'mode' > + > + sm501fb.mode= SM501 Display driver: > + Specify resolution as > + "<xres>x<yres>[-<bpp>][@<refresh>]" > diff --git a/drivers/video/sm501fb.c b/drivers/video/sm501fb.c > index 5df406c..f31252c 100644 > --- a/drivers/video/sm501fb.c > +++ b/drivers/video/sm501fb.c > @@ -41,6 +41,26 @@ > #include <linux/sm501.h> > #include <linux/sm501-regs.h> > > +#include "edid.h" > + > +static char *fb_mode = "640x480-16@60"; > +static unsigned long default_bpp = 16; > + > +static struct fb_videomode __devinitdata sm501_default_mode = { > + .refresh = 60, > + .xres = 640, > + .yres = 480, > + .pixclock = 20833, > + .left_margin = 142, > + .right_margin = 13, > + .upper_margin = 21, > + .lower_margin = 1, > + .hsync_len = 69, > + .vsync_len = 3, > + .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, > + .vmode = FB_VMODE_NONINTERLACED > +}; > + > #define NR_PALETTE 256 > > enum sm501_controller { > @@ -77,6 +97,7 @@ struct sm501fb_info { > void __iomem *regs2d; /* 2d remapped registers */ > void __iomem *fbmem; /* remapped framebuffer */ > size_t fbmem_len; /* length of remapped region */ > + u8 *edid_data; > }; > > /* per-framebuffer private data */ > @@ -1725,9 +1746,16 @@ static int sm501fb_init_fb(struct fb_info *fb, > fb->var.vmode = FB_VMODE_NONINTERLACED; > fb->var.bits_per_pixel = 16; > > + if (info->edid_data) { > + /* Now build modedb from EDID */ > + fb_edid_to_monspecs(info->edid_data, &fb->monspecs); > + fb_videomode_to_modelist(fb->monspecs.modedb, > + fb->monspecs.modedb_len, > + &fb->modelist); > + } > + > if (enable && (pd->flags & SM501FB_FLAG_USE_INIT_MODE) && 0) { > /* TODO read the mode from the current display */ > - > } else { > if (pd->def_mode) { > dev_info(info->dev, "using supplied mode\n"); > @@ -1737,12 +1765,34 @@ static int sm501fb_init_fb(struct fb_info *fb, > fb->var.xres_virtual = fb->var.xres; > fb->var.yres_virtual = fb->var.yres; > } else { > - ret = fb_find_mode(&fb->var, fb, > + if (info->edid_data) > + ret = fb_find_mode(&fb->var, fb, fb_mode, > + fb->monspecs.modedb, > + fb->monspecs.modedb_len, > + &sm501_default_mode, default_bpp); > + else > + ret = fb_find_mode(&fb->var, fb, > NULL, NULL, 0, NULL, 8); > > - if (ret == 0 || ret == 4) { > - dev_err(info->dev, > - "failed to get initial mode\n"); > + switch (ret) { > + case 1: > + dev_info(info->dev, "using mode specified in " > + "@mode\n"); > + break; > + case 2: > + dev_info(info->dev, "using mode specified in " > + "@mode with ignored refresh rate\n"); > + break; > + case 3: > + dev_info(info->dev, "using mode default " > + "mode\n"); > + break; > + case 4: > + dev_info(info->dev, "using mode from list\n"); > + break; > + default: > + dev_info(info->dev, "ret = %d\n", ret); > + dev_info(info->dev, "failed to find mode\n"); > return -EINVAL; > } > } > @@ -2157,6 +2207,11 @@ static void __exit sm501fb_cleanup(void) > module_init(sm501fb_init); > module_exit(sm501fb_cleanup); > > +module_param_named(mode, fb_mode, charp, 0); > +MODULE_PARM_DESC(mode, > + "Specify resolution as \"<xres>x<yres>[-<bpp>][@<refresh>]\" "); > +module_param_named(bpp, default_bpp, ulong, 0); > +MODULE_PARM_DESC(bpp, "Specify bit-per-pixel if not specified mode"); > MODULE_AUTHOR("Ben Dooks, Vincent Sanders"); > MODULE_DESCRIPTION("SM501 Framebuffer driver"); > MODULE_LICENSE("GPL v2"); > -- > 1.7.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, May 2, 2011 at 4:27 PM, Grant Likely <grant.likely@secretlab.ca> wrote: > On Tue, Mar 22, 2011 at 09:27:29AM +0100, Heiko Schocher wrote: >> - add commandline options: >> sm501fb.mode: >> Specify resolution as "<xres>x<yres>[-<bpp>][@<refresh>]" >> sm501fb.bpp: >> Specify bit-per-pixel if not specified mode >> >> - Add support for encoding display mode information >> in the device tree using verbatim EDID block. >> >> If the "edid" entry in the "smi,sm501" node is present, >> the driver will build mode database using EDID data >> and allow setting the display modes from this database. >> >> Signed-off-by: Heiko Schocher <hs@denx.de> > > Merged, thanks. This patch causes the following build warning: MODPOST vmlinux.o WARNING: vmlinux.o(.text+0x1d5572): Section mismatch in reference from the function sm501fb_init_fb() to the variable .devinit.data:sm501_default_mode The function sm501fb_init_fb() references the variable __devinitdata sm501_default_mode. This is often because sm501fb_init_fb lacks a __devinitdata annotation or the annotation of sm501_default_mode is wrong. WARNING: vmlinux.o(.text+0x1d557a): Section mismatch in reference from the function sm501fb_init_fb() to the variable .devinit.data:sm501_default_mode The function sm501fb_init_fb() references the variable __devinitdata sm501_default_mode. This is often because sm501fb_init_fb lacks a __devinitdata annotation or the annotation of sm501_default_mode is wrong. I've dropped the __devinitdata declaration in what I committed; can you investigate and post a fixup patch? > > g. > >> cc: Wolfram Sang <w.sang@pengutronix.de> >> cc: Grant Likely <grant.likely@secretlab.ca> >> cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> >> cc: linux-fbdev@vger.kernel.org >> cc: devicetree-discuss@ozlabs.org >> cc: Ben Dooks <ben@simtec.co.uk> >> cc: Vincent Sanders <vince@simtec.co.uk> >> cc: Samuel Ortiz <sameo@linux.intel.com> >> cc: linux-kernel@vger.kernel.org >> cc: Randy Dunlap <rdunlap@xenotime.net> >> cc: Wolfgang Denk <wd@denx.de> >> cc: Paul Mundt <lethal@linux-sh.org> >> --- >> - changes since v1: >> add Ben Dooks, Vincent Sanders and Samuel Ortiz to cc, as suggested from >> Paul Mundt. >> - changes since v2: >> add comments from Randy Dunlap: >> - move parameter documentation to Documentation/fb/sm501.txt >> - changes since v3: >> - rebased against v2.6.38-rc2 >> - split in 3 patches >> - of support patch >> - i/o routine patch >> - edid support patch >> - changes since v4: >> - add "info->pdata = &sm501fb_def_pdata;" in sm501fb_probe() >> as Paul Mundt suggested (and I wrongly deleted) >> - move kfree(info->edid_data); to patch 3/4 >> as edid_data is only allocated in the CONFIG_OF case >> - changes for v6: >> - repost complete patchserie >> - rebased against current head >> >> Documentation/fb/sm501.txt | 10 +++++++ >> drivers/video/sm501fb.c | 65 ++++++++++++++++++++++++++++++++++++++++--- >> 2 files changed, 70 insertions(+), 5 deletions(-) >> create mode 100644 Documentation/fb/sm501.txt >> >> diff --git a/Documentation/fb/sm501.txt b/Documentation/fb/sm501.txt >> new file mode 100644 >> index 0000000..8d17aeb >> --- /dev/null >> +++ b/Documentation/fb/sm501.txt >> @@ -0,0 +1,10 @@ >> +Configuration: >> + >> +You can pass the following kernel command line options to sm501 videoframebuffer: >> + >> + sm501fb.bpp= SM501 Display driver: >> + Specifiy bits-per-pixel if not specified by 'mode' >> + >> + sm501fb.mode= SM501 Display driver: >> + Specify resolution as >> + "<xres>x<yres>[-<bpp>][@<refresh>]" >> diff --git a/drivers/video/sm501fb.c b/drivers/video/sm501fb.c >> index 5df406c..f31252c 100644 >> --- a/drivers/video/sm501fb.c >> +++ b/drivers/video/sm501fb.c >> @@ -41,6 +41,26 @@ >> #include <linux/sm501.h> >> #include <linux/sm501-regs.h> >> >> +#include "edid.h" >> + >> +static char *fb_mode = "640x480-16@60"; >> +static unsigned long default_bpp = 16; >> + >> +static struct fb_videomode __devinitdata sm501_default_mode = { >> + .refresh = 60, >> + .xres = 640, >> + .yres = 480, >> + .pixclock = 20833, >> + .left_margin = 142, >> + .right_margin = 13, >> + .upper_margin = 21, >> + .lower_margin = 1, >> + .hsync_len = 69, >> + .vsync_len = 3, >> + .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, >> + .vmode = FB_VMODE_NONINTERLACED >> +}; >> + >> #define NR_PALETTE 256 >> >> enum sm501_controller { >> @@ -77,6 +97,7 @@ struct sm501fb_info { >> void __iomem *regs2d; /* 2d remapped registers */ >> void __iomem *fbmem; /* remapped framebuffer */ >> size_t fbmem_len; /* length of remapped region */ >> + u8 *edid_data; >> }; >> >> /* per-framebuffer private data */ >> @@ -1725,9 +1746,16 @@ static int sm501fb_init_fb(struct fb_info *fb, >> fb->var.vmode = FB_VMODE_NONINTERLACED; >> fb->var.bits_per_pixel = 16; >> >> + if (info->edid_data) { >> + /* Now build modedb from EDID */ >> + fb_edid_to_monspecs(info->edid_data, &fb->monspecs); >> + fb_videomode_to_modelist(fb->monspecs.modedb, >> + fb->monspecs.modedb_len, >> + &fb->modelist); >> + } >> + >> if (enable && (pd->flags & SM501FB_FLAG_USE_INIT_MODE) && 0) { >> /* TODO read the mode from the current display */ >> - >> } else { >> if (pd->def_mode) { >> dev_info(info->dev, "using supplied mode\n"); >> @@ -1737,12 +1765,34 @@ static int sm501fb_init_fb(struct fb_info *fb, >> fb->var.xres_virtual = fb->var.xres; >> fb->var.yres_virtual = fb->var.yres; >> } else { >> - ret = fb_find_mode(&fb->var, fb, >> + if (info->edid_data) >> + ret = fb_find_mode(&fb->var, fb, fb_mode, >> + fb->monspecs.modedb, >> + fb->monspecs.modedb_len, >> + &sm501_default_mode, default_bpp); >> + else >> + ret = fb_find_mode(&fb->var, fb, >> NULL, NULL, 0, NULL, 8); >> >> - if (ret == 0 || ret == 4) { >> - dev_err(info->dev, >> - "failed to get initial mode\n"); >> + switch (ret) { >> + case 1: >> + dev_info(info->dev, "using mode specified in " >> + "@mode\n"); >> + break; >> + case 2: >> + dev_info(info->dev, "using mode specified in " >> + "@mode with ignored refresh rate\n"); >> + break; >> + case 3: >> + dev_info(info->dev, "using mode default " >> + "mode\n"); >> + break; >> + case 4: >> + dev_info(info->dev, "using mode from list\n"); >> + break; >> + default: >> + dev_info(info->dev, "ret = %d\n", ret); >> + dev_info(info->dev, "failed to find mode\n"); >> return -EINVAL; >> } >> } >> @@ -2157,6 +2207,11 @@ static void __exit sm501fb_cleanup(void) >> module_init(sm501fb_init); >> module_exit(sm501fb_cleanup); >> >> +module_param_named(mode, fb_mode, charp, 0); >> +MODULE_PARM_DESC(mode, >> + "Specify resolution as \"<xres>x<yres>[-<bpp>][@<refresh>]\" "); >> +module_param_named(bpp, default_bpp, ulong, 0); >> +MODULE_PARM_DESC(bpp, "Specify bit-per-pixel if not specified mode"); >> MODULE_AUTHOR("Ben Dooks, Vincent Sanders"); >> MODULE_DESCRIPTION("SM501 Framebuffer driver"); >> MODULE_LICENSE("GPL v2"); >> -- >> 1.7.4 >> >
Hello Grant, Grant Likely wrote: > On Mon, May 2, 2011 at 4:27 PM, Grant Likely <grant.likely@secretlab.ca> wrote: >> On Tue, Mar 22, 2011 at 09:27:29AM +0100, Heiko Schocher wrote: >>> - add commandline options: >>> sm501fb.mode: >>> Specify resolution as "<xres>x<yres>[-<bpp>][@<refresh>]" >>> sm501fb.bpp: >>> Specify bit-per-pixel if not specified mode >>> >>> - Add support for encoding display mode information >>> in the device tree using verbatim EDID block. >>> >>> If the "edid" entry in the "smi,sm501" node is present, >>> the driver will build mode database using EDID data >>> and allow setting the display modes from this database. >>> >>> Signed-off-by: Heiko Schocher <hs@denx.de> >> Merged, thanks. > > This patch causes the following build warning: Hups ... when I posted the patch, it compiled clean ... > MODPOST vmlinux.o > WARNING: vmlinux.o(.text+0x1d5572): Section mismatch in reference from > the function sm501fb_init_fb() to the variable > .devinit.data:sm501_default_mode > The function sm501fb_init_fb() references > the variable __devinitdata sm501_default_mode. > This is often because sm501fb_init_fb lacks a __devinitdata > annotation or the annotation of sm501_default_mode is wrong. > > WARNING: vmlinux.o(.text+0x1d557a): Section mismatch in reference from > the function sm501fb_init_fb() to the variable > .devinit.data:sm501_default_mode > The function sm501fb_init_fb() references > the variable __devinitdata sm501_default_mode. > This is often because sm501fb_init_fb lacks a __devinitdata > annotation or the annotation of sm501_default_mode is wrong. > > I've dropped the __devinitdata declaration in what I committed; can > you investigate and post a fixup patch? Of course, I look ASAP at it, thanks! (Dummy question: where can I find your tree?) bye, Heiko
On Mon, May 2, 2011 at 11:27 PM, Heiko Schocher <hs@denx.de> wrote: > Hello Grant, > > Grant Likely wrote: >> On Mon, May 2, 2011 at 4:27 PM, Grant Likely <grant.likely@secretlab.ca> wrote: >>> On Tue, Mar 22, 2011 at 09:27:29AM +0100, Heiko Schocher wrote: >>>> - add commandline options: >>>> sm501fb.mode: >>>> Specify resolution as "<xres>x<yres>[-<bpp>][@<refresh>]" >>>> sm501fb.bpp: >>>> Specify bit-per-pixel if not specified mode >>>> >>>> - Add support for encoding display mode information >>>> in the device tree using verbatim EDID block. >>>> >>>> If the "edid" entry in the "smi,sm501" node is present, >>>> the driver will build mode database using EDID data >>>> and allow setting the display modes from this database. >>>> >>>> Signed-off-by: Heiko Schocher <hs@denx.de> >>> Merged, thanks. >> >> This patch causes the following build warning: > > Hups ... when I posted the patch, it compiled clean ... > >> MODPOST vmlinux.o >> WARNING: vmlinux.o(.text+0x1d5572): Section mismatch in reference from >> the function sm501fb_init_fb() to the variable >> .devinit.data:sm501_default_mode >> The function sm501fb_init_fb() references >> the variable __devinitdata sm501_default_mode. >> This is often because sm501fb_init_fb lacks a __devinitdata >> annotation or the annotation of sm501_default_mode is wrong. >> >> WARNING: vmlinux.o(.text+0x1d557a): Section mismatch in reference from >> the function sm501fb_init_fb() to the variable >> .devinit.data:sm501_default_mode >> The function sm501fb_init_fb() references >> the variable __devinitdata sm501_default_mode. >> This is often because sm501fb_init_fb lacks a __devinitdata >> annotation or the annotation of sm501_default_mode is wrong. >> >> I've dropped the __devinitdata declaration in what I committed; can >> you investigate and post a fixup patch? > > Of course, I look ASAP at it, thanks! > (Dummy question: where can I find your tree?) git://git.secretlab.ca/git/linux-2.6 powerpc/next g. > > bye, > Heiko > -- > DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel > HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany >
diff --git a/Documentation/fb/sm501.txt b/Documentation/fb/sm501.txt new file mode 100644 index 0000000..8d17aeb --- /dev/null +++ b/Documentation/fb/sm501.txt @@ -0,0 +1,10 @@ +Configuration: + +You can pass the following kernel command line options to sm501 videoframebuffer: + + sm501fb.bpp= SM501 Display driver: + Specifiy bits-per-pixel if not specified by 'mode' + + sm501fb.mode= SM501 Display driver: + Specify resolution as + "<xres>x<yres>[-<bpp>][@<refresh>]" diff --git a/drivers/video/sm501fb.c b/drivers/video/sm501fb.c index 5df406c..f31252c 100644 --- a/drivers/video/sm501fb.c +++ b/drivers/video/sm501fb.c @@ -41,6 +41,26 @@ #include <linux/sm501.h> #include <linux/sm501-regs.h> +#include "edid.h" + +static char *fb_mode = "640x480-16@60"; +static unsigned long default_bpp = 16; + +static struct fb_videomode __devinitdata sm501_default_mode = { + .refresh = 60, + .xres = 640, + .yres = 480, + .pixclock = 20833, + .left_margin = 142, + .right_margin = 13, + .upper_margin = 21, + .lower_margin = 1, + .hsync_len = 69, + .vsync_len = 3, + .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, + .vmode = FB_VMODE_NONINTERLACED +}; + #define NR_PALETTE 256 enum sm501_controller { @@ -77,6 +97,7 @@ struct sm501fb_info { void __iomem *regs2d; /* 2d remapped registers */ void __iomem *fbmem; /* remapped framebuffer */ size_t fbmem_len; /* length of remapped region */ + u8 *edid_data; }; /* per-framebuffer private data */ @@ -1725,9 +1746,16 @@ static int sm501fb_init_fb(struct fb_info *fb, fb->var.vmode = FB_VMODE_NONINTERLACED; fb->var.bits_per_pixel = 16; + if (info->edid_data) { + /* Now build modedb from EDID */ + fb_edid_to_monspecs(info->edid_data, &fb->monspecs); + fb_videomode_to_modelist(fb->monspecs.modedb, + fb->monspecs.modedb_len, + &fb->modelist); + } + if (enable && (pd->flags & SM501FB_FLAG_USE_INIT_MODE) && 0) { /* TODO read the mode from the current display */ - } else { if (pd->def_mode) { dev_info(info->dev, "using supplied mode\n"); @@ -1737,12 +1765,34 @@ static int sm501fb_init_fb(struct fb_info *fb, fb->var.xres_virtual = fb->var.xres; fb->var.yres_virtual = fb->var.yres; } else { - ret = fb_find_mode(&fb->var, fb, + if (info->edid_data) + ret = fb_find_mode(&fb->var, fb, fb_mode, + fb->monspecs.modedb, + fb->monspecs.modedb_len, + &sm501_default_mode, default_bpp); + else + ret = fb_find_mode(&fb->var, fb, NULL, NULL, 0, NULL, 8); - if (ret == 0 || ret == 4) { - dev_err(info->dev, - "failed to get initial mode\n"); + switch (ret) { + case 1: + dev_info(info->dev, "using mode specified in " + "@mode\n"); + break; + case 2: + dev_info(info->dev, "using mode specified in " + "@mode with ignored refresh rate\n"); + break; + case 3: + dev_info(info->dev, "using mode default " + "mode\n"); + break; + case 4: + dev_info(info->dev, "using mode from list\n"); + break; + default: + dev_info(info->dev, "ret = %d\n", ret); + dev_info(info->dev, "failed to find mode\n"); return -EINVAL; } } @@ -2157,6 +2207,11 @@ static void __exit sm501fb_cleanup(void) module_init(sm501fb_init); module_exit(sm501fb_cleanup); +module_param_named(mode, fb_mode, charp, 0); +MODULE_PARM_DESC(mode, + "Specify resolution as \"<xres>x<yres>[-<bpp>][@<refresh>]\" "); +module_param_named(bpp, default_bpp, ulong, 0); +MODULE_PARM_DESC(bpp, "Specify bit-per-pixel if not specified mode"); MODULE_AUTHOR("Ben Dooks, Vincent Sanders"); MODULE_DESCRIPTION("SM501 Framebuffer driver"); MODULE_LICENSE("GPL v2");