* Re: [PATCH 2/2 v6] of: add generic videomode description
From: Laurent Pinchart @ 2012-10-08 12:19 UTC (permalink / raw)
To: Steffen Trumtrar
Cc: Tomi Valkeinen, linux-fbdev, devicetree-discuss, dri-devel,
linux-media
In-Reply-To: <20121008075741.GC20800@pengutronix.de>
Hi Steffen,
On Monday 08 October 2012 09:57:41 Steffen Trumtrar wrote:
> On Mon, Oct 08, 2012 at 10:21:53AM +0300, Tomi Valkeinen wrote:
> > On Thu, 2012-10-04 at 19:59 +0200, Steffen Trumtrar wrote:
[snip]
> > > diff --git a/include/linux/of_videomode.h b/include/linux/of_videomode.h
> > > new file mode 100644
> > > index 0000000..96efe01
> > > --- /dev/null
> > > +++ b/include/linux/of_videomode.h
> > > @@ -0,0 +1,41 @@
> > > +/*
> > > + * Copyright 2012 Steffen Trumtrar <s.trumtrar@pengutronix.de>
> > > + *
> > > + * generic videomode description
> > > + *
> > > + * This file is released under the GPLv2
> > > + */
> > > +
> > > +#ifndef __LINUX_VIDEOMODE_H
> > > +#define __LINUX_VIDEOMODE_H
> > > +
> > > +#include <drm/drmP.h>
> >
> > You don't need to include this.
>
> That is a fix to my liking. Easily done ;-)
>
> > > +struct videomode {
> > > + u32 pixelclock;
> > > + u32 refreshrate;
> > > +
> > > + u32 hactive;
> > > + u32 hfront_porch;
> > > + u32 hback_porch;
> > > + u32 hsync_len;
> > > +
> > > + u32 vactive;
> > > + u32 vfront_porch;
> > > + u32 vback_porch;
> > > + u32 vsync_len;
> > > +
> > > + bool hah;
> > > + bool vah;
> > > + bool interlaced;
> > > + bool doublescan;
> > > +
> > > +};
> >
> > This is not really of related. And actually, neither is the struct
> > signal_timing in the previous patch. It would be nice to have these in a
> > common header that fb, drm, and others could use instead of each having
> > their own timing structs.
> >
> > But that's probably out of scope for this series =). Did you check the
> > timing structs from the video related frameworks in the kernel to see if
> > your structs contain all the info the others have, so that, at least in
> > theory, everybody could use these common structs?
> >
> > Tomi
>
> Yes. Stephen and Laurent already suggested to split it up.
> No, all info is not contained. That starts with drm, which has width-mm,..
> If time permits, I will go over that.
Just to make sure we won't forget it, the V4L2 version of the timings
structure is struct v4l2_bt_timings in include/linux/videodev2.h.
--
Regards,
Laurent Pinchart
^ permalink raw reply
* Re: [PATCH 2/2 v6] of: add generic videomode description
From: Laurent Pinchart @ 2012-10-08 12:13 UTC (permalink / raw)
To: Steffen Trumtrar
Cc: devicetree-discuss, Rob Herring, linux-fbdev, dri-devel,
linux-media, Tomi Valkeinen
In-Reply-To: <1349373560-11128-3-git-send-email-s.trumtrar@pengutronix.de>
Hi Steffen,
Thanks for the patch.
On Thursday 04 October 2012 19:59:20 Steffen Trumtrar wrote:
> Get videomode from devicetree in a format appropriate for the
> backend. drm_display_mode and fb_videomode are supported atm.
> Uses the display signal timings from of_display_timings
>
> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> ---
> drivers/of/Kconfig | 5 +
> drivers/of/Makefile | 1 +
> drivers/of/of_videomode.c | 212 +++++++++++++++++++++++++++++++++++++++
> include/linux/of_videomode.h | 41 ++++++++
> 4 files changed, 259 insertions(+)
> create mode 100644 drivers/of/of_videomode.c
> create mode 100644 include/linux/of_videomode.h
>
> diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
> index 646deb0..74282e2 100644
> --- a/drivers/of/Kconfig
> +++ b/drivers/of/Kconfig
> @@ -88,4 +88,9 @@ config OF_DISPLAY_TIMINGS
> help
> helper to parse display timings from the devicetree
>
> +config OF_VIDEOMODE
> + def_bool y
> + help
> + helper to get videomodes from the devicetree
> +
> endmenu # OF
> diff --git a/drivers/of/Makefile b/drivers/of/Makefile
> index c8e9603..09d556f 100644
> --- a/drivers/of/Makefile
> +++ b/drivers/of/Makefile
> @@ -12,3 +12,4 @@ obj-$(CONFIG_OF_PCI) += of_pci.o
> obj-$(CONFIG_OF_PCI_IRQ) += of_pci_irq.o
> obj-$(CONFIG_OF_MTD) += of_mtd.o
> obj-$(CONFIG_OF_DISPLAY_TIMINGS) += of_display_timings.o
> +obj-$(CONFIG_OF_VIDEOMODE) += of_videomode.o
> diff --git a/drivers/of/of_videomode.c b/drivers/of/of_videomode.c
> new file mode 100644
> index 0000000..76ac16e
> --- /dev/null
> +++ b/drivers/of/of_videomode.c
> @@ -0,0 +1,212 @@
> +/*
> + * generic videomode helper
> + *
> + * Copyright (c) 2012 Steffen Trumtrar <s.trumtrar@pengutronix.de>,
> Pengutronix
> + *
> + * This file is released under the GPLv2
> + */
> +#include <linux/of.h>
> +#include <linux/fb.h>
> +#include <linux/slab.h>
> +#include <drm/drm_mode.h>
> +#include <linux/of_display_timings.h>
> +#include <linux/of_videomode.h>
> +
> +void dump_fb_videomode(struct fb_videomode *m)
> +{
> + pr_debug("fb_videomode = %d %d %d %d %d %d %d %d %d %d %d %d %d\n",
That's going to be pretty difficult to read :-) Would it make sense to group
several attributes logically (for instance using %ux%u for m->xres, m->yres) ?
> + m->refresh, m->xres, m->yres, m->pixclock, m->left_margin,
> + m->right_margin, m->upper_margin, m->lower_margin, +
> m->hsync_len, m->vsync_len, m->sync, m->vmode, m->flag);
> +}
Shouldn't this (and the other non exported functions below) be static ?
> +void dump_drm_displaymode(struct drm_display_mode *m)
> +{
> + pr_debug("drm_displaymode = %d %d %d %d %d %d %d %d %d\n",
> + m->hdisplay, m->hsync_start, m->hsync_end, m->htotal,
> + m->vdisplay, m->vsync_start, m->vsync_end, m->vtotal,
> + m->clock);
> +}
> +
> +int videomode_from_timing(struct display_timings *disp, struct videomode
> *vm,
> + int index)
> +{
> + struct signal_timing *st = NULL;
> +
> + if (!vm)
> + return -EINVAL;
> +
What about making vm a mandatory argument ? It looks to me like a caller bug
if vm is NULL.
> + st = display_timings_get(disp, index);
> +
You can remove the blank line.
> + if (!st) {
> + pr_err("%s: no signal timings found\n", __func__);
> + return -EINVAL;
> + }
> +
> + vm->pixelclock = signal_timing_get_value(&st->pixelclock, 0);
> + vm->hactive = signal_timing_get_value(&st->hactive, 0);
> + vm->hfront_porch = signal_timing_get_value(&st->hfront_porch, 0);
> + vm->hback_porch = signal_timing_get_value(&st->hback_porch, 0);
> + vm->hsync_len = signal_timing_get_value(&st->hsync_len, 0);
> +
> + vm->vactive = signal_timing_get_value(&st->vactive, 0);
> + vm->vfront_porch = signal_timing_get_value(&st->vfront_porch, 0);
> + vm->vback_porch = signal_timing_get_value(&st->vback_porch, 0);
> + vm->vsync_len = signal_timing_get_value(&st->vsync_len, 0);
> +
> + vm->vah = st->vsync_pol_active_high;
> + vm->hah = st->hsync_pol_active_high;
> + vm->interlaced = st->interlaced;
> + vm->doublescan = st->doublescan;
> +
> + return 0;
> +}
> +
> +int of_get_videomode(struct device_node *np, struct videomode *vm, int
> index)
I wonder how to avoid abuse of this functions. It's a useful helper for
drivers that need to get a video mode once only, but would result in lower
performances if a driver calls it for every mode. Drivers must call
of_get_display_timing_list instead in that case and case the display timings.
I'm wondering whether we should really expose of_get_videomode.
> +{
> + struct display_timings *disp;
> + int ret = 0;
No need to assign ret to 0 here.
> +
> + disp = of_get_display_timing_list(np);
> +
You can remove the blank line.
> + if (!disp) {
> + pr_err("%s: no timings specified\n", __func__);
> + return -EINVAL;
> + }
> +
> + if (index = OF_DEFAULT_TIMING)
> + index = disp->default_timing;
> +
> + ret = videomode_from_timing(disp, vm, index);
> +
No need for a blank line.
> + if (ret)
> + return ret;
> +
> + display_timings_release(disp);
> +
> + if (!vm) {
> + pr_err("%s: could not get videomode %d\n", __func__, index);
> + return -EINVAL;
> + }
This can't happen. If vm is NULL the videomode_from_timing call above will
return -EINVAL, and this function will then return immediately without
reaching this code block.
> +
> + return 0;
> +}
> +EXPORT_SYMBOL_GPL(of_get_videomode);
> +
> +#if defined(CONFIG_DRM)
> +int videomode_to_display_mode(struct videomode *vm, struct drm_display_mode
> *dmode)
> +{
> + memset(dmode, 0, sizeof(*dmode));
> +
> + dmode->hdisplay = vm->hactive;
> + dmode->hsync_start = dmode->hdisplay + vm->hfront_porch;
> + dmode->hsync_end = dmode->hsync_start + vm->hsync_len;
> + dmode->htotal = dmode->hsync_end + vm->hback_porch;
> +
> + dmode->vdisplay = vm->vactive;
> + dmode->vsync_start = dmode->vdisplay + vm->vfront_porch;
> + dmode->vsync_end = dmode->vsync_start + vm->vsync_len;
> + dmode->vtotal = dmode->vsync_end + vm->vback_porch;
> +
> + dmode->clock = vm->pixelclock / 1000;
> +
> + if (vm->hah)
> + dmode->flags |= DRM_MODE_FLAG_PHSYNC;
> + else
> + dmode->flags |= DRM_MODE_FLAG_NHSYNC;
> + if (vm->vah)
> + dmode->flags |= DRM_MODE_FLAG_PVSYNC;
> + else
> + dmode->flags |= DRM_MODE_FLAG_NVSYNC;
> + if (vm->interlaced)
> + dmode->flags |= DRM_MODE_FLAG_INTERLACE;
> + if (vm->doublescan)
> + dmode->flags |= DRM_MODE_FLAG_DBLSCAN;
> + drm_mode_set_name(dmode);
> +
> + return 0;
> +}
> +EXPORT_SYMBOL_GPL(videomode_to_display_mode);
> +
> +int of_get_drm_display_mode(struct device_node *np, struct drm_display_mode
> *dmode,
> + int index)
Same as above, do we really need to expose this helper function ? If so we
should at least clearly document (using kerneldoc for instance) that drivers
should only use it if they need to get a single mode once.
> +{
> + struct videomode vm;
> + int ret;
> +
> + ret = of_get_videomode(np, &vm, index);
> +
> + if (ret)
> + return ret;
> +
> + videomode_to_display_mode(&vm, dmode);
> +
> + pr_info("%s: got %dx%d display mode from %s\n", __func__, vm.hactive,
> + vm.vactive, np->name);
> + dump_drm_displaymode(dmode);
> +
> + return 0;
> +
> +}
> +EXPORT_SYMBOL_GPL(of_get_drm_display_mode);
> +#else
> +int videomode_to_display_mode(struct videomode *vm, struct drm_display_mode
> *dmode)
> +{
> + return 0;
> +}
> +
> +int of_get_drm_display_mode(struct device_node *np, struct drm_display_mode
> *dmode,
> + int index)
> +{
> + return 0;
> +}
What about not defining those if CONFIG_DRM is not set ? No driver should call
these functions in that case. If we really need those stubs they should return
an error.
> +#endif
> +
> +int videomode_to_fb_videomode(struct videomode *vm, struct fb_videomode
> *fbmode)
> +{
> + memset(fbmode, 0, sizeof(*fbmode));
> +
> + fbmode->xres = vm->hactive;
> + fbmode->left_margin = vm->hback_porch;
> + fbmode->right_margin = vm->hfront_porch;
> + fbmode->hsync_len = vm->hsync_len;
> +
> + fbmode->yres = vm->vactive;
> + fbmode->upper_margin = vm->vback_porch;
> + fbmode->lower_margin = vm->vfront_porch;
> + fbmode->vsync_len = vm->vsync_len;
> +
> + fbmode->pixclock = KHZ2PICOS(vm->pixelclock) / 1000;
> +
> + if (vm->hah)
> + fbmode->sync |= FB_SYNC_HOR_HIGH_ACT;
> + if (vm->vah)
> + fbmode->sync |= FB_SYNC_VERT_HIGH_ACT;
> + if (vm->interlaced)
> + fbmode->vmode |= FB_VMODE_INTERLACED;
> + if (vm->doublescan)
> + fbmode->vmode |= FB_VMODE_DOUBLE;
> +
> + return 0;
> +}
> +EXPORT_SYMBOL_GPL(videomode_to_fb_videomode);
> +
> +int of_get_fb_videomode(struct device_node *np, struct fb_videomode *fb,
> + int index)
> +{
> + struct videomode vm;
> + int ret;
> +
> + ret = of_get_videomode(np, &vm, index);
> + if (ret)
> + return ret;
> +
> + videomode_to_fb_videomode(&vm, fb);
> +
> + pr_info("%s: got %dx%d display mode from %s\n", __func__, vm.hactive,
> + vm.vactive, np->name);
> + dump_fb_videomode(fb);
> +
> + return 0;
> +}
> +EXPORT_SYMBOL_GPL(of_get_drm_display_mode);
> diff --git a/include/linux/of_videomode.h b/include/linux/of_videomode.h
> new file mode 100644
> index 0000000..96efe01
> --- /dev/null
> +++ b/include/linux/of_videomode.h
> @@ -0,0 +1,41 @@
> +/*
> + * Copyright 2012 Steffen Trumtrar <s.trumtrar@pengutronix.de>
> + *
> + * generic videomode description
> + *
> + * This file is released under the GPLv2
> + */
> +
> +#ifndef __LINUX_VIDEOMODE_H
> +#define __LINUX_VIDEOMODE_H
> +
> +#include <drm/drmP.h>
> +
> +struct videomode {
> + u32 pixelclock;
> + u32 refreshrate;
> +
> + u32 hactive;
> + u32 hfront_porch;
> + u32 hback_porch;
> + u32 hsync_len;
> +
> + u32 vactive;
> + u32 vfront_porch;
> + u32 vback_porch;
> + u32 vsync_len;
> +
> + bool hah;
> + bool vah;
> + bool interlaced;
> + bool doublescan;
> +
> +};
> +
> +int videomode_to_display_mode(struct videomode *vm, struct drm_display_mode
> *dmode); +int videomode_to_fb_videomode(struct videomode *vm, struct
> fb_videomode *fbmode); +int of_get_videomode(struct device_node *np, struct
> videomode *vm, int index); +int of_get_drm_display_mode(struct device_node
> *np, struct drm_display_mode *dmode, + int index);
> +int of_get_fb_videomode(struct device_node *np, struct fb_videomode *fb,
> int index); +#endif /* __LINUX_VIDEOMODE_H */
--
Regards,
Laurent Pinchart
^ permalink raw reply
* Re: [PATCH 1/2 v6] of: add helper to parse display timings
From: Laurent Pinchart @ 2012-10-08 12:04 UTC (permalink / raw)
To: Tomi Valkeinen
Cc: Guennadi Liakhovetski, Stephen Warren, Steffen Trumtrar,
linux-fbdev, devicetree-discuss, dri-devel, linux-media
In-Reply-To: <1349686878.3227.40.camel@deskari>
Hi Tomi,
On Monday 08 October 2012 12:01:18 Tomi Valkeinen wrote:
> On Mon, 2012-10-08 at 10:25 +0200, Guennadi Liakhovetski wrote:
> > In general, I might be misunderstanding something, but don't we have to
> > distinguish between 2 types of information about display timings: (1) is
> > defined by the display controller requirements, is known to the display
> > driver and doesn't need to be present in timings DT. We did have some of
> > these parameters in board data previously, because we didn't have proper
> > display controller drivers... (2) is board specific configuration, and is
> > such it has to be present in DT.
> >
> > In that way, doesn't "interlaced" belong to type (1) and thus doesn't need
> > to be present in DT?
>
> As I see it, this DT data is about the display (most commonly LCD
> panel), i.e. what video mode(s) the panel supports. If things were done
> my way, the panel's supported timings would be defined in the driver for
> the panel, and DT would be left to describe board specific data, but
> this approach has its benefits.
What about dumb DPI panels ? They will all be supported by a single driver,
would you have the driver contain information about all known DPI panels ? DT
seems a good solution to me in this case.
For complex panels where the driver will support a single (or very few) model
I agree that specifying the timings in DT isn't needed.
> Thus, if you connect an interlaced panel to your board, you need to tell
> the display controller that this panel requires interlace signal. Also,
> pixel clock source doesn't make sense in this context, as this doesn't
> describe the actual used configuration, but only what the panel
> supports.
>
> Of course, if this is about describing the hardware, the default-mode
> property doesn't really fit in...
Maybe we should rename it to native-mode then ?
--
Regards,
Laurent Pinchart
^ permalink raw reply
* Re: [PATCH 1/2 v6] of: add helper to parse display timings
From: Tomi Valkeinen @ 2012-10-08 9:01 UTC (permalink / raw)
To: Guennadi Liakhovetski
Cc: Stephen Warren, Steffen Trumtrar, linux-fbdev, devicetree-discuss,
dri-devel, Laurent Pinchart, linux-media
In-Reply-To: <Pine.LNX.4.64.1210081000530.11034@axis700.grange>
[-- Attachment #1: Type: text/plain, Size: 1406 bytes --]
On Mon, 2012-10-08 at 10:25 +0200, Guennadi Liakhovetski wrote:
> In general, I might be misunderstanding something, but don't we have to
> distinguish between 2 types of information about display timings: (1) is
> defined by the display controller requirements, is known to the display
> driver and doesn't need to be present in timings DT. We did have some of
> these parameters in board data previously, because we didn't have proper
> display controller drivers... (2) is board specific configuration, and is
> such it has to be present in DT.
>
> In that way, doesn't "interlaced" belong to type (1) and thus doesn't need
> to be present in DT?
As I see it, this DT data is about the display (most commonly LCD
panel), i.e. what video mode(s) the panel supports. If things were done
my way, the panel's supported timings would be defined in the driver for
the panel, and DT would be left to describe board specific data, but
this approach has its benefits.
Thus, if you connect an interlaced panel to your board, you need to tell
the display controller that this panel requires interlace signal. Also,
pixel clock source doesn't make sense in this context, as this doesn't
describe the actual used configuration, but only what the panel
supports.
Of course, if this is about describing the hardware, the default-mode
property doesn't really fit in...
Tomi
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: [PATCH 1/2 v6] of: add helper to parse display timings
From: Guennadi Liakhovetski @ 2012-10-08 8:25 UTC (permalink / raw)
To: Stephen Warren
Cc: Steffen Trumtrar, linux-fbdev, devicetree-discuss, dri-devel,
Tomi Valkeinen, Laurent Pinchart, linux-media
In-Reply-To: <506F0833.1090704@wwwdotorg.org>
On Fri, 5 Oct 2012, Stephen Warren wrote:
> On 10/04/2012 03:35 PM, Guennadi Liakhovetski wrote:
> > Hi Steffen
> >
> > Sorry for chiming in so late in the game, but I've long been wanting to
> > have a look at this and compare with what we do for V4L2, so, this seems a
> > great opportunity to me:-)
> >
> > On Thu, 4 Oct 2012, Steffen Trumtrar wrote:
>
> >> diff --git a/Documentation/devicetree/bindings/video/display-timings.txt b/Documentation/devicetree/bindings/video/display-timings.txt
>
> >> +timings-subnode
> >> +---------------
> >> +
> >> +required properties:
> >> + - hactive, vactive: Display resolution
> >> + - hfront-porch, hback-porch, hsync-len: Horizontal Display timing parameters
> >> + in pixels
> >> + vfront-porch, vback-porch, vsync-len: Vertical display timing parameters in
> >> + lines
> >> + - clock: displayclock in Hz
> >
> > You're going to hate me for this, but eventually we want to actually
> > reference clock objects in our DT bindings. For now, even if you don't
> > want to actually add clock phandles and stuff here, I think, using the
> > standard "clock-frequency" property would be much better!
>
> In a definition of a display timing, we will never need to use the clock
> binding; the clock binding would be used by the HW module that is
> generating a timing, not by the timing definition itself.
You mean clock consumer bindings will be in the display device DT node?
And the display-timings node will be its child?
> That said, your comment about renaming the property to avoid any kind of
> conceptual conflict is still quite valid. This is bike-shedding, but
> "pixel-clock" might be more in line with typical video mode terminology,
> although there's certainly preference in DT for using the generic term
> clock-frequency that you proposed. Either is fine by me.
>
> >> +optional properties:
> >> + - hsync-active-high (bool): Hsync pulse is active high
> >> + - vsync-active-high (bool): Vsync pulse is active high
> >
> > For the above two we also considered using bool properties but eventually
> > settled down with integer ones:
> >
> > - hsync-active = <1>
> >
> > for active-high and 0 for active low. This has the added advantage of
> > being able to omit this property in the .dts, which then doesn't mean,
> > that the polarity is active low, but rather, that the hsync line is not
> > used on this hardware. So, maybe it would be good to use the same binding
> > here too?
>
> I agree. This also covers the case where analog display connectors often
> use polarity to differentiate similar modes, yet digital connectors
> often always use a fixed polarity since the receiving device can
> "measure" the signal in more complete ways.
>
> If the board HW inverts these lines, the same property names can exist
> in the display controller itself, and the two values XORd together to
> yield the final output polarity.
>
> >> + - de-active-high (bool): Data-Enable pulse is active high
> >> + - pixelclk-inverted (bool): pixelclock is inverted
> >
> > We don't (yet) have a de-active property in V4L, don't know whether we'll
> > ever have to distingsuish between what some datasheets call "HREF" and
> > HSYNC in DT, but maybe similarly to the above an integer would be
> > preferred. As for pixclk, we call the property "pclk-sample" and it's also
> > an integer.
>
> Thinking about this more: de-active-high is likely to be a
> board-specific property and hence something in the display controller,
> not in the mode definition?
>
> >> + - interlaced (bool)
> >
> > Is "interlaced" a property of the hardware, i.e. of the board? Can the
> > same display controller on one board require interlaced data and on
> > another board - progressive?
>
> Interlace is a property of a display mode. It's quite possible for a
> particular display controller to switch between interlace and
> progressive output at run-time. For example, reconfiguring the output
> between 480i, 720p, 1080i, 1080p modes. Admittedly, if you're talking to
> a built-in LCD display, you're probably always going to be driving the
> single mode required by the panel, and that mode will likely always be
> progressive. However, since this binding attempts to describe any
> display timing, I think we still need this property per mode.
But why do you need this in the DT then at all? If it's fixed, as required
per display controller, then its driver will know it. If it's runtime
configurable, then it's a purely software parameter and doesn't depend on
the board?
> > BTW, I'm not very familiar with display
> > interfaces, but for interlaced you probably sometimes use a field signal,
> > whose polarity you also want to specify here? We use a "field-even-active"
> > integer property for it.
>
> I think that's a property of the display controller itself, rather than
> an individual mode, although I'm not 100% certain. My assertion is that
> the physical interface that the display controller is driving will
> determine whether embedded or separate sync is used, and in the separate
> sync case, how the field signal is defined, and that all interlace modes
> driven over that interface will use the same field signal definition.
In general, I might be misunderstanding something, but don't we have to
distinguish between 2 types of information about display timings: (1) is
defined by the display controller requirements, is known to the display
driver and doesn't need to be present in timings DT. We did have some of
these parameters in board data previously, because we didn't have proper
display controller drivers... (2) is board specific configuration, and is
such it has to be present in DT.
In that way, doesn't "interlaced" belong to type (1) and thus doesn't need
to be present in DT?
Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
^ permalink raw reply
* Re: [PATCH 2/2 v6] of: add generic videomode description
From: Steffen Trumtrar @ 2012-10-08 7:57 UTC (permalink / raw)
To: Tomi Valkeinen
Cc: linux-fbdev, devicetree-discuss, dri-devel, Laurent Pinchart,
linux-media
In-Reply-To: <1349680913.3227.32.camel@deskari>
On Mon, Oct 08, 2012 at 10:21:53AM +0300, Tomi Valkeinen wrote:
> On Thu, 2012-10-04 at 19:59 +0200, Steffen Trumtrar wrote:
> > Get videomode from devicetree in a format appropriate for the
> > backend. drm_display_mode and fb_videomode are supported atm.
> > Uses the display signal timings from of_display_timings
> >
> > Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> > ---
> > drivers/of/Kconfig | 5 +
> > drivers/of/Makefile | 1 +
> > drivers/of/of_videomode.c | 212 ++++++++++++++++++++++++++++++++++++++++++
> > include/linux/of_videomode.h | 41 ++++++++
> > 4 files changed, 259 insertions(+)
> > create mode 100644 drivers/of/of_videomode.c
> > create mode 100644 include/linux/of_videomode.h
> >
> > diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
> > index 646deb0..74282e2 100644
> > --- a/drivers/of/Kconfig
> > +++ b/drivers/of/Kconfig
> > @@ -88,4 +88,9 @@ config OF_DISPLAY_TIMINGS
> > help
> > helper to parse display timings from the devicetree
> >
> > +config OF_VIDEOMODE
> > + def_bool y
> > + help
> > + helper to get videomodes from the devicetree
> > +
> > endmenu # OF
> > diff --git a/drivers/of/Makefile b/drivers/of/Makefile
> > index c8e9603..09d556f 100644
> > --- a/drivers/of/Makefile
> > +++ b/drivers/of/Makefile
> > @@ -12,3 +12,4 @@ obj-$(CONFIG_OF_PCI) += of_pci.o
> > obj-$(CONFIG_OF_PCI_IRQ) += of_pci_irq.o
> > obj-$(CONFIG_OF_MTD) += of_mtd.o
> > obj-$(CONFIG_OF_DISPLAY_TIMINGS) += of_display_timings.o
> > +obj-$(CONFIG_OF_VIDEOMODE) += of_videomode.o
> > diff --git a/drivers/of/of_videomode.c b/drivers/of/of_videomode.c
> > new file mode 100644
> > index 0000000..76ac16e
> > --- /dev/null
> > +++ b/drivers/of/of_videomode.c
> > @@ -0,0 +1,212 @@
> > +/*
> > + * generic videomode helper
> > + *
> > + * Copyright (c) 2012 Steffen Trumtrar <s.trumtrar@pengutronix.de>, Pengutronix
> > + *
> > + * This file is released under the GPLv2
> > + */
> > +#include <linux/of.h>
> > +#include <linux/fb.h>
> > +#include <linux/slab.h>
> > +#include <drm/drm_mode.h>
> > +#include <linux/of_display_timings.h>
> > +#include <linux/of_videomode.h>
> > +
> > +void dump_fb_videomode(struct fb_videomode *m)
> > +{
> > + pr_debug("fb_videomode = %d %d %d %d %d %d %d %d %d %d %d %d %d\n",
> > + m->refresh, m->xres, m->yres, m->pixclock, m->left_margin,
> > + m->right_margin, m->upper_margin, m->lower_margin,
> > + m->hsync_len, m->vsync_len, m->sync, m->vmode, m->flag);
> > +}
> > +
> > +void dump_drm_displaymode(struct drm_display_mode *m)
> > +{
> > + pr_debug("drm_displaymode = %d %d %d %d %d %d %d %d %d\n",
> > + m->hdisplay, m->hsync_start, m->hsync_end, m->htotal,
> > + m->vdisplay, m->vsync_start, m->vsync_end, m->vtotal,
> > + m->clock);
> > +}
> > +
> > +int videomode_from_timing(struct display_timings *disp, struct videomode *vm,
> > + int index)
> > +{
> > + struct signal_timing *st = NULL;
> > +
> > + if (!vm)
> > + return -EINVAL;
> > +
> > + st = display_timings_get(disp, index);
> > +
> > + if (!st) {
> > + pr_err("%s: no signal timings found\n", __func__);
> > + return -EINVAL;
> > + }
> > +
> > + vm->pixelclock = signal_timing_get_value(&st->pixelclock, 0);
> > + vm->hactive = signal_timing_get_value(&st->hactive, 0);
> > + vm->hfront_porch = signal_timing_get_value(&st->hfront_porch, 0);
> > + vm->hback_porch = signal_timing_get_value(&st->hback_porch, 0);
> > + vm->hsync_len = signal_timing_get_value(&st->hsync_len, 0);
> > +
> > + vm->vactive = signal_timing_get_value(&st->vactive, 0);
> > + vm->vfront_porch = signal_timing_get_value(&st->vfront_porch, 0);
> > + vm->vback_porch = signal_timing_get_value(&st->vback_porch, 0);
> > + vm->vsync_len = signal_timing_get_value(&st->vsync_len, 0);
> > +
> > + vm->vah = st->vsync_pol_active_high;
> > + vm->hah = st->hsync_pol_active_high;
> > + vm->interlaced = st->interlaced;
> > + vm->doublescan = st->doublescan;
> > +
> > + return 0;
> > +}
> > +
> > +int of_get_videomode(struct device_node *np, struct videomode *vm, int index)
> > +{
> > + struct display_timings *disp;
> > + int ret = 0;
> > +
> > + disp = of_get_display_timing_list(np);
> > +
> > + if (!disp) {
> > + pr_err("%s: no timings specified\n", __func__);
> > + return -EINVAL;
> > + }
> > +
> > + if (index = OF_DEFAULT_TIMING)
> > + index = disp->default_timing;
> > +
> > + ret = videomode_from_timing(disp, vm, index);
> > +
> > + if (ret)
> > + return ret;
> > +
> > + display_timings_release(disp);
> > +
> > + if (!vm) {
> > + pr_err("%s: could not get videomode %d\n", __func__, index);
> > + return -EINVAL;
> > + }
> > +
> > + return 0;
> > +}
> > +EXPORT_SYMBOL_GPL(of_get_videomode);
> > +
> > +#if defined(CONFIG_DRM)
> > +int videomode_to_display_mode(struct videomode *vm, struct drm_display_mode *dmode)
> > +{
> > + memset(dmode, 0, sizeof(*dmode));
> > +
> > + dmode->hdisplay = vm->hactive;
> > + dmode->hsync_start = dmode->hdisplay + vm->hfront_porch;
> > + dmode->hsync_end = dmode->hsync_start + vm->hsync_len;
> > + dmode->htotal = dmode->hsync_end + vm->hback_porch;
> > +
> > + dmode->vdisplay = vm->vactive;
> > + dmode->vsync_start = dmode->vdisplay + vm->vfront_porch;
> > + dmode->vsync_end = dmode->vsync_start + vm->vsync_len;
> > + dmode->vtotal = dmode->vsync_end + vm->vback_porch;
> > +
> > + dmode->clock = vm->pixelclock / 1000;
> > +
> > + if (vm->hah)
> > + dmode->flags |= DRM_MODE_FLAG_PHSYNC;
> > + else
> > + dmode->flags |= DRM_MODE_FLAG_NHSYNC;
> > + if (vm->vah)
> > + dmode->flags |= DRM_MODE_FLAG_PVSYNC;
> > + else
> > + dmode->flags |= DRM_MODE_FLAG_NVSYNC;
> > + if (vm->interlaced)
> > + dmode->flags |= DRM_MODE_FLAG_INTERLACE;
> > + if (vm->doublescan)
> > + dmode->flags |= DRM_MODE_FLAG_DBLSCAN;
> > + drm_mode_set_name(dmode);
> > +
> > + return 0;
> > +}
> > +EXPORT_SYMBOL_GPL(videomode_to_display_mode);
> > +
> > +int of_get_drm_display_mode(struct device_node *np, struct drm_display_mode *dmode,
> > + int index)
> > +{
> > + struct videomode vm;
> > + int ret;
> > +
> > + ret = of_get_videomode(np, &vm, index);
> > +
> > + if (ret)
> > + return ret;
> > +
> > + videomode_to_display_mode(&vm, dmode);
> > +
> > + pr_info("%s: got %dx%d display mode from %s\n", __func__, vm.hactive,
> > + vm.vactive, np->name);
> > + dump_drm_displaymode(dmode);
> > +
> > + return 0;
> > +
> > +}
> > +EXPORT_SYMBOL_GPL(of_get_drm_display_mode);
> > +#else
> > +int videomode_to_display_mode(struct videomode *vm, struct drm_display_mode *dmode)
> > +{
> > + return 0;
> > +}
> > +
> > +int of_get_drm_display_mode(struct device_node *np, struct drm_display_mode *dmode,
> > + int index)
> > +{
> > + return 0;
> > +}
> > +#endif
> > +
> > +int videomode_to_fb_videomode(struct videomode *vm, struct fb_videomode *fbmode)
> > +{
> > + memset(fbmode, 0, sizeof(*fbmode));
> > +
> > + fbmode->xres = vm->hactive;
> > + fbmode->left_margin = vm->hback_porch;
> > + fbmode->right_margin = vm->hfront_porch;
> > + fbmode->hsync_len = vm->hsync_len;
> > +
> > + fbmode->yres = vm->vactive;
> > + fbmode->upper_margin = vm->vback_porch;
> > + fbmode->lower_margin = vm->vfront_porch;
> > + fbmode->vsync_len = vm->vsync_len;
> > +
> > + fbmode->pixclock = KHZ2PICOS(vm->pixelclock) / 1000;
> > +
> > + if (vm->hah)
> > + fbmode->sync |= FB_SYNC_HOR_HIGH_ACT;
> > + if (vm->vah)
> > + fbmode->sync |= FB_SYNC_VERT_HIGH_ACT;
> > + if (vm->interlaced)
> > + fbmode->vmode |= FB_VMODE_INTERLACED;
> > + if (vm->doublescan)
> > + fbmode->vmode |= FB_VMODE_DOUBLE;
> > +
> > + return 0;
> > +}
> > +EXPORT_SYMBOL_GPL(videomode_to_fb_videomode);
> > +
> > +int of_get_fb_videomode(struct device_node *np, struct fb_videomode *fb,
> > + int index)
> > +{
> > + struct videomode vm;
> > + int ret;
> > +
> > + ret = of_get_videomode(np, &vm, index);
> > + if (ret)
> > + return ret;
> > +
> > + videomode_to_fb_videomode(&vm, fb);
> > +
> > + pr_info("%s: got %dx%d display mode from %s\n", __func__, vm.hactive,
> > + vm.vactive, np->name);
> > + dump_fb_videomode(fb);
> > +
> > + return 0;
> > +}
> > +EXPORT_SYMBOL_GPL(of_get_drm_display_mode);
> > diff --git a/include/linux/of_videomode.h b/include/linux/of_videomode.h
> > new file mode 100644
> > index 0000000..96efe01
> > --- /dev/null
> > +++ b/include/linux/of_videomode.h
> > @@ -0,0 +1,41 @@
> > +/*
> > + * Copyright 2012 Steffen Trumtrar <s.trumtrar@pengutronix.de>
> > + *
> > + * generic videomode description
> > + *
> > + * This file is released under the GPLv2
> > + */
> > +
> > +#ifndef __LINUX_VIDEOMODE_H
> > +#define __LINUX_VIDEOMODE_H
> > +
> > +#include <drm/drmP.h>
>
> You don't need to include this.
>
That is a fix to my liking. Easily done ;-)
> > +struct videomode {
> > + u32 pixelclock;
> > + u32 refreshrate;
> > +
> > + u32 hactive;
> > + u32 hfront_porch;
> > + u32 hback_porch;
> > + u32 hsync_len;
> > +
> > + u32 vactive;
> > + u32 vfront_porch;
> > + u32 vback_porch;
> > + u32 vsync_len;
> > +
> > + bool hah;
> > + bool vah;
> > + bool interlaced;
> > + bool doublescan;
> > +
> > +};
>
> This is not really of related. And actually, neither is the struct
> signal_timing in the previous patch. It would be nice to have these in a
> common header that fb, drm, and others could use instead of each having
> their own timing structs.
>
> But that's probably out of scope for this series =). Did you check the
> timing structs from the video related frameworks in the kernel to see if
> your structs contain all the info the others have, so that, at least in
> theory, everybody could use these common structs?
>
> Tomi
>
Yes. Stephen and Laurent already suggested to split it up.
No, all info is not contained. That starts with drm, which has width-mm,..
If time permits, I will go over that.
Regards,
Steffen
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply
* Re: [PATCH 1/2 v6] of: add helper to parse display timings
From: Steffen Trumtrar @ 2012-10-08 7:49 UTC (permalink / raw)
To: Tomi Valkeinen
Cc: devicetree-discuss, Rob Herring, linux-fbdev, dri-devel,
Laurent Pinchart, linux-media
In-Reply-To: <1349680065.3227.25.camel@deskari>
Hi,
On Mon, Oct 08, 2012 at 10:07:45AM +0300, Tomi Valkeinen wrote:
> Hi,
>
> On Thu, 2012-10-04 at 19:59 +0200, Steffen Trumtrar wrote:
> > Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> > ---
> > .../devicetree/bindings/video/display-timings.txt | 222 ++++++++++++++++++++
> > drivers/of/Kconfig | 5 +
> > drivers/of/Makefile | 1 +
> > drivers/of/of_display_timings.c | 183 ++++++++++++++++
> > include/linux/of_display_timings.h | 85 ++++++++
> > 5 files changed, 496 insertions(+)
> > create mode 100644 Documentation/devicetree/bindings/video/display-timings.txt
> > create mode 100644 drivers/of/of_display_timings.c
> > create mode 100644 include/linux/of_display_timings.h
> >
> > diff --git a/Documentation/devicetree/bindings/video/display-timings.txt b/Documentation/devicetree/bindings/video/display-timings.txt
> > new file mode 100644
> > index 0000000..45e39bd
> > --- /dev/null
> > +++ b/Documentation/devicetree/bindings/video/display-timings.txt
> > @@ -0,0 +1,222 @@
> > +display-timings bindings
> > +=========
> > +
> > +display-timings-node
> > +------------
> > +
> > +required properties:
> > + - none
> > +
> > +optional properties:
> > + - default-timing: the default timing value
> > +
> > +timings-subnode
> > +---------------
> > +
> > +required properties:
> > + - hactive, vactive: Display resolution
> > + - hfront-porch, hback-porch, hsync-len: Horizontal Display timing parameters
> > + in pixels
> > + vfront-porch, vback-porch, vsync-len: Vertical display timing parameters in
> > + lines
> > + - clock: displayclock in Hz
> > +
> > +optional properties:
> > + - hsync-active-high (bool): Hsync pulse is active high
> > + - vsync-active-high (bool): Vsync pulse is active high
> > + - de-active-high (bool): Data-Enable pulse is active high
> > + - pixelclk-inverted (bool): pixelclock is inverted
> > + - interlaced (bool)
> > + - doublescan (bool)
>
> I think bool should be generally used for things that are on/off, like
> interlace. For hsync-active-high & others I'd rather have 0/1 values as
> others already suggested.
>
> > +There are different ways of describing the capabilities of a display. The devicetree
> > +representation corresponds to the one commonly found in datasheets for displays.
> > +If a display supports multiple signal timings, the default-timing can be specified.
> > +
> > +The parameters are defined as
> > +
> > +struct signal_timing
> > +=========> > +
> > + +----------+---------------------------------------------+----------+-------+
> > + | | ↑ | | |
> > + | | |vback_porch | | |
> > + | | ↓ | | |
> > + +----------###############################################----------+-------+
> > + | # ↑ # | |
> > + | # | # | |
> > + | hback # | # hfront | hsync |
> > + | porch # | hactive # porch | len |
> > + |<-------->#<---------------+--------------------------->#<-------->|<----->|
> > + | # | # | |
> > + | # |vactive # | |
> > + | # | # | |
> > + | # ↓ # | |
> > + +----------###############################################----------+-------+
> > + | | ↑ | | |
> > + | | |vfront_porch | | |
> > + | | ↓ | | |
> > + +----------+---------------------------------------------+----------+-------+
> > + | | ↑ | | |
> > + | | |vsync_len | | |
> > + | | ↓ | | |
> > + +----------+---------------------------------------------+----------+-------+
> > +
> > +
> > +Example:
> > +
> > + display-timings {
> > + default-timing = <&timing0>;
> > + timing0: 1920p24 {
> > + /* 1920x1080p24 */
>
> I think this is commonly called 1080p24.
>
Oops. Yes, you are right.
> > + clock = <52000000>;
> > + hactive = <1920>;
> > + vactive = <1080>;
> > + hfront-porch = <25>;
> > + hback-porch = <25>;
> > + hsync-len = <25>;
> > + vback-porch = <2>;
> > + vfront-porch = <2>;
> > + vsync-len = <2>;
> > + hsync-active-high;
> > + };
> > + };
> > +
> > +Every property also supports the use of ranges, so the commonly used datasheet
> > +description with <min typ max>-tuples can be used.
> > +
> > +Example:
> > +
> > + timing1: timing {
> > + /* 1920x1080p24 */
> > + clock = <148500000>;
> > + hactive = <1920>;
> > + vactive = <1080>;
> > + hsync-len = <0 44 60>;
> > + hfront-porch = <80 88 95>;
> > + hback-porch = <100 148 160>;
> > + vfront-porch = <0 4 6>;
> > + vback-porch = <0 36 50>;
> > + vsync-len = <0 5 6>;
> > + };
> > +
> > +Usage in backend
> > +========
> > +
> > +A backend driver may choose to use the display-timings directly and convert the timing
> > +ranges to a suitable mode. Or it may just use the conversion of the display timings
> > +to the required mode via the generic videomode struct.
> > +
> > + dtb
> > + |
> > + | of_get_display_timing_list
> > + ↓
> > + struct display_timings
> > + |
> > + | videomode_from_timing
> > + ↓
> > + --- struct videomode ---
> > + | |
> > + videomode_to_displaymode | | videomode_to_fb_videomode
> > + ↓ ↓
> > + drm_display_mode fb_videomode
> > +
> > +The functions of_get_fb_videomode and of_get_display_mode are provided
> > +to conveniently get the respective mode representation from the devicetree.
> > +
> > +Conversion to videomode
> > +===========> > +
> > +As device drivers normally work with some kind of video mode, the timings can be
> > +converted (may be just a simple copying of the typical value) to a generic videomode
> > +structure which then can be converted to the according mode used by the backend.
> > +
> > +Supported modes
> > +=======> > +
> > +The generic videomode read in by the driver can be converted to the following
> > +modes with the following parameters
> > +
> > +struct fb_videomode
> > +=========> > +
> > + +----------+---------------------------------------------+----------+-------+
> > + | | ↑ | | |
> > + | | |upper_margin | | |
> > + | | ↓ | | |
> > + +----------###############################################----------+-------+
> > + | # ↑ # | |
> > + | # | # | |
> > + | # | # | |
> > + | # | # | |
> > + | left # | # right | hsync |
> > + | margin # | xres # margin | len |
> > + |<-------->#<---------------+--------------------------->#<-------->|<----->|
> > + | # | # | |
> > + | # | # | |
> > + | # | # | |
> > + | # |yres # | |
> > + | # | # | |
> > + | # | # | |
> > + | # | # | |
> > + | # | # | |
> > + | # | # | |
> > + | # | # | |
> > + | # | # | |
> > + | # | # | |
> > + | # ↓ # | |
> > + +----------###############################################----------+-------+
> > + | | ↑ | | |
> > + | | |lower_margin | | |
> > + | | ↓ | | |
> > + +----------+---------------------------------------------+----------+-------+
> > + | | ↑ | | |
> > + | | |vsync_len | | |
> > + | | ↓ | | |
> > + +----------+---------------------------------------------+----------+-------+
> > +
> > +clock in nanoseconds
> > +
> > +struct drm_display_mode
> > +===========> > +
> > + +----------+---------------------------------------------+----------+-------+
> > + | | | | | ↑
> > + | | | | | |
> > + | | | | | |
> > + +----------###############################################----------+-------+ |
> > + | # ↑ ↑ ↑ # | | |
> > + | # | | | # | | |
> > + | # | | | # | | |
> > + | # | | | # | | |
> > + | # | | | # | | |
> > + | # | | | hdisplay # | | |
> > + | #<--+--------------------+-------------------># | | |
> > + | # | | | # | | |
> > + | # |vsync_start | # | | |
> > + | # | | | # | | |
> > + | # | |vsync_end | # | | |
> > + | # | | |vdisplay # | | |
> > + | # | | | # | | |
> > + | # | | | # | | |
> > + | # | | | # | | | vtotal
> > + | # | | | # | | |
> > + | # | | | hsync_start # | | |
> > + | #<--+---------+----------+------------------------------>| | |
> > + | # | | | # | | |
> > + | # | | | hsync_end # | | |
> > + | #<--+---------+----------+-------------------------------------->| |
> > + | # | | ↓ # | | |
> > + +----------####|#########|################################----------+-------+ |
> > + | | | | | | | |
> > + | | | | | | | |
> > + | | ↓ | | | | |
> > + +----------+-------------+-------------------------------+----------+-------+ |
> > + | | | | | | |
> > + | | | | | | |
> > + | | ↓ | | | ↓
> > + +----------+---------------------------------------------+----------+-------+
> > + htotal
> > + <------------------------------------------------------------------------->
> > +
> > +clock in kilohertz
> > diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
> > index dfba3e6..646deb0 100644
> > --- a/drivers/of/Kconfig
> > +++ b/drivers/of/Kconfig
> > @@ -83,4 +83,9 @@ config OF_MTD
> > depends on MTD
> > def_bool y
> >
> > +config OF_DISPLAY_TIMINGS
> > + def_bool y
> > + help
> > + helper to parse display timings from the devicetree
> > +
> > endmenu # OF
> > diff --git a/drivers/of/Makefile b/drivers/of/Makefile
> > index e027f44..c8e9603 100644
> > --- a/drivers/of/Makefile
> > +++ b/drivers/of/Makefile
> > @@ -11,3 +11,4 @@ obj-$(CONFIG_OF_MDIO) += of_mdio.o
> > obj-$(CONFIG_OF_PCI) += of_pci.o
> > obj-$(CONFIG_OF_PCI_IRQ) += of_pci_irq.o
> > obj-$(CONFIG_OF_MTD) += of_mtd.o
> > +obj-$(CONFIG_OF_DISPLAY_TIMINGS) += of_display_timings.o
> > diff --git a/drivers/of/of_display_timings.c b/drivers/of/of_display_timings.c
> > new file mode 100644
> > index 0000000..e47bc63
> > --- /dev/null
> > +++ b/drivers/of/of_display_timings.c
> > @@ -0,0 +1,183 @@
> > +/*
> > + * OF helpers for parsing display timings
> > + *
> > + * Copyright (c) 2012 Steffen Trumtrar <s.trumtrar@pengutronix.de>, Pengutronix
> > + *
> > + * based on of_videomode.c by Sascha Hauer <s.hauer@pengutronix.de>
> > + *
> > + * This file is released under the GPLv2
> > + */
> > +#include <linux/of.h>
> > +#include <linux/slab.h>
> > +#include <linux/export.h>
> > +#include <linux/of_display_timings.h>
> > +
> > +/* every signal_timing can be specified with either
> > + * just the typical value or a range consisting of
> > + * min/typ/max.
> > + * This function helps handling this
> > + */
>
> The comment is not according to kernel coding style. And I'd start the
> sentence with a capital letter =).
>
> > +static int parse_property(struct device_node *np, char *name,
> > + struct timing_entry *result)
> > +{
> > + struct property *prop;
> > + int length;
> > + int cells;
> > + int ret;
> > +
> > + prop = of_find_property(np, name, &length);
> > + if (!prop) {
> > + pr_err("%s: could not find property %s\n", __func__, name);
> > + return -EINVAL;
> > + }
> > +
> > + cells = length / sizeof(u32);
> > +
> > + if (cells = 1)
> > + ret = of_property_read_u32_array(np, name, &result->typ, cells);
> > + else if (cells = 3)
> > + ret = of_property_read_u32_array(np, name, &result->min, cells);
> > + else {
> > + pr_err("%s: illegal timing specification in %s\n", __func__,
> > + name);
> > + return -EINVAL;
> > + }
> > +
> > + return ret;
> > +}
> > +
> > +struct signal_timing *of_get_display_timing(struct device_node *np)
> > +{
> > + struct signal_timing *st;
> > + int ret = 0;
> > +
> > + st = kzalloc(sizeof(*st), GFP_KERNEL);
> > +
> > + if (!st) {
> > + pr_err("%s: could not allocate signal_timing struct\n", __func__);
> > + return NULL;
> > + }
> > +
> > + ret |= parse_property(np, "hback-porch", &st->hback_porch);
> > + ret |= parse_property(np, "hfront-porch", &st->hfront_porch);
> > + ret |= parse_property(np, "hactive", &st->hactive);
> > + ret |= parse_property(np, "hsync-len", &st->hsync_len);
> > + ret |= parse_property(np, "vback-porch", &st->vback_porch);
> > + ret |= parse_property(np, "vfront-porch", &st->vfront_porch);
> > + ret |= parse_property(np, "vactive", &st->vactive);
> > + ret |= parse_property(np, "vsync-len", &st->vsync_len);
> > + ret |= parse_property(np, "clock", &st->pixelclock);
> > +
> > + st->vsync_pol_active_high = of_property_read_bool(np, "vsync-active-high");
> > + st->hsync_pol_active_high = of_property_read_bool(np, "hsync-active-high");
> > + st->de_pol_active_high = of_property_read_bool(np, "de-active-high");
> > + st->pixelclk_pol_inverted = of_property_read_bool(np, "pixelclk-inverted");
> > + st->interlaced = of_property_read_bool(np, "interlaced");
> > + st->doublescan = of_property_read_bool(np, "doublescan");
> > +
> > + if (ret) {
> > + pr_err("%s: error reading timing properties\n", __func__);
> > + return NULL;
> > + }
> > +
> > + return st;
> > +}
> > +EXPORT_SYMBOL_GPL(of_get_display_timing);
> > +
> > +struct display_timings *of_get_display_timing_list(struct device_node *np)
> > +{
> > + struct device_node *timings_np;
> > + struct device_node *entry;
> > + struct display_timings *disp;
> > + char *default_timing;
> > +
> > + if (!np) {
> > + pr_err("%s: no devicenode given\n", __func__);
> > + return NULL;
> > + }
> > +
> > + timings_np = of_find_node_by_name(np, "display-timings");
> > +
> > + if (!timings_np) {
> > + pr_err("%s: could not find display-timings node\n", __func__);
> > + return NULL;
> > + }
> > +
> > + disp = kzalloc(sizeof(*disp), GFP_KERNEL);
> > +
> > + entry = of_parse_phandle(timings_np, "default-timing", 0);
> > +
> > + if (!entry) {
> > + pr_info("%s: no default-timing specified\n", __func__);
> > + entry = of_find_node_by_name(np, "timing");
> > + }
>
> If "default-timing" property is optional, I don't see any need for the
> pr_info above, as it should be business as usual if the property doesn't
> exist.
>
> If the default-timing property doesn't exist, wouldn't it be simpler to
> get the first subnode, instead of looking one with "timing" name?
>
Yes. I will fix that.
> > +
> > + if (!entry) {
> > + pr_info("%s: no timing specifications given\n", __func__);
> > + return disp;
> > + }
>
> Again, I don't think the pr_info is needed if this is a normal case.
> Then again, perhaps this could be an error? Why would there be a display
> node without any timings?
>
This should be an error. It is a relict from trying to define the display instead
of just the timings. I need to rework the whole no/wrong timings thing.
> > +
> > + pr_info("%s: using %s as default timing\n", __func__, entry->name);
> > +
> > + default_timing = (char *)entry->full_name;
>
> const char *?
>
> > +
> > + disp->num_timings = 0;
> > +
> > + for_each_child_of_node(timings_np, entry) {
> > + disp->num_timings++;
> > + }
>
> No need for { }
>
Okay.
> > + disp->timings = kzalloc(sizeof(struct signal_timing *)*disp->num_timings,
> > + GFP_KERNEL);
> > +
> > + disp->num_timings = 0;
> > +
> > + for_each_child_of_node(timings_np, entry) {
> > + struct signal_timing *st;
> > +
> > + st = of_get_display_timing(entry);
> > +
> > + if (!st)
> > + continue;
> > +
> > + if (strcmp(default_timing, entry->full_name) = 0)
> > + disp->default_timing = disp->num_timings;
>
> I don't see you setting disp->default_timing to OF_DEFAULT_TIMING in
> case there's no default_timing found.
>
> Or, at least I presume OF_DEFAULT_TIMING is meant to mark non-existing
> default timing. The name OF_DEFAULT_TIMING is not very descriptive to
> me.
>
> Would it make more sense to have the disp->default_timing as a pointer
> to the timing, instead of index? Then a NULL value would mark a
> non-existing default timing.
>
> > + disp->timings[disp->num_timings] = st;
> > + disp->num_timings++;
> > + }
> > +
> > +
> > + of_node_put(timings_np);
> > +
> > + if (disp->num_timings >= 0)
> > + pr_info("%s: got %d timings. Using timing #%d as default\n", __func__,
> > + disp->num_timings , disp->default_timing + 1);
> > + else
> > + pr_info("%s: no timings specified\n", __func__);
> > +
> > + return disp;
> > +}
> > +EXPORT_SYMBOL_GPL(of_get_display_timing_list);
> > +
> > +int of_display_timings_exists(struct device_node *np)
> > +{
> > + struct device_node *timings_np;
> > + struct device_node *default_np;
> > +
> > + if (!np)
> > + return -EINVAL;
> > +
> > + timings_np = of_parse_phandle(np, "display-timings", 0);
> > +
> > + if (!timings_np)
> > + return -EINVAL;
> > +
> > + default_np = of_parse_phandle(np, "default-timing", 0);
> > +
> > + if (default_np)
> > + return 0;
> > +
> > + return -EINVAL;
> > +}
> > +EXPORT_SYMBOL_GPL(of_display_timings_exists);
> > diff --git a/include/linux/of_display_timings.h b/include/linux/of_display_timings.h
> > new file mode 100644
> > index 0000000..1ad719e
> > --- /dev/null
> > +++ b/include/linux/of_display_timings.h
> > @@ -0,0 +1,85 @@
> > +/*
> > + * Copyright 2012 Steffen Trumtrar <s.trumtrar@pengutronix.de>
> > + *
> > + * description of display timings
> > + *
> > + * This file is released under the GPLv2
> > + */
> > +
> > +#ifndef __LINUX_OF_DISPLAY_TIMINGS_H
> > +#define __LINUX_OF_DISPLAY_TIMINGS_H
> > +
> > +#define OF_DEFAULT_TIMING -1
> > +
> > +struct display_timings {
> > + unsigned int num_timings;
> > + unsigned int default_timing;
> > +
> > + struct signal_timing **timings;
>
> Should this be a pointer to a const array of const data? Is there ever
> need to change them after they've been read from DT?
>
No, there isn't. Will change to const.
> > +};
> > +
> > +struct timing_entry {
> > + u32 min;
> > + u32 typ;
> > + u32 max;
> > +};
> > +
> > +struct signal_timing {
> > + struct timing_entry pixelclock;
> > +
> > + struct timing_entry hactive;
> > + struct timing_entry hfront_porch;
> > + struct timing_entry hback_porch;
> > + struct timing_entry hsync_len;
> > +
> > + struct timing_entry vactive;
> > + struct timing_entry vfront_porch;
> > + struct timing_entry vback_porch;
> > + struct timing_entry vsync_len;
> > +
> > + bool vsync_pol_active_high;
> > + bool hsync_pol_active_high;
> > + bool de_pol_active_high;
> > + bool pixelclk_pol_inverted;
> > + bool interlaced;
> > + bool doublescan;
> > +};
> > +
> > +struct display_timings *of_get_display_timing_list(struct device_node *np);
> > +struct signal_timing *of_get_display_timing(struct device_node *np);
> > +int of_display_timings_exists(struct device_node *np);
> > +
> > +/* placeholder function until ranges are really needed */
> > +static inline u32 signal_timing_get_value(struct timing_entry *te, int index)
> > +{
> > + return te->typ;
> > +}
> > +
> > +static inline void timings_release(struct display_timings *disp)
> > +{
> > + int i;
> > +
> > + for (i = 0; i < disp->num_timings; i++)
> > + kfree(disp->timings[i]);
> > +}
> > +
> > +static inline void display_timings_release(struct display_timings *disp)
> > +{
> > + timings_release(disp);
> > + kfree(disp->timings);
> > +}
> > +
> > +static inline struct signal_timing *display_timings_get(struct display_timings *disp,
> > + int index)
> > +{
> > + struct signal_timing *st;
> > +
> > + if (disp->num_timings > index) {
> > + st = disp->timings[index];
> > + return st;
> > + }
> > + else
> > + return NULL;
> > +}
>
> Why do you have these functions in the header file?
>
Well, ... there actually isn't any reason any longer. I will move them.
Thanks and regards,
Steffen
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply
* Re: [PATCH 1/2 v6] of: add helper to parse display timings
From: Steffen Trumtrar @ 2012-10-08 7:34 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Stephen Warren, devicetree-discuss, linux-fbdev, dri-devel,
Tomi Valkeinen, linux-media
In-Reply-To: <9190603.vEUidl99Ca@avalon>
On Sun, Oct 07, 2012 at 03:38:25PM +0200, Laurent Pinchart wrote:
> Hi Steffen,
>
> On Friday 05 October 2012 18:38:58 Steffen Trumtrar wrote:
> > On Fri, Oct 05, 2012 at 10:21:37AM -0600, Stephen Warren wrote:
> > > On 10/05/2012 10:16 AM, Steffen Trumtrar wrote:
> > > > On Thu, Oct 04, 2012 at 12:47:16PM -0600, Stephen Warren wrote:
> > > >> On 10/04/2012 11:59 AM, Steffen Trumtrar wrote:
> > > ...
> > >
> > > >>> + for_each_child_of_node(timings_np, entry) {
> > > >>> + struct signal_timing *st;
> > > >>> +
> > > >>> + st = of_get_display_timing(entry);
> > > >>> +
> > > >>> + if (!st)
> > > >>> + continue;
> > > >>
> > > >> I wonder if that shouldn't be an error?
> > > >
> > > > In the sense of a pr_err not a -EINVAL I presume?! It is a little bit
> > > > quiet in case of a faulty spec, that is right.
> > >
> > > I did mean return an error; if we try to parse something and can't,
> > > shouldn't we return an error?
> > >
> > > I suppose it may be possible to limp on and use whatever subset of modes
> > > could be parsed and drop the others, which is what this code does, but
> > > the code after the loop would definitely return an error if zero timings
> > > were parseable.
> >
> > If a display supports multiple modes, I think it is better to have a working
> > mode (even if it is not the preferred one) than have none at all.
> > If there is no mode at all, that should be an error, right.
>
> If we fail completely in case of an error, DT writers will notice their bugs.
> If we ignore errors silently they won't, and we'll end up with buggy DTs (or,
> to be accurate, even more buggy DTs :-)). I'd rather fail completely in the
> first implementation and add workarounds later only if we need to.
>
Okay, that is two against one. And if you say it like this, Stephen and you are
right I guess. Fail completely it is then.
Regards,
Steffen
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply
* Re: [PATCH 2/2 v6] of: add generic videomode description
From: Tomi Valkeinen @ 2012-10-08 7:21 UTC (permalink / raw)
To: Steffen Trumtrar
Cc: devicetree-discuss, Rob Herring, linux-fbdev, dri-devel,
Laurent Pinchart, linux-media
In-Reply-To: <1349373560-11128-3-git-send-email-s.trumtrar@pengutronix.de>
[-- Attachment #1: Type: text/plain, Size: 9251 bytes --]
On Thu, 2012-10-04 at 19:59 +0200, Steffen Trumtrar wrote:
> Get videomode from devicetree in a format appropriate for the
> backend. drm_display_mode and fb_videomode are supported atm.
> Uses the display signal timings from of_display_timings
>
> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> ---
> drivers/of/Kconfig | 5 +
> drivers/of/Makefile | 1 +
> drivers/of/of_videomode.c | 212 ++++++++++++++++++++++++++++++++++++++++++
> include/linux/of_videomode.h | 41 ++++++++
> 4 files changed, 259 insertions(+)
> create mode 100644 drivers/of/of_videomode.c
> create mode 100644 include/linux/of_videomode.h
>
> diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
> index 646deb0..74282e2 100644
> --- a/drivers/of/Kconfig
> +++ b/drivers/of/Kconfig
> @@ -88,4 +88,9 @@ config OF_DISPLAY_TIMINGS
> help
> helper to parse display timings from the devicetree
>
> +config OF_VIDEOMODE
> + def_bool y
> + help
> + helper to get videomodes from the devicetree
> +
> endmenu # OF
> diff --git a/drivers/of/Makefile b/drivers/of/Makefile
> index c8e9603..09d556f 100644
> --- a/drivers/of/Makefile
> +++ b/drivers/of/Makefile
> @@ -12,3 +12,4 @@ obj-$(CONFIG_OF_PCI) += of_pci.o
> obj-$(CONFIG_OF_PCI_IRQ) += of_pci_irq.o
> obj-$(CONFIG_OF_MTD) += of_mtd.o
> obj-$(CONFIG_OF_DISPLAY_TIMINGS) += of_display_timings.o
> +obj-$(CONFIG_OF_VIDEOMODE) += of_videomode.o
> diff --git a/drivers/of/of_videomode.c b/drivers/of/of_videomode.c
> new file mode 100644
> index 0000000..76ac16e
> --- /dev/null
> +++ b/drivers/of/of_videomode.c
> @@ -0,0 +1,212 @@
> +/*
> + * generic videomode helper
> + *
> + * Copyright (c) 2012 Steffen Trumtrar <s.trumtrar@pengutronix.de>, Pengutronix
> + *
> + * This file is released under the GPLv2
> + */
> +#include <linux/of.h>
> +#include <linux/fb.h>
> +#include <linux/slab.h>
> +#include <drm/drm_mode.h>
> +#include <linux/of_display_timings.h>
> +#include <linux/of_videomode.h>
> +
> +void dump_fb_videomode(struct fb_videomode *m)
> +{
> + pr_debug("fb_videomode = %d %d %d %d %d %d %d %d %d %d %d %d %d\n",
> + m->refresh, m->xres, m->yres, m->pixclock, m->left_margin,
> + m->right_margin, m->upper_margin, m->lower_margin,
> + m->hsync_len, m->vsync_len, m->sync, m->vmode, m->flag);
> +}
> +
> +void dump_drm_displaymode(struct drm_display_mode *m)
> +{
> + pr_debug("drm_displaymode = %d %d %d %d %d %d %d %d %d\n",
> + m->hdisplay, m->hsync_start, m->hsync_end, m->htotal,
> + m->vdisplay, m->vsync_start, m->vsync_end, m->vtotal,
> + m->clock);
> +}
> +
> +int videomode_from_timing(struct display_timings *disp, struct videomode *vm,
> + int index)
> +{
> + struct signal_timing *st = NULL;
> +
> + if (!vm)
> + return -EINVAL;
> +
> + st = display_timings_get(disp, index);
> +
> + if (!st) {
> + pr_err("%s: no signal timings found\n", __func__);
> + return -EINVAL;
> + }
> +
> + vm->pixelclock = signal_timing_get_value(&st->pixelclock, 0);
> + vm->hactive = signal_timing_get_value(&st->hactive, 0);
> + vm->hfront_porch = signal_timing_get_value(&st->hfront_porch, 0);
> + vm->hback_porch = signal_timing_get_value(&st->hback_porch, 0);
> + vm->hsync_len = signal_timing_get_value(&st->hsync_len, 0);
> +
> + vm->vactive = signal_timing_get_value(&st->vactive, 0);
> + vm->vfront_porch = signal_timing_get_value(&st->vfront_porch, 0);
> + vm->vback_porch = signal_timing_get_value(&st->vback_porch, 0);
> + vm->vsync_len = signal_timing_get_value(&st->vsync_len, 0);
> +
> + vm->vah = st->vsync_pol_active_high;
> + vm->hah = st->hsync_pol_active_high;
> + vm->interlaced = st->interlaced;
> + vm->doublescan = st->doublescan;
> +
> + return 0;
> +}
> +
> +int of_get_videomode(struct device_node *np, struct videomode *vm, int index)
> +{
> + struct display_timings *disp;
> + int ret = 0;
> +
> + disp = of_get_display_timing_list(np);
> +
> + if (!disp) {
> + pr_err("%s: no timings specified\n", __func__);
> + return -EINVAL;
> + }
> +
> + if (index == OF_DEFAULT_TIMING)
> + index = disp->default_timing;
> +
> + ret = videomode_from_timing(disp, vm, index);
> +
> + if (ret)
> + return ret;
> +
> + display_timings_release(disp);
> +
> + if (!vm) {
> + pr_err("%s: could not get videomode %d\n", __func__, index);
> + return -EINVAL;
> + }
> +
> + return 0;
> +}
> +EXPORT_SYMBOL_GPL(of_get_videomode);
> +
> +#if defined(CONFIG_DRM)
> +int videomode_to_display_mode(struct videomode *vm, struct drm_display_mode *dmode)
> +{
> + memset(dmode, 0, sizeof(*dmode));
> +
> + dmode->hdisplay = vm->hactive;
> + dmode->hsync_start = dmode->hdisplay + vm->hfront_porch;
> + dmode->hsync_end = dmode->hsync_start + vm->hsync_len;
> + dmode->htotal = dmode->hsync_end + vm->hback_porch;
> +
> + dmode->vdisplay = vm->vactive;
> + dmode->vsync_start = dmode->vdisplay + vm->vfront_porch;
> + dmode->vsync_end = dmode->vsync_start + vm->vsync_len;
> + dmode->vtotal = dmode->vsync_end + vm->vback_porch;
> +
> + dmode->clock = vm->pixelclock / 1000;
> +
> + if (vm->hah)
> + dmode->flags |= DRM_MODE_FLAG_PHSYNC;
> + else
> + dmode->flags |= DRM_MODE_FLAG_NHSYNC;
> + if (vm->vah)
> + dmode->flags |= DRM_MODE_FLAG_PVSYNC;
> + else
> + dmode->flags |= DRM_MODE_FLAG_NVSYNC;
> + if (vm->interlaced)
> + dmode->flags |= DRM_MODE_FLAG_INTERLACE;
> + if (vm->doublescan)
> + dmode->flags |= DRM_MODE_FLAG_DBLSCAN;
> + drm_mode_set_name(dmode);
> +
> + return 0;
> +}
> +EXPORT_SYMBOL_GPL(videomode_to_display_mode);
> +
> +int of_get_drm_display_mode(struct device_node *np, struct drm_display_mode *dmode,
> + int index)
> +{
> + struct videomode vm;
> + int ret;
> +
> + ret = of_get_videomode(np, &vm, index);
> +
> + if (ret)
> + return ret;
> +
> + videomode_to_display_mode(&vm, dmode);
> +
> + pr_info("%s: got %dx%d display mode from %s\n", __func__, vm.hactive,
> + vm.vactive, np->name);
> + dump_drm_displaymode(dmode);
> +
> + return 0;
> +
> +}
> +EXPORT_SYMBOL_GPL(of_get_drm_display_mode);
> +#else
> +int videomode_to_display_mode(struct videomode *vm, struct drm_display_mode *dmode)
> +{
> + return 0;
> +}
> +
> +int of_get_drm_display_mode(struct device_node *np, struct drm_display_mode *dmode,
> + int index)
> +{
> + return 0;
> +}
> +#endif
> +
> +int videomode_to_fb_videomode(struct videomode *vm, struct fb_videomode *fbmode)
> +{
> + memset(fbmode, 0, sizeof(*fbmode));
> +
> + fbmode->xres = vm->hactive;
> + fbmode->left_margin = vm->hback_porch;
> + fbmode->right_margin = vm->hfront_porch;
> + fbmode->hsync_len = vm->hsync_len;
> +
> + fbmode->yres = vm->vactive;
> + fbmode->upper_margin = vm->vback_porch;
> + fbmode->lower_margin = vm->vfront_porch;
> + fbmode->vsync_len = vm->vsync_len;
> +
> + fbmode->pixclock = KHZ2PICOS(vm->pixelclock) / 1000;
> +
> + if (vm->hah)
> + fbmode->sync |= FB_SYNC_HOR_HIGH_ACT;
> + if (vm->vah)
> + fbmode->sync |= FB_SYNC_VERT_HIGH_ACT;
> + if (vm->interlaced)
> + fbmode->vmode |= FB_VMODE_INTERLACED;
> + if (vm->doublescan)
> + fbmode->vmode |= FB_VMODE_DOUBLE;
> +
> + return 0;
> +}
> +EXPORT_SYMBOL_GPL(videomode_to_fb_videomode);
> +
> +int of_get_fb_videomode(struct device_node *np, struct fb_videomode *fb,
> + int index)
> +{
> + struct videomode vm;
> + int ret;
> +
> + ret = of_get_videomode(np, &vm, index);
> + if (ret)
> + return ret;
> +
> + videomode_to_fb_videomode(&vm, fb);
> +
> + pr_info("%s: got %dx%d display mode from %s\n", __func__, vm.hactive,
> + vm.vactive, np->name);
> + dump_fb_videomode(fb);
> +
> + return 0;
> +}
> +EXPORT_SYMBOL_GPL(of_get_drm_display_mode);
> diff --git a/include/linux/of_videomode.h b/include/linux/of_videomode.h
> new file mode 100644
> index 0000000..96efe01
> --- /dev/null
> +++ b/include/linux/of_videomode.h
> @@ -0,0 +1,41 @@
> +/*
> + * Copyright 2012 Steffen Trumtrar <s.trumtrar@pengutronix.de>
> + *
> + * generic videomode description
> + *
> + * This file is released under the GPLv2
> + */
> +
> +#ifndef __LINUX_VIDEOMODE_H
> +#define __LINUX_VIDEOMODE_H
> +
> +#include <drm/drmP.h>
You don't need to include this.
> +struct videomode {
> + u32 pixelclock;
> + u32 refreshrate;
> +
> + u32 hactive;
> + u32 hfront_porch;
> + u32 hback_porch;
> + u32 hsync_len;
> +
> + u32 vactive;
> + u32 vfront_porch;
> + u32 vback_porch;
> + u32 vsync_len;
> +
> + bool hah;
> + bool vah;
> + bool interlaced;
> + bool doublescan;
> +
> +};
This is not really of related. And actually, neither is the struct
signal_timing in the previous patch. It would be nice to have these in a
common header that fb, drm, and others could use instead of each having
their own timing structs.
But that's probably out of scope for this series =). Did you check the
timing structs from the video related frameworks in the kernel to see if
your structs contain all the info the others have, so that, at least in
theory, everybody could use these common structs?
Tomi
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: [PATCH 1/2 v6] of: add helper to parse display timings
From: Tomi Valkeinen @ 2012-10-08 7:12 UTC (permalink / raw)
To: Steffen Trumtrar
Cc: devicetree-discuss, Rob Herring, linux-fbdev, dri-devel,
Laurent Pinchart, linux-media
In-Reply-To: <1349680065.3227.25.camel@deskari>
[-- Attachment #1: Type: text/plain, Size: 638 bytes --]
On Mon, 2012-10-08 at 10:07 +0300, Tomi Valkeinen wrote:
> Hi,
> I don't see you setting disp->default_timing to OF_DEFAULT_TIMING in
> case there's no default_timing found.
>
> Or, at least I presume OF_DEFAULT_TIMING is meant to mark non-existing
> default timing. The name OF_DEFAULT_TIMING is not very descriptive to
> me.
Ah, I see now from the second patch how this is meant to be used. So if
there's no default timing in DT data, disp->default_timing is 0, meaning
the first entry. And the caller of of_get_videomode() will use
OF_DEFAULT_TIMING as index to get the default mode.
So I think it's ok.
Tomi
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: [PATCH 1/2 v6] of: add helper to parse display timings
From: Tomi Valkeinen @ 2012-10-08 7:07 UTC (permalink / raw)
To: Steffen Trumtrar
Cc: devicetree-discuss, Rob Herring, linux-fbdev, dri-devel,
Laurent Pinchart, linux-media
In-Reply-To: <1349373560-11128-2-git-send-email-s.trumtrar@pengutronix.de>
[-- Attachment #1: Type: text/plain, Size: 22858 bytes --]
Hi,
On Thu, 2012-10-04 at 19:59 +0200, Steffen Trumtrar wrote:
> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> ---
> .../devicetree/bindings/video/display-timings.txt | 222 ++++++++++++++++++++
> drivers/of/Kconfig | 5 +
> drivers/of/Makefile | 1 +
> drivers/of/of_display_timings.c | 183 ++++++++++++++++
> include/linux/of_display_timings.h | 85 ++++++++
> 5 files changed, 496 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/video/display-timings.txt
> create mode 100644 drivers/of/of_display_timings.c
> create mode 100644 include/linux/of_display_timings.h
>
> diff --git a/Documentation/devicetree/bindings/video/display-timings.txt b/Documentation/devicetree/bindings/video/display-timings.txt
> new file mode 100644
> index 0000000..45e39bd
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/video/display-timings.txt
> @@ -0,0 +1,222 @@
> +display-timings bindings
> +==================
> +
> +display-timings-node
> +------------
> +
> +required properties:
> + - none
> +
> +optional properties:
> + - default-timing: the default timing value
> +
> +timings-subnode
> +---------------
> +
> +required properties:
> + - hactive, vactive: Display resolution
> + - hfront-porch, hback-porch, hsync-len: Horizontal Display timing parameters
> + in pixels
> + vfront-porch, vback-porch, vsync-len: Vertical display timing parameters in
> + lines
> + - clock: displayclock in Hz
> +
> +optional properties:
> + - hsync-active-high (bool): Hsync pulse is active high
> + - vsync-active-high (bool): Vsync pulse is active high
> + - de-active-high (bool): Data-Enable pulse is active high
> + - pixelclk-inverted (bool): pixelclock is inverted
> + - interlaced (bool)
> + - doublescan (bool)
I think bool should be generally used for things that are on/off, like
interlace. For hsync-active-high & others I'd rather have 0/1 values as
others already suggested.
> +There are different ways of describing the capabilities of a display. The devicetree
> +representation corresponds to the one commonly found in datasheets for displays.
> +If a display supports multiple signal timings, the default-timing can be specified.
> +
> +The parameters are defined as
> +
> +struct signal_timing
> +===================
> +
> + +----------+---------------------------------------------+----------+-------+
> + | | ↑ | | |
> + | | |vback_porch | | |
> + | | ↓ | | |
> + +----------###############################################----------+-------+
> + | # ↑ # | |
> + | # | # | |
> + | hback # | # hfront | hsync |
> + | porch # | hactive # porch | len |
> + |<-------->#<---------------+--------------------------->#<-------->|<----->|
> + | # | # | |
> + | # |vactive # | |
> + | # | # | |
> + | # ↓ # | |
> + +----------###############################################----------+-------+
> + | | ↑ | | |
> + | | |vfront_porch | | |
> + | | ↓ | | |
> + +----------+---------------------------------------------+----------+-------+
> + | | ↑ | | |
> + | | |vsync_len | | |
> + | | ↓ | | |
> + +----------+---------------------------------------------+----------+-------+
> +
> +
> +Example:
> +
> + display-timings {
> + default-timing = <&timing0>;
> + timing0: 1920p24 {
> + /* 1920x1080p24 */
I think this is commonly called 1080p24.
> + clock = <52000000>;
> + hactive = <1920>;
> + vactive = <1080>;
> + hfront-porch = <25>;
> + hback-porch = <25>;
> + hsync-len = <25>;
> + vback-porch = <2>;
> + vfront-porch = <2>;
> + vsync-len = <2>;
> + hsync-active-high;
> + };
> + };
> +
> +Every property also supports the use of ranges, so the commonly used datasheet
> +description with <min typ max>-tuples can be used.
> +
> +Example:
> +
> + timing1: timing {
> + /* 1920x1080p24 */
> + clock = <148500000>;
> + hactive = <1920>;
> + vactive = <1080>;
> + hsync-len = <0 44 60>;
> + hfront-porch = <80 88 95>;
> + hback-porch = <100 148 160>;
> + vfront-porch = <0 4 6>;
> + vback-porch = <0 36 50>;
> + vsync-len = <0 5 6>;
> + };
> +
> +Usage in backend
> +================
> +
> +A backend driver may choose to use the display-timings directly and convert the timing
> +ranges to a suitable mode. Or it may just use the conversion of the display timings
> +to the required mode via the generic videomode struct.
> +
> + dtb
> + |
> + | of_get_display_timing_list
> + ↓
> + struct display_timings
> + |
> + | videomode_from_timing
> + ↓
> + --- struct videomode ---
> + | |
> + videomode_to_displaymode | | videomode_to_fb_videomode
> + ↓ ↓
> + drm_display_mode fb_videomode
> +
> +The functions of_get_fb_videomode and of_get_display_mode are provided
> +to conveniently get the respective mode representation from the devicetree.
> +
> +Conversion to videomode
> +=======================
> +
> +As device drivers normally work with some kind of video mode, the timings can be
> +converted (may be just a simple copying of the typical value) to a generic videomode
> +structure which then can be converted to the according mode used by the backend.
> +
> +Supported modes
> +===============
> +
> +The generic videomode read in by the driver can be converted to the following
> +modes with the following parameters
> +
> +struct fb_videomode
> +===================
> +
> + +----------+---------------------------------------------+----------+-------+
> + | | ↑ | | |
> + | | |upper_margin | | |
> + | | ↓ | | |
> + +----------###############################################----------+-------+
> + | # ↑ # | |
> + | # | # | |
> + | # | # | |
> + | # | # | |
> + | left # | # right | hsync |
> + | margin # | xres # margin | len |
> + |<-------->#<---------------+--------------------------->#<-------->|<----->|
> + | # | # | |
> + | # | # | |
> + | # | # | |
> + | # |yres # | |
> + | # | # | |
> + | # | # | |
> + | # | # | |
> + | # | # | |
> + | # | # | |
> + | # | # | |
> + | # | # | |
> + | # | # | |
> + | # ↓ # | |
> + +----------###############################################----------+-------+
> + | | ↑ | | |
> + | | |lower_margin | | |
> + | | ↓ | | |
> + +----------+---------------------------------------------+----------+-------+
> + | | ↑ | | |
> + | | |vsync_len | | |
> + | | ↓ | | |
> + +----------+---------------------------------------------+----------+-------+
> +
> +clock in nanoseconds
> +
> +struct drm_display_mode
> +=======================
> +
> + +----------+---------------------------------------------+----------+-------+
> + | | | | | ↑
> + | | | | | |
> + | | | | | |
> + +----------###############################################----------+-------+ |
> + | # ↑ ↑ ↑ # | | |
> + | # | | | # | | |
> + | # | | | # | | |
> + | # | | | # | | |
> + | # | | | # | | |
> + | # | | | hdisplay # | | |
> + | #<--+--------------------+-------------------># | | |
> + | # | | | # | | |
> + | # |vsync_start | # | | |
> + | # | | | # | | |
> + | # | |vsync_end | # | | |
> + | # | | |vdisplay # | | |
> + | # | | | # | | |
> + | # | | | # | | |
> + | # | | | # | | | vtotal
> + | # | | | # | | |
> + | # | | | hsync_start # | | |
> + | #<--+---------+----------+------------------------------>| | |
> + | # | | | # | | |
> + | # | | | hsync_end # | | |
> + | #<--+---------+----------+-------------------------------------->| |
> + | # | | ↓ # | | |
> + +----------####|#########|################################----------+-------+ |
> + | | | | | | | |
> + | | | | | | | |
> + | | ↓ | | | | |
> + +----------+-------------+-------------------------------+----------+-------+ |
> + | | | | | | |
> + | | | | | | |
> + | | ↓ | | | ↓
> + +----------+---------------------------------------------+----------+-------+
> + htotal
> + <------------------------------------------------------------------------->
> +
> +clock in kilohertz
> diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
> index dfba3e6..646deb0 100644
> --- a/drivers/of/Kconfig
> +++ b/drivers/of/Kconfig
> @@ -83,4 +83,9 @@ config OF_MTD
> depends on MTD
> def_bool y
>
> +config OF_DISPLAY_TIMINGS
> + def_bool y
> + help
> + helper to parse display timings from the devicetree
> +
> endmenu # OF
> diff --git a/drivers/of/Makefile b/drivers/of/Makefile
> index e027f44..c8e9603 100644
> --- a/drivers/of/Makefile
> +++ b/drivers/of/Makefile
> @@ -11,3 +11,4 @@ obj-$(CONFIG_OF_MDIO) += of_mdio.o
> obj-$(CONFIG_OF_PCI) += of_pci.o
> obj-$(CONFIG_OF_PCI_IRQ) += of_pci_irq.o
> obj-$(CONFIG_OF_MTD) += of_mtd.o
> +obj-$(CONFIG_OF_DISPLAY_TIMINGS) += of_display_timings.o
> diff --git a/drivers/of/of_display_timings.c b/drivers/of/of_display_timings.c
> new file mode 100644
> index 0000000..e47bc63
> --- /dev/null
> +++ b/drivers/of/of_display_timings.c
> @@ -0,0 +1,183 @@
> +/*
> + * OF helpers for parsing display timings
> + *
> + * Copyright (c) 2012 Steffen Trumtrar <s.trumtrar@pengutronix.de>, Pengutronix
> + *
> + * based on of_videomode.c by Sascha Hauer <s.hauer@pengutronix.de>
> + *
> + * This file is released under the GPLv2
> + */
> +#include <linux/of.h>
> +#include <linux/slab.h>
> +#include <linux/export.h>
> +#include <linux/of_display_timings.h>
> +
> +/* every signal_timing can be specified with either
> + * just the typical value or a range consisting of
> + * min/typ/max.
> + * This function helps handling this
> + */
The comment is not according to kernel coding style. And I'd start the
sentence with a capital letter =).
> +static int parse_property(struct device_node *np, char *name,
> + struct timing_entry *result)
> +{
> + struct property *prop;
> + int length;
> + int cells;
> + int ret;
> +
> + prop = of_find_property(np, name, &length);
> + if (!prop) {
> + pr_err("%s: could not find property %s\n", __func__, name);
> + return -EINVAL;
> + }
> +
> + cells = length / sizeof(u32);
> +
> + if (cells == 1)
> + ret = of_property_read_u32_array(np, name, &result->typ, cells);
> + else if (cells == 3)
> + ret = of_property_read_u32_array(np, name, &result->min, cells);
> + else {
> + pr_err("%s: illegal timing specification in %s\n", __func__,
> + name);
> + return -EINVAL;
> + }
> +
> + return ret;
> +}
> +
> +struct signal_timing *of_get_display_timing(struct device_node *np)
> +{
> + struct signal_timing *st;
> + int ret = 0;
> +
> + st = kzalloc(sizeof(*st), GFP_KERNEL);
> +
> + if (!st) {
> + pr_err("%s: could not allocate signal_timing struct\n", __func__);
> + return NULL;
> + }
> +
> + ret |= parse_property(np, "hback-porch", &st->hback_porch);
> + ret |= parse_property(np, "hfront-porch", &st->hfront_porch);
> + ret |= parse_property(np, "hactive", &st->hactive);
> + ret |= parse_property(np, "hsync-len", &st->hsync_len);
> + ret |= parse_property(np, "vback-porch", &st->vback_porch);
> + ret |= parse_property(np, "vfront-porch", &st->vfront_porch);
> + ret |= parse_property(np, "vactive", &st->vactive);
> + ret |= parse_property(np, "vsync-len", &st->vsync_len);
> + ret |= parse_property(np, "clock", &st->pixelclock);
> +
> + st->vsync_pol_active_high = of_property_read_bool(np, "vsync-active-high");
> + st->hsync_pol_active_high = of_property_read_bool(np, "hsync-active-high");
> + st->de_pol_active_high = of_property_read_bool(np, "de-active-high");
> + st->pixelclk_pol_inverted = of_property_read_bool(np, "pixelclk-inverted");
> + st->interlaced = of_property_read_bool(np, "interlaced");
> + st->doublescan = of_property_read_bool(np, "doublescan");
> +
> + if (ret) {
> + pr_err("%s: error reading timing properties\n", __func__);
> + return NULL;
> + }
> +
> + return st;
> +}
> +EXPORT_SYMBOL_GPL(of_get_display_timing);
> +
> +struct display_timings *of_get_display_timing_list(struct device_node *np)
> +{
> + struct device_node *timings_np;
> + struct device_node *entry;
> + struct display_timings *disp;
> + char *default_timing;
> +
> + if (!np) {
> + pr_err("%s: no devicenode given\n", __func__);
> + return NULL;
> + }
> +
> + timings_np = of_find_node_by_name(np, "display-timings");
> +
> + if (!timings_np) {
> + pr_err("%s: could not find display-timings node\n", __func__);
> + return NULL;
> + }
> +
> + disp = kzalloc(sizeof(*disp), GFP_KERNEL);
> +
> + entry = of_parse_phandle(timings_np, "default-timing", 0);
> +
> + if (!entry) {
> + pr_info("%s: no default-timing specified\n", __func__);
> + entry = of_find_node_by_name(np, "timing");
> + }
If "default-timing" property is optional, I don't see any need for the
pr_info above, as it should be business as usual if the property doesn't
exist.
If the default-timing property doesn't exist, wouldn't it be simpler to
get the first subnode, instead of looking one with "timing" name?
> +
> + if (!entry) {
> + pr_info("%s: no timing specifications given\n", __func__);
> + return disp;
> + }
Again, I don't think the pr_info is needed if this is a normal case.
Then again, perhaps this could be an error? Why would there be a display
node without any timings?
> +
> + pr_info("%s: using %s as default timing\n", __func__, entry->name);
> +
> + default_timing = (char *)entry->full_name;
const char *?
> +
> + disp->num_timings = 0;
> +
> + for_each_child_of_node(timings_np, entry) {
> + disp->num_timings++;
> + }
No need for { }
> + disp->timings = kzalloc(sizeof(struct signal_timing *)*disp->num_timings,
> + GFP_KERNEL);
> +
> + disp->num_timings = 0;
> +
> + for_each_child_of_node(timings_np, entry) {
> + struct signal_timing *st;
> +
> + st = of_get_display_timing(entry);
> +
> + if (!st)
> + continue;
> +
> + if (strcmp(default_timing, entry->full_name) == 0)
> + disp->default_timing = disp->num_timings;
I don't see you setting disp->default_timing to OF_DEFAULT_TIMING in
case there's no default_timing found.
Or, at least I presume OF_DEFAULT_TIMING is meant to mark non-existing
default timing. The name OF_DEFAULT_TIMING is not very descriptive to
me.
Would it make more sense to have the disp->default_timing as a pointer
to the timing, instead of index? Then a NULL value would mark a
non-existing default timing.
> + disp->timings[disp->num_timings] = st;
> + disp->num_timings++;
> + }
> +
> +
> + of_node_put(timings_np);
> +
> + if (disp->num_timings >= 0)
> + pr_info("%s: got %d timings. Using timing #%d as default\n", __func__,
> + disp->num_timings , disp->default_timing + 1);
> + else
> + pr_info("%s: no timings specified\n", __func__);
> +
> + return disp;
> +}
> +EXPORT_SYMBOL_GPL(of_get_display_timing_list);
> +
> +int of_display_timings_exists(struct device_node *np)
> +{
> + struct device_node *timings_np;
> + struct device_node *default_np;
> +
> + if (!np)
> + return -EINVAL;
> +
> + timings_np = of_parse_phandle(np, "display-timings", 0);
> +
> + if (!timings_np)
> + return -EINVAL;
> +
> + default_np = of_parse_phandle(np, "default-timing", 0);
> +
> + if (default_np)
> + return 0;
> +
> + return -EINVAL;
> +}
> +EXPORT_SYMBOL_GPL(of_display_timings_exists);
> diff --git a/include/linux/of_display_timings.h b/include/linux/of_display_timings.h
> new file mode 100644
> index 0000000..1ad719e
> --- /dev/null
> +++ b/include/linux/of_display_timings.h
> @@ -0,0 +1,85 @@
> +/*
> + * Copyright 2012 Steffen Trumtrar <s.trumtrar@pengutronix.de>
> + *
> + * description of display timings
> + *
> + * This file is released under the GPLv2
> + */
> +
> +#ifndef __LINUX_OF_DISPLAY_TIMINGS_H
> +#define __LINUX_OF_DISPLAY_TIMINGS_H
> +
> +#define OF_DEFAULT_TIMING -1
> +
> +struct display_timings {
> + unsigned int num_timings;
> + unsigned int default_timing;
> +
> + struct signal_timing **timings;
Should this be a pointer to a const array of const data? Is there ever
need to change them after they've been read from DT?
> +};
> +
> +struct timing_entry {
> + u32 min;
> + u32 typ;
> + u32 max;
> +};
> +
> +struct signal_timing {
> + struct timing_entry pixelclock;
> +
> + struct timing_entry hactive;
> + struct timing_entry hfront_porch;
> + struct timing_entry hback_porch;
> + struct timing_entry hsync_len;
> +
> + struct timing_entry vactive;
> + struct timing_entry vfront_porch;
> + struct timing_entry vback_porch;
> + struct timing_entry vsync_len;
> +
> + bool vsync_pol_active_high;
> + bool hsync_pol_active_high;
> + bool de_pol_active_high;
> + bool pixelclk_pol_inverted;
> + bool interlaced;
> + bool doublescan;
> +};
> +
> +struct display_timings *of_get_display_timing_list(struct device_node *np);
> +struct signal_timing *of_get_display_timing(struct device_node *np);
> +int of_display_timings_exists(struct device_node *np);
> +
> +/* placeholder function until ranges are really needed */
> +static inline u32 signal_timing_get_value(struct timing_entry *te, int index)
> +{
> + return te->typ;
> +}
> +
> +static inline void timings_release(struct display_timings *disp)
> +{
> + int i;
> +
> + for (i = 0; i < disp->num_timings; i++)
> + kfree(disp->timings[i]);
> +}
> +
> +static inline void display_timings_release(struct display_timings *disp)
> +{
> + timings_release(disp);
> + kfree(disp->timings);
> +}
> +
> +static inline struct signal_timing *display_timings_get(struct display_timings *disp,
> + int index)
> +{
> + struct signal_timing *st;
> +
> + if (disp->num_timings > index) {
> + st = disp->timings[index];
> + return st;
> + }
> + else
> + return NULL;
> +}
Why do you have these functions in the header file?
Tomi
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: [PATCH 2/2 v6] of: add generic videomode description
From: Laurent Pinchart @ 2012-10-07 13:38 UTC (permalink / raw)
To: Steffen Trumtrar
Cc: Stephen Warren, devicetree-discuss, linux-fbdev, dri-devel,
Tomi Valkeinen, linux-media
In-Reply-To: <20121005155121.GA2053@pengutronix.de>
Hi Steffen,
On Friday 05 October 2012 17:51:21 Steffen Trumtrar wrote:
> On Thu, Oct 04, 2012 at 12:51:00PM -0600, Stephen Warren wrote:
> > On 10/04/2012 11:59 AM, Steffen Trumtrar wrote:
> > > Get videomode from devicetree in a format appropriate for the
> > > backend. drm_display_mode and fb_videomode are supported atm.
> > > Uses the display signal timings from of_display_timings
> > >
> > > +++ b/drivers/of/of_videomode.c
> > >
> > > +int videomode_from_timing(struct display_timings *disp, struct
> > > videomode *vm,
> > >
> > > + st = display_timings_get(disp, index);
> > > +
> > > + if (!st) {
> >
> > It's a little odd to leave a blank line between those two lines.
>
> Hm, well okay. That can be remedied
>
> > Only half of the code in this file seems OF-related; the routines to
> > convert a timing to a videomode or drm display mode seem like they'd be
> > useful outside device tree, so I wonder if putting them into
> > of_videomode.c is the correct thing to do. Still, it's probably not a
> > big deal.
>
> I am not sure, what the appropriate way to do this is. I can split it up
> (again).
I think it would make sense to move them to their respective subsystems.
--
Regards,
Laurent Pinchart
^ permalink raw reply
* Re: [PATCH 1/2 v6] of: add helper to parse display timings
From: Laurent Pinchart @ 2012-10-07 13:38 UTC (permalink / raw)
To: Steffen Trumtrar
Cc: Stephen Warren, devicetree-discuss, linux-fbdev, dri-devel,
Tomi Valkeinen, linux-media
In-Reply-To: <20121005163858.GD2053@pengutronix.de>
Hi Steffen,
On Friday 05 October 2012 18:38:58 Steffen Trumtrar wrote:
> On Fri, Oct 05, 2012 at 10:21:37AM -0600, Stephen Warren wrote:
> > On 10/05/2012 10:16 AM, Steffen Trumtrar wrote:
> > > On Thu, Oct 04, 2012 at 12:47:16PM -0600, Stephen Warren wrote:
> > >> On 10/04/2012 11:59 AM, Steffen Trumtrar wrote:
> > ...
> >
> > >>> + for_each_child_of_node(timings_np, entry) {
> > >>> + struct signal_timing *st;
> > >>> +
> > >>> + st = of_get_display_timing(entry);
> > >>> +
> > >>> + if (!st)
> > >>> + continue;
> > >>
> > >> I wonder if that shouldn't be an error?
> > >
> > > In the sense of a pr_err not a -EINVAL I presume?! It is a little bit
> > > quiet in case of a faulty spec, that is right.
> >
> > I did mean return an error; if we try to parse something and can't,
> > shouldn't we return an error?
> >
> > I suppose it may be possible to limp on and use whatever subset of modes
> > could be parsed and drop the others, which is what this code does, but
> > the code after the loop would definitely return an error if zero timings
> > were parseable.
>
> If a display supports multiple modes, I think it is better to have a working
> mode (even if it is not the preferred one) than have none at all.
> If there is no mode at all, that should be an error, right.
If we fail completely in case of an error, DT writers will notice their bugs.
If we ignore errors silently they won't, and we'll end up with buggy DTs (or,
to be accurate, even more buggy DTs :-)). I'd rather fail completely in the
first implementation and add workarounds later only if we need to.
--
Regards,
Laurent Pinchart
^ permalink raw reply
* Re: omap DSS cmdline resolution not working for HDMI?
From: Tony Lindgren @ 2012-10-05 16:43 UTC (permalink / raw)
To: Tomi Valkeinen; +Cc: linux-omap, linux-fbdev
In-Reply-To: <1349435094.2401.17.camel@deskari>
* Tomi Valkeinen <tomi.valkeinen@ti.com> [121005 04:06]:
> On Thu, 2012-10-04 at 10:56 -0700, Tony Lindgren wrote:
> > Hi,
> >
> > FYI, looks like for some reason DSS command line is not
> > working for HDMI while it works for DSS. On my panda es
> > I'm trying to set my motorola lapdock resolution from
> > cmdline with:
> >
> > omapdss.def_disp=hdmi omapfb.mode=hdmi:1366x768@60
> >
> > But it does not seem to do anything and resolution is
> > VGA. If I change the cable to DVI port this works:
> >
> > omapdss.def_disp=dvi omapfb.mode=dvi:1366x768@60
> >
> > Any ideas? This is with current linux next.
>
> That's because our HDMI only supports certain timings. To be honest, I
> don't really understand this restriction, as I believe the hardware
> should be able to use more or less any timings just like DVI.
>
> The 1366x768@60 mode is parsed with fbdev functions, which returns a
> video timings. These timings are then given to the HDMI driver, which
> tries to find matching timings from its timing table. And when it
> doesn't find a match, it fails.
>
> This is a known problem, and the hdmi driver would really need some love
> in other aspects also. I'm not sure what would be the best way to
> improve this without doing major rewrites. Perhaps the check in the hdmi
> driver could be more relaxed, but that needs some careful thought.
OK, I'll take a look when I have a chance.
> > I can change the HDMI resolution OK from userspace with:
> >
> > echo "1" > /sys/devices/platform/omapdss/display1/enabled
> > echo "0" > /sys/devices/platform/omapdss/overlay0/enabled
> > echo "tv" > /sys/devices/platform/omapdss/overlay0/manager
> > echo "1" > /sys/devices/platform/omapdss/overlay0/enabled
> > echo "85500,1366/70/213/143,768/3/24/3" > /sys/devices/platform/omapdss/display1/timings
>
> That's because the above line has timings that are in the hdmi driver's
> table. They are somewhat different than what fbdev gives for
> "1366x768@60".
OK
> > The reason to use HDMI instead of DVI here is that HDMI
> > also has the speakers on the lapdock ;)
> >
> > Then I'm able to switch between HDMI panel and DVI panel
> > just fine using overlay0. I don't know if getting both
> > HDMI and DVI to work the same time using overlay1 is
> > supposed to work, but trying use overlay1 produces the
> > following:
>
> HDMI and DVI cannot be used reliably at the same time, due to a HW issue
> we've had unresolved for a long time. Luckily, it was solved this week
> and we'll have a patch for next merge window to get this working.
That's nice, I'll give that a try at some point.
> > echo "1" > /sys/devices/platform/omapdss/display0/enabled
> > echo "0" > /sys/devices/platform/omapdss/overlay1/enabled
> > echo "lcd2" > /sys/devices/platform/omapdss/overlay1/manager
> > echo "1" > /sys/devices/platform/omapdss/overlay1/enabled
> > echo "170666,1920/336/128/208,1200/38/1/3" > /sys/devices/platform/omapdss/display0/timings
> >
> > [ 816.446044] omapdss DPI: Could not find exact pixel clock. Requested 23500 kHz, got 23630 kHz
> > [ 881.639221] omapdss APPLY: timeout in wait_pending_extra_info_updates
> > [ 958.946594] ------------[ cut here ]------------
> > [ 958.953277] WARNING: at drivers/bus/omap_l3_noc.c:97 l3_interrupt_handler+0xc0/0x184()
> > [ 958.965576] L3 standard error: TARGET:DMM2 at address 0x0
> > ...
>
> Having said the above, I don't quite know where this error comes from...
> Tiler (DMM) is not even used by omapfb.
Looks like somehow also output_size won't change when changing
display output from DVI to HDMI.
If I boot with DVI panel at 1600x1200, then try to switch to the
HDMI monitor with the following script:
#!/bin/sh
export dvi=display0
export hdmi=display1
export overlay=overlay0
echo 0 > /sys/devices/platform/omapdss/$dvi/enabled
echo 1 > /sys/devices/platform/omapdss/$hdmi/enabled
echo "85500,1366/70/213/143,768/3/24/3" > /sys/devices/platform/omapdss/$hdmi/timings
echo 0 > /sys/devices/platform/omapdss/$overlay/enabled
echo tv > /sys/devices/platform/omapdss/$overlay/manager
#echo "1366,768" > /sys/devices/platform/omapdss/$overlay/output_size
echo 1 > /sys/devices/platform/omapdss/$overlay/enabled
cat /sys/devices/platform/omapdss/$hdmi/timings
cat /sys/devices/platform/omapdss/$overlay/output_size
I get the following which may provide more clues:
[64370.820312] omapdss DISPC error: SYNC_LOST on channel tv, restarting the output with video overlays dd
[64370.831024] omapdss OVERLAY error: overlay 0 horizontally not inside the display area (0 + 1600 >= 13)
[64370.840972] omapdss APPLY error: failed to enable manager 1: check_settings failed
[64370.849670] omapdss HDMI error: failed to power on device
[64370.855407] omapdss error: failed to power on
[64370.862487] omapdss OVERLAY error: overlay 0 horizontally not inside the display area (0 + 1600 >= 13)
[64370.872436] omapdss APPLY error: failed to enable manager 1: check_settings failed
[64370.880798] omapdss HDMI error: failed to power on device
[64370.886505] omapdss error: failed to power on
85500,1366/70/213/143,768/3/24/3
1600,1200
FYI, I'm also seeing the DVI monitor blank out on it's own for
about a second or so on regular basis every 10 minutes or so.
No idea what's causing that, maybe it's a reminder to take
a short break :)
Regards,
Tony
^ permalink raw reply
* Re: [PATCH 1/2 v6] of: add helper to parse display timings
From: Steffen Trumtrar @ 2012-10-05 16:38 UTC (permalink / raw)
To: Stephen Warren
Cc: devicetree-discuss, linux-fbdev, dri-devel, Tomi Valkeinen,
Laurent Pinchart, linux-media
In-Reply-To: <506F0911.1050808@wwwdotorg.org>
On Fri, Oct 05, 2012 at 10:21:37AM -0600, Stephen Warren wrote:
> On 10/05/2012 10:16 AM, Steffen Trumtrar wrote:
> > On Thu, Oct 04, 2012 at 12:47:16PM -0600, Stephen Warren wrote:
> >> On 10/04/2012 11:59 AM, Steffen Trumtrar wrote:
> ...
> >>> + for_each_child_of_node(timings_np, entry) {
> >>> + struct signal_timing *st;
> >>> +
> >>> + st = of_get_display_timing(entry);
> >>> +
> >>> + if (!st)
> >>> + continue;
> >>
> >> I wonder if that shouldn't be an error?
> >
> > In the sense of a pr_err not a -EINVAL I presume?! It is a little bit quiet in
> > case of a faulty spec, that is right.
>
> I did mean return an error; if we try to parse something and can't,
> shouldn't we return an error?
>
> I suppose it may be possible to limp on and use whatever subset of modes
> could be parsed and drop the others, which is what this code does, but
> the code after the loop would definitely return an error if zero timings
> were parseable.
If a display supports multiple modes, I think it is better to have a working
mode (even if it is not the preferred one) than have none at all.
If there is no mode at all, that should be an error, right.
Regards,
Steffen
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply
* Re: [PATCH v2] fbdev: Add Renesas vdc4 framebuffer driver
From: phil.edworthy @ 2012-10-05 16:34 UTC (permalink / raw)
To: linux-fbdev
In-Reply-To: <1347267372-22949-1-git-send-email-phil.edworthy@renesas.com>
Hi,
Any news on this patch?
Thanks
Phil
> From: Jingoo Han <jg1.han@samsung.com>
> To: "'Phil Edworthy'" <phil.edworthy@renesas.com>,
> Cc: "'Florian Tobias Schandinat'" <FlorianSchandinat@gmx.de>, linux-
> fbdev@vger.kernel.org, linux-sh@vger.kernel.org, "'Jingoo Han'"
> <jg1.han@samsung.com>
> Date: 11/09/2012 03:31
> Subject: Re: [PATCH v2] fbdev: Add Renesas vdc4 framebuffer driver
>
> On Monday, September 10, 2012 5:56 PM Phil Edworthy wrote
> >
> > The vdc4 display hardware is found on the sh7269 device.
> >
> > Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
>
>
> Reviewed-by: Jingoo Han <jg1.han@samsung.com>
>
> Best regards,
> Jingoo Han
>
>
> > ---
> > v2:
> > * Use devm_ variants of clk_get, ioremap_nocache, request_irq.
> > * Replace spaces with tabs.
> > * Check ren_vdc4_start return value.
> > * Fix headers used.
> >
> > drivers/video/Kconfig | 10 +
> > drivers/video/Makefile | 1 +
> > drivers/video/ren_vdc4fb.c | 641 +++++++++++++++++++++++++++++++
> +++++++++++++
> > include/video/ren_vdc4fb.h | 19 ++
> > 4 files changed, 671 insertions(+), 0 deletions(-)
> > create mode 100644 drivers/video/ren_vdc4fb.c
> > create mode 100644 include/video/ren_vdc4fb.h
>
>
^ permalink raw reply
* Re: [PATCH 1/2 v6] of: add helper to parse display timings
From: Steffen Trumtrar @ 2012-10-05 16:28 UTC (permalink / raw)
To: Guennadi Liakhovetski
Cc: linux-fbdev-u79uwXL29TY76Z2rM5mHXA,
devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Tomi Valkeinen,
Laurent Pinchart, linux-media-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <Pine.LNX.4.64.1210042307300.3744-0199iw4Nj15frtckUFj5Ag@public.gmane.org>
On Thu, Oct 04, 2012 at 11:35:35PM +0200, Guennadi Liakhovetski wrote:
> Hi Steffen
>
> Sorry for chiming in so late in the game, but I've long been wanting to
> have a look at this and compare with what we do for V4L2, so, this seems a
> great opportunity to me:-)
>
> On Thu, 4 Oct 2012, Steffen Trumtrar wrote:
>
> > Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> > ---
> > .../devicetree/bindings/video/display-timings.txt | 222 ++++++++++++++++++++
> > drivers/of/Kconfig | 5 +
> > drivers/of/Makefile | 1 +
> > drivers/of/of_display_timings.c | 183 ++++++++++++++++
> > include/linux/of_display_timings.h | 85 ++++++++
> > 5 files changed, 496 insertions(+)
> > create mode 100644 Documentation/devicetree/bindings/video/display-timings.txt
> > create mode 100644 drivers/of/of_display_timings.c
> > create mode 100644 include/linux/of_display_timings.h
> >
> > diff --git a/Documentation/devicetree/bindings/video/display-timings.txt b/Documentation/devicetree/bindings/video/display-timings.txt
> > new file mode 100644
> > index 0000000..45e39bd
> > --- /dev/null
> > +++ b/Documentation/devicetree/bindings/video/display-timings.txt
> > @@ -0,0 +1,222 @@
> > +display-timings bindings
> > +=========
> > +
> > +display-timings-node
> > +------------
> > +
> > +required properties:
> > + - none
> > +
> > +optional properties:
> > + - default-timing: the default timing value
> > +
> > +timings-subnode
> > +---------------
> > +
> > +required properties:
> > + - hactive, vactive: Display resolution
> > + - hfront-porch, hback-porch, hsync-len: Horizontal Display timing parameters
> > + in pixels
> > + vfront-porch, vback-porch, vsync-len: Vertical display timing parameters in
> > + lines
> > + - clock: displayclock in Hz
>
> You're going to hate me for this, but eventually we want to actually
> reference clock objects in our DT bindings. For now, even if you don't
> want to actually add clock phandles and stuff here, I think, using the
> standard "clock-frequency" property would be much better!
>
Well, that shouldn't be a big deal, the "clock-frequency" property I mean :-)
> > +
> > +optional properties:
> > + - hsync-active-high (bool): Hsync pulse is active high
> > + - vsync-active-high (bool): Vsync pulse is active high
>
> For the above two we also considered using bool properties but eventually
> settled down with integer ones:
>
> - hsync-active = <1>
>
> for active-high and 0 for active low. This has the added advantage of
> being able to omit this property in the .dts, which then doesn't mean,
> that the polarity is active low, but rather, that the hsync line is not
> used on this hardware. So, maybe it would be good to use the same binding
> here too?
>
Never really thought about it that way. But the argument sounds convincing.
> > + - de-active-high (bool): Data-Enable pulse is active high
> > + - pixelclk-inverted (bool): pixelclock is inverted
>
> We don't (yet) have a de-active property in V4L, don't know whether we'll
> ever have to distingsuish between what some datasheets call "HREF" and
> HSYNC in DT, but maybe similarly to the above an integer would be
> preferred. As for pixclk, we call the property "pclk-sample" and it's also
> an integer.
>
> > + - interlaced (bool)
>
> Is "interlaced" a property of the hardware, i.e. of the board? Can the
> same display controller on one board require interlaced data and on
> another board - progressive? BTW, I'm not very familiar with display
> interfaces, but for interlaced you probably sometimes use a field signal,
> whose polarity you also want to specify here? We use a "field-even-active"
> integer property for it.
>
I don't really know about that; have to collect some info first.
> Thanks
> Guennadi
Thank you.
Regards,
Steffen
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply
* Re: [PATCH 1/2 v6] of: add helper to parse display timings
From: Stephen Warren @ 2012-10-05 16:21 UTC (permalink / raw)
To: devicetree-discuss, linux-fbdev, dri-devel, Tomi Valkeinen,
Laurent Pinchart, linux-media
In-Reply-To: <20121005161620.GB2053@pengutronix.de>
On 10/05/2012 10:16 AM, Steffen Trumtrar wrote:
> On Thu, Oct 04, 2012 at 12:47:16PM -0600, Stephen Warren wrote:
>> On 10/04/2012 11:59 AM, Steffen Trumtrar wrote:
...
>>> + for_each_child_of_node(timings_np, entry) {
>>> + struct signal_timing *st;
>>> +
>>> + st = of_get_display_timing(entry);
>>> +
>>> + if (!st)
>>> + continue;
>>
>> I wonder if that shouldn't be an error?
>
> In the sense of a pr_err not a -EINVAL I presume?! It is a little bit quiet in
> case of a faulty spec, that is right.
I did mean return an error; if we try to parse something and can't,
shouldn't we return an error?
I suppose it may be possible to limp on and use whatever subset of modes
could be parsed and drop the others, which is what this code does, but
the code after the loop would definitely return an error if zero timings
were parseable.
^ permalink raw reply
* Re: [PATCH 1/2 v6] of: add helper to parse display timings
From: Stephen Warren @ 2012-10-05 16:17 UTC (permalink / raw)
To: Guennadi Liakhovetski
Cc: Steffen Trumtrar, linux-fbdev, devicetree-discuss, dri-devel,
Tomi Valkeinen, Laurent Pinchart, linux-media
In-Reply-To: <Pine.LNX.4.64.1210042307300.3744@axis700.grange>
On 10/04/2012 03:35 PM, Guennadi Liakhovetski wrote:
> Hi Steffen
>
> Sorry for chiming in so late in the game, but I've long been wanting to
> have a look at this and compare with what we do for V4L2, so, this seems a
> great opportunity to me:-)
>
> On Thu, 4 Oct 2012, Steffen Trumtrar wrote:
>> diff --git a/Documentation/devicetree/bindings/video/display-timings.txt b/Documentation/devicetree/bindings/video/display-timings.txt
>> +timings-subnode
>> +---------------
>> +
>> +required properties:
>> + - hactive, vactive: Display resolution
>> + - hfront-porch, hback-porch, hsync-len: Horizontal Display timing parameters
>> + in pixels
>> + vfront-porch, vback-porch, vsync-len: Vertical display timing parameters in
>> + lines
>> + - clock: displayclock in Hz
>
> You're going to hate me for this, but eventually we want to actually
> reference clock objects in our DT bindings. For now, even if you don't
> want to actually add clock phandles and stuff here, I think, using the
> standard "clock-frequency" property would be much better!
In a definition of a display timing, we will never need to use the clock
binding; the clock binding would be used by the HW module that is
generating a timing, not by the timing definition itself.
That said, your comment about renaming the property to avoid any kind of
conceptual conflict is still quite valid. This is bike-shedding, but
"pixel-clock" might be more in line with typical video mode terminology,
although there's certainly preference in DT for using the generic term
clock-frequency that you proposed. Either is fine by me.
>> +optional properties:
>> + - hsync-active-high (bool): Hsync pulse is active high
>> + - vsync-active-high (bool): Vsync pulse is active high
>
> For the above two we also considered using bool properties but eventually
> settled down with integer ones:
>
> - hsync-active = <1>
>
> for active-high and 0 for active low. This has the added advantage of
> being able to omit this property in the .dts, which then doesn't mean,
> that the polarity is active low, but rather, that the hsync line is not
> used on this hardware. So, maybe it would be good to use the same binding
> here too?
I agree. This also covers the case where analog display connectors often
use polarity to differentiate similar modes, yet digital connectors
often always use a fixed polarity since the receiving device can
"measure" the signal in more complete ways.
If the board HW inverts these lines, the same property names can exist
in the display controller itself, and the two values XORd together to
yield the final output polarity.
>> + - de-active-high (bool): Data-Enable pulse is active high
>> + - pixelclk-inverted (bool): pixelclock is inverted
>
> We don't (yet) have a de-active property in V4L, don't know whether we'll
> ever have to distingsuish between what some datasheets call "HREF" and
> HSYNC in DT, but maybe similarly to the above an integer would be
> preferred. As for pixclk, we call the property "pclk-sample" and it's also
> an integer.
Thinking about this more: de-active-high is likely to be a
board-specific property and hence something in the display controller,
not in the mode definition?
>> + - interlaced (bool)
>
> Is "interlaced" a property of the hardware, i.e. of the board? Can the
> same display controller on one board require interlaced data and on
> another board - progressive?
Interlace is a property of a display mode. It's quite possible for a
particular display controller to switch between interlace and
progressive output at run-time. For example, reconfiguring the output
between 480i, 720p, 1080i, 1080p modes. Admittedly, if you're talking to
a built-in LCD display, you're probably always going to be driving the
single mode required by the panel, and that mode will likely always be
progressive. However, since this binding attempts to describe any
display timing, I think we still need this property per mode.
> BTW, I'm not very familiar with display
> interfaces, but for interlaced you probably sometimes use a field signal,
> whose polarity you also want to specify here? We use a "field-even-active"
> integer property for it.
I think that's a property of the display controller itself, rather than
an individual mode, although I'm not 100% certain. My assertion is that
the physical interface that the display controller is driving will
determine whether embedded or separate sync is used, and in the separate
sync case, how the field signal is defined, and that all interlace modes
driven over that interface will use the same field signal definition.
^ permalink raw reply
* Re: [PATCH 1/2 v6] of: add helper to parse display timings
From: Steffen Trumtrar @ 2012-10-05 16:16 UTC (permalink / raw)
To: Stephen Warren
Cc: linux-fbdev-u79uwXL29TY76Z2rM5mHXA,
devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Tomi Valkeinen,
Laurent Pinchart, linux-media-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <506DD9B4.40409-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
On Thu, Oct 04, 2012 at 12:47:16PM -0600, Stephen Warren wrote:
> On 10/04/2012 11:59 AM, Steffen Trumtrar wrote:
>
> A patch description would be useful for something like this.
>
Yes. Shame on me.
> > diff --git a/Documentation/devicetree/bindings/video/display-timings.txt b/Documentation/devicetree/bindings/video/display-timings.txt
> > new file mode 100644
> ...
> > +Usage in backend
> > +========
>
> Everything before that point in the file looks fine to me.
>
\o/
> Everything after this point in the file seems to be Linux-specific
> implementation details. Does it really belong in the DT binding
> documentation, rather than some Linux-specific documentation file?
>
I guess you are right about that.
> > +struct drm_display_mode
> > +===========> > +
> > + +----------+---------------------------------------------+----------+-------+
> > + | | | | | ↑
> > + | | | | | |
> > + | | | | | |
> > + +----------###############################################----------+-------+ |
>
> I suspect the entire horizontal box above (and the entire vertical box
> all the way down the left-hand side) should be on the bottom/right
> instead of top/left. The reason I think this is because all of
> vsync_start, vsync_end, vdisplay have to be referenced to some known
> point, which is usually zero or the start of the timing definition, /or/
> there would be some value indicating the size of the top marging/porch
> in order to say where those other values are referenced to.
>
> > + | # ↑ ↑ ↑ # | | |
> > + | # | | | # | | |
> > + | # | | | # | | |
> > + | # | | | # | | |
> > + | # | | | # | | |
> > + | # | | | hdisplay # | | |
> > + | #<--+--------------------+-------------------># | | |
> > + | # | | | # | | |
> > + | # |vsync_start | # | | |
> > + | # | | | # | | |
> > + | # | |vsync_end | # | | |
> > + | # | | |vdisplay # | | |
> > + | # | | | # | | |
> > + | # | | | # | | |
> > + | # | | | # | | | vtotal
> > + | # | | | # | | |
> > + | # | | | hsync_start # | | |
> > + | #<--+---------+----------+------------------------------>| | |
> > + | # | | | # | | |
> > + | # | | | hsync_end # | | |
> > + | #<--+---------+----------+-------------------------------------->| |
> > + | # | | ↓ # | | |
> > + +----------####|#########|################################----------+-------+ |
> > + | | | | | | | |
> > + | | | | | | | |
> > + | | ↓ | | | | |
> > + +----------+-------------+-------------------------------+----------+-------+ |
> > + | | | | | | |
> > + | | | | | | |
> > + | | ↓ | | | ↓
> > + +----------+---------------------------------------------+----------+-------+
> > + htotal
> > + <------------------------------------------------------------------------->
>
> > diff --git a/drivers/of/of_display_timings.c b/drivers/of/of_display_timings.c
>
> > +static int parse_property(struct device_node *np, char *name,
> > + struct timing_entry *result)
>
> > + if (cells = 1)
> > + ret = of_property_read_u32_array(np, name, &result->typ, cells);
>
> Should that branch not just set result->min/max to typ as well?
> Presumably it'd prevent any code that interprets struct timing_entry
> from having to check if those values were 0 or not?
>
Yes, okay.
> > + else if (cells = 3)
> > + ret = of_property_read_u32_array(np, name, &result->min, cells);
>
> > +struct display_timings *of_get_display_timing_list(struct device_node *np)
>
> > + entry = of_parse_phandle(timings_np, "default-timing", 0);
> > +
> > + if (!entry) {
> > + pr_info("%s: no default-timing specified\n", __func__);
> > + entry = of_find_node_by_name(np, "timing");
>
> I don't think you want to require the node have an explicit name; I
> don't recall the DT binding documentation making that a requirement.
> Instead, can't you either just leave the default unset, or pick the
> first DT child node, irrespective of name?
>
Ah, yes. I will set the first child then.
> > + if (!entry) {
> > + pr_info("%s: no timing specifications given\n", __func__);
> > + return disp;
> > + }
>
> The DT bindings don't state that it's mandatory to have some timing
> specified, although I agree that it makes sense in practice.
>
The definition of timings in dt doesn't make much sense, when there
are no timings defined, does it ? Maybe I should state the obvious
in the binding, just in case.
> > + for_each_child_of_node(timings_np, entry) {
> > + struct signal_timing *st;
> > +
> > + st = of_get_display_timing(entry);
> > +
> > + if (!st)
> > + continue;
>
> I wonder if that shouldn't be an error?
>
In the sense of a pr_err not a -EINVAL I presume?! It is a little bit quiet in
case of a faulty spec, that is right.
> > + if (strcmp(default_timing, entry->full_name) = 0)
> > + disp->default_timing = disp->num_timings;
>
> Hmm. Why not compare the node pointers rather than the name? Also, if
> the parsing failed, then this can lead to default_timing being
> uninitialized anyway...
>
.. and we don't want that. Will fix.
> > + disp->timings[disp->num_timings] = st;
> > + disp->num_timings++;
> > + }
>
> > + if (disp->num_timings >= 0)
> > + pr_info("%s: got %d timings. Using timing #%d as default\n", __func__,
> > + disp->num_timings , disp->default_timing + 1);
> > + else
> > + pr_info("%s: no timings specified\n", __func__);
>
> The message in the else clause is not necessarily true; there may have
> been some specified, but they just couldn't be parsed.
>
Right.
> > +int of_display_timings_exists(struct device_node *np)
> > +{
> > + struct device_node *timings_np;
> > + struct device_node *default_np;
> > +
> > + if (!np)
> > + return -EINVAL;
> > +
> > + timings_np = of_parse_phandle(np, "display-timings", 0);
> > +
> > + if (!timings_np)
> > + return -EINVAL;
> > +
> > + default_np = of_parse_phandle(np, "default-timing", 0);
> > +
> > + if (default_np)
> > + return 0;
>
> If this function checks that a default-timing property exists, shouldn't
> the function be named of_display_default_timing_exists()?
>
Maybe I should split this in two functions.
Thanks for your feedback.
Regards,
Steffen
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply
* Re: [PATCH 2/2 v6] of: add generic videomode description
From: Steffen Trumtrar @ 2012-10-05 15:51 UTC (permalink / raw)
To: Stephen Warren
Cc: devicetree-discuss, linux-fbdev, dri-devel, Tomi Valkeinen,
Laurent Pinchart, linux-media
In-Reply-To: <506DDA94.1090702@wwwdotorg.org>
On Thu, Oct 04, 2012 at 12:51:00PM -0600, Stephen Warren wrote:
> On 10/04/2012 11:59 AM, Steffen Trumtrar wrote:
> > Get videomode from devicetree in a format appropriate for the
> > backend. drm_display_mode and fb_videomode are supported atm.
> > Uses the display signal timings from of_display_timings
>
> > +++ b/drivers/of/of_videomode.c
>
> > +int videomode_from_timing(struct display_timings *disp, struct videomode *vm,
>
> > + st = display_timings_get(disp, index);
> > +
> > + if (!st) {
>
> It's a little odd to leave a blank line between those two lines.
Hm, well okay. That can be remedied
>
> Only half of the code in this file seems OF-related; the routines to
> convert a timing to a videomode or drm display mode seem like they'd be
> useful outside device tree, so I wonder if putting them into
> of_videomode.c is the correct thing to do. Still, it's probably not a
> big deal.
>
I am not sure, what the appropriate way to do this is. I can split it up (again).
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply
* [PATCH 12/16] video: mark nuc900fb_map_video_memory as __devinit
From: Arnd Bergmann @ 2012-10-05 14:55 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1349448930-23976-1-git-send-email-arnd@arndb.de>
nuc900fb_map_video_memory is called by an devinit function
that may be called at run-time, but the function itself is
marked __init and will be discarded after boot.
To avoid calling into a function that may have been overwritten,
mark nuc900fb_map_video_memory itself as __devinit.
Without this patch, building nuc950_defconfig results in:
WARNING: drivers/video/built-in.o(.devinit.text+0x26c): Section mismatch in reference from the function nuc900fb_probe() to the function .init.text:nuc900fb_map_video_memory()
The function __devinit nuc900fb_probe() references
a function __init nuc900fb_map_video_memory().
If nuc900fb_map_video_memory is only used by nuc900fb_probe then
annotate nuc900fb_map_video_memory with a matching annotation.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Wan ZongShun <mcuos.com@gmail.com>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: linux-fbdev@vger.kernel.org
---
drivers/video/nuc900fb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/nuc900fb.c b/drivers/video/nuc900fb.c
index e10f551..b31b12b 100644
--- a/drivers/video/nuc900fb.c
+++ b/drivers/video/nuc900fb.c
@@ -387,7 +387,7 @@ static int nuc900fb_init_registers(struct fb_info *info)
* The buffer should be a non-cached, non-buffered, memory region
* to allow palette and pixel writes without flushing the cache.
*/
-static int __init nuc900fb_map_video_memory(struct fb_info *info)
+static int __devinit nuc900fb_map_video_memory(struct fb_info *info)
{
struct nuc900fb_info *fbi = info->par;
dma_addr_t map_dma;
--
1.7.10
^ permalink raw reply related
* [PATCH 2/2] da8xx-fb: cleanup LCDC configurations
From: Manjunathappa, Prakash @ 2012-10-05 14:03 UTC (permalink / raw)
To: linux-fbdev
Configure below LCDC configurations to optimal values, also have an
option configure these optional parameters for platform.
1) AC bias configuration: Required only for passive panels
2) Dma_burst_size:
3) FIFO_DMA_DELAY:
4) FIFO threshold: Does not apply for da830 LCDC.
Patch is verified for 16bpp and 24bpp configurations on da830, da850 and am335x
EVMs.
Signed-off-by: Manjunathappa, Prakash <prakash.pm@ti.com>
---
arch/arm/mach-davinci/devices-da8xx.c | 27 +++--------------------
drivers/video/da8xx-fb.c | 37 +++++++++++---------------------
include/video/da8xx-fb.h | 22 +------------------
3 files changed, 18 insertions(+), 68 deletions(-)
diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c
index 12a47cd..eb0a1ec 100644
--- a/arch/arm/mach-davinci/devices-da8xx.c
+++ b/arch/arm/mach-davinci/devices-da8xx.c
@@ -524,29 +524,9 @@ void __init da8xx_register_mcasp(int id, struct snd_platform_data *pdata)
}
}
-static const struct display_panel disp_panel = {
- QVGA,
- 16,
- 16,
- COLOR_ACTIVE,
-};
-
static struct lcd_ctrl_config lcd_cfg = {
- &disp_panel,
- .ac_bias = 255,
- .ac_bias_intrpt = 0,
- .dma_burst_sz = 16,
+ .panel_shade = COLOR_ACTIVE,
.bpp = 16,
- .fdd = 255,
- .tft_alt_mode = 0,
- .stn_565_mode = 0,
- .mono_8bit_mode = 0,
- .invert_line_clock = 1,
- .invert_frm_clock = 1,
- .sync_edge = 0,
- .sync_ctrl = 1,
- .raster_order = 0,
- .fifo_th = 6,
};
struct da8xx_lcdc_platform_data sharp_lcd035q3dg01_pdata = {
@@ -562,7 +542,8 @@ struct da8xx_lcdc_platform_data sharp_lcd035q3dg01_pdata = {
.lower_margin = 2,
.hsync_len = 0,
.vsync_len = 0,
- .sync = FB_SYNC_CLK_INVERT,
+ .sync = FB_SYNC_CLK_INVERT |
+ FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
.flag = 0,
},
};
@@ -580,7 +561,7 @@ struct da8xx_lcdc_platform_data sharp_lk043t1dg01_pdata = {
.lower_margin = 2,
.hsync_len = 41,
.vsync_len = 10,
- .sync = 0,
+ .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
.flag = 0,
},
};
diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c
index bacf82b..36af88b 100644
--- a/drivers/video/da8xx-fb.c
+++ b/drivers/video/da8xx-fb.c
@@ -339,10 +339,9 @@ static int lcd_cfg_dma(int burst_size, int fifo_th)
reg |= LCD_DMA_BURST_SIZE(LCD_DMA_BURST_8);
break;
case 16:
+ default: /* Configuring for highest burst */
reg |= LCD_DMA_BURST_SIZE(LCD_DMA_BURST_16);
break;
- default:
- return -EINVAL;
}
reg |= (fifo_th << 8);
@@ -387,7 +386,8 @@ static void lcd_cfg_vertical_sync(int back_porch, int pulse_width,
lcdc_write(reg, LCD_RASTER_TIMING_1_REG);
}
-static int lcd_cfg_display(const struct lcd_ctrl_config *cfg)
+static int lcd_cfg_display(const struct lcd_ctrl_config *cfg,
+ struct fb_videomode *panel)
{
u32 reg;
u32 reg_int;
@@ -396,7 +396,7 @@ static int lcd_cfg_display(const struct lcd_ctrl_config *cfg)
LCD_MONO_8BIT_MODE |
LCD_MONOCHROME_MODE);
- switch (cfg->p_disp_panel->panel_shade) {
+ switch (cfg->panel_shade) {
case MONOCHROME:
reg |= LCD_MONOCHROME_MODE;
if (cfg->mono_8bit_mode)
@@ -409,7 +409,9 @@ static int lcd_cfg_display(const struct lcd_ctrl_config *cfg)
break;
case COLOR_PASSIVE:
- if (cfg->stn_565_mode)
+ /* AC bias applicable only for Pasive panels */
+ lcd_cfg_ac_bias(cfg->ac_bias, cfg->ac_bias_intrpt);
+ if (cfg->bpp = 12 && cfg->stn_565_mode)
reg |= LCD_STN_565_ENABLE;
break;
@@ -430,22 +432,19 @@ static int lcd_cfg_display(const struct lcd_ctrl_config *cfg)
reg = lcdc_read(LCD_RASTER_TIMING_2_REG);
- if (cfg->sync_ctrl)
- reg |= LCD_SYNC_CTRL;
- else
- reg &= ~LCD_SYNC_CTRL;
+ reg |= LCD_SYNC_CTRL;
if (cfg->sync_edge)
reg |= LCD_SYNC_EDGE;
else
reg &= ~LCD_SYNC_EDGE;
- if (cfg->invert_line_clock)
+ if (panel->sync & FB_SYNC_HOR_HIGH_ACT)
reg |= LCD_INVERT_LINE_CLOCK;
else
reg &= ~LCD_INVERT_LINE_CLOCK;
- if (cfg->invert_frm_clock)
+ if (panel->sync & FB_SYNC_VERT_HIGH_ACT)
reg |= LCD_INVERT_FRAME_CLOCK;
else
reg &= ~LCD_INVERT_FRAME_CLOCK;
@@ -690,9 +689,6 @@ static int lcd_init(struct da8xx_fb_par *par, const struct lcd_ctrl_config *cfg,
if (ret < 0)
return ret;
- /* Configure the AC bias properties. */
- lcd_cfg_ac_bias(cfg->ac_bias, cfg->ac_bias_intrpt);
-
/* Configure the vertical and horizontal sync properties. */
lcd_cfg_vertical_sync(panel->lower_margin, panel->vsync_len,
panel->upper_margin);
@@ -700,18 +696,12 @@ static int lcd_init(struct da8xx_fb_par *par, const struct lcd_ctrl_config *cfg,
panel->left_margin);
/* Configure for disply */
- ret = lcd_cfg_display(cfg);
+ ret = lcd_cfg_display(cfg, panel);
if (ret < 0)
return ret;
- if (QVGA != cfg->p_disp_panel->panel_type)
- return -EINVAL;
+ bpp = cfg->bpp;
- if (cfg->bpp <= cfg->p_disp_panel->max_bpp &&
- cfg->bpp >= cfg->p_disp_panel->min_bpp)
- bpp = cfg->bpp;
- else
- bpp = cfg->p_disp_panel->max_bpp;
if (bpp = 12)
bpp = 16;
ret = lcd_cfg_frame_buffer(par, (unsigned int)panel->xres,
@@ -1323,8 +1313,7 @@ static int __devinit fb_probe(struct platform_device *device)
da8xx_fb_var.yres = lcd_panel_info->yres;
da8xx_fb_var.yres_virtual = lcd_panel_info->yres * LCD_NUM_BUFFERS;
- da8xx_fb_var.grayscale - lcd_cfg->p_disp_panel->panel_shade = MONOCHROME ? 1 : 0;
+ da8xx_fb_var.grayscale = lcd_cfg->panel_shade = MONOCHROME ? 1 : 0;
da8xx_fb_var.bits_per_pixel = lcd_cfg->bpp;
da8xx_fb_var.hsync_len = lcd_panel_info->hsync_len;
diff --git a/include/video/da8xx-fb.h b/include/video/da8xx-fb.h
index a6796ff..3eada34 100644
--- a/include/video/da8xx-fb.h
+++ b/include/video/da8xx-fb.h
@@ -14,10 +14,6 @@
#include <linux/fb.h>
-enum panel_type {
- QVGA = 0
-};
-
enum panel_shade {
MONOCHROME = 0,
COLOR_ACTIVE,
@@ -29,13 +25,6 @@ enum raster_load_mode {
LOAD_PALETTE,
};
-struct display_panel {
- enum panel_type panel_type; /* QVGA */
- int max_bpp;
- int min_bpp;
- enum panel_shade panel_shade;
-};
-
struct da8xx_lcdc_platform_data {
void *controller_data;
void (*panel_power_ctrl)(int);
@@ -43,7 +32,7 @@ struct da8xx_lcdc_platform_data {
};
struct lcd_ctrl_config {
- const struct display_panel *p_disp_panel;
+ enum panel_shade panel_shade;
/* AC Bias Pin Frequency */
int ac_bias;
@@ -69,18 +58,9 @@ struct lcd_ctrl_config {
/* Mono 8-bit Mode: 1Ð-D7 or 0Ð-D3 */
unsigned char mono_8bit_mode;
- /* Invert line clock */
- unsigned char invert_line_clock;
-
- /* Invert frame clock */
- unsigned char invert_frm_clock;
-
/* Horizontal and Vertical Sync Edge: 0=rising 1úlling */
unsigned char sync_edge;
- /* Horizontal and Vertical Sync: Control: 0=ignore */
- unsigned char sync_ctrl;
-
/* Raster Data Order Select: 1=Most-to-least 0=Least-to-most */
unsigned char raster_order;
--
1.7.0.4
^ permalink raw reply related
* [PATCH 1/2] da8xx-fb: move panel information from driver to platform file
From: Manjunathappa, Prakash @ 2012-10-05 14:03 UTC (permalink / raw)
To: linux-fbdev
Moving panel information from driver to platform file, patch also made
compliant to fb_videomode data.
Signed-off-by: Manjunathappa, Prakash <prakash.pm@ti.com>
---
arch/arm/mach-davinci/devices-da8xx.c | 32 +++++++-
drivers/video/da8xx-fb.c | 127 ++++++++-------------------------
include/video/da8xx-fb.h | 8 ++-
3 files changed, 64 insertions(+), 103 deletions(-)
diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c
index 783eab6..12a47cd 100644
--- a/arch/arm/mach-davinci/devices-da8xx.c
+++ b/arch/arm/mach-davinci/devices-da8xx.c
@@ -550,15 +550,39 @@ static struct lcd_ctrl_config lcd_cfg = {
};
struct da8xx_lcdc_platform_data sharp_lcd035q3dg01_pdata = {
- .manu_name = "sharp",
.controller_data = &lcd_cfg,
- .type = "Sharp_LCD035Q3DG01",
+ .fb_videomode = {
+ .name = "Sharp_LCD035Q3DG01",
+ .xres = 320,
+ .yres = 240,
+ .pixclock = 4608000,
+ .left_margin = 6,
+ .right_margin = 8,
+ .upper_margin = 2,
+ .lower_margin = 2,
+ .hsync_len = 0,
+ .vsync_len = 0,
+ .sync = FB_SYNC_CLK_INVERT,
+ .flag = 0,
+ },
};
struct da8xx_lcdc_platform_data sharp_lk043t1dg01_pdata = {
- .manu_name = "sharp",
.controller_data = &lcd_cfg,
- .type = "Sharp_LK043T1DG01",
+ .fb_videomode = {
+ .name = "Sharp_LK043T1DG01",
+ .xres = 480,
+ .yres = 272,
+ .pixclock = 7833600,
+ .left_margin = 2,
+ .right_margin = 2,
+ .upper_margin = 2,
+ .lower_margin = 2,
+ .hsync_len = 41,
+ .vsync_len = 10,
+ .sync = 0,
+ .flag = 0,
+ },
};
static struct resource da8xx_lcdc_resources[] = {
diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c
index 65a11ef..bacf82b 100644
--- a/drivers/video/da8xx-fb.c
+++ b/drivers/video/da8xx-fb.c
@@ -21,7 +21,6 @@
*/
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/fb.h>
#include <linux/dma-mapping.h>
#include <linux/device.h>
#include <linux/platform_device.h>
@@ -213,65 +212,6 @@ static struct fb_fix_screeninfo da8xx_fb_fix __devinitdata = {
.accel = FB_ACCEL_NONE
};
-struct da8xx_panel {
- const char name[25]; /* Full name <vendor>_<model> */
- unsigned short width;
- unsigned short height;
- int hfp; /* Horizontal front porch */
- int hbp; /* Horizontal back porch */
- int hsw; /* Horizontal Sync Pulse Width */
- int vfp; /* Vertical front porch */
- int vbp; /* Vertical back porch */
- int vsw; /* Vertical Sync Pulse Width */
- unsigned int pxl_clk; /* Pixel clock */
- unsigned char invert_pxl_clk; /* Invert Pixel clock */
-};
-
-static struct da8xx_panel known_lcd_panels[] = {
- /* Sharp LCD035Q3DG01 */
- [0] = {
- .name = "Sharp_LCD035Q3DG01",
- .width = 320,
- .height = 240,
- .hfp = 8,
- .hbp = 6,
- .hsw = 0,
- .vfp = 2,
- .vbp = 2,
- .vsw = 0,
- .pxl_clk = 4608000,
- .invert_pxl_clk = 1,
- },
- /* Sharp LK043T1DG01 */
- [1] = {
- .name = "Sharp_LK043T1DG01",
- .width = 480,
- .height = 272,
- .hfp = 2,
- .hbp = 2,
- .hsw = 41,
- .vfp = 2,
- .vbp = 2,
- .vsw = 10,
- .pxl_clk = 7833600,
- .invert_pxl_clk = 0,
- },
- [2] = {
- /* Hitachi SP10Q010 */
- .name = "SP10Q010",
- .width = 320,
- .height = 240,
- .hfp = 10,
- .hbp = 10,
- .hsw = 10,
- .vfp = 10,
- .vbp = 10,
- .vsw = 10,
- .pxl_clk = 7833600,
- .invert_pxl_clk = 0,
- },
-};
-
/* Enable the Raster Engine of the LCD Controller */
static inline void lcd_enable_raster(void)
{
@@ -728,7 +668,7 @@ static void lcd_calc_clk_divider(struct da8xx_fb_par *par)
}
static int lcd_init(struct da8xx_fb_par *par, const struct lcd_ctrl_config *cfg,
- struct da8xx_panel *panel)
+ struct fb_videomode *panel)
{
u32 bpp;
int ret = 0;
@@ -738,7 +678,7 @@ static int lcd_init(struct da8xx_fb_par *par, const struct lcd_ctrl_config *cfg,
/* Calculate the divider */
lcd_calc_clk_divider(par);
- if (panel->invert_pxl_clk)
+ if (panel->sync & FB_SYNC_CLK_INVERT)
lcdc_write((lcdc_read(LCD_RASTER_TIMING_2_REG) |
LCD_INVERT_PIXEL_CLOCK), LCD_RASTER_TIMING_2_REG);
else
@@ -754,8 +694,10 @@ static int lcd_init(struct da8xx_fb_par *par, const struct lcd_ctrl_config *cfg,
lcd_cfg_ac_bias(cfg->ac_bias, cfg->ac_bias_intrpt);
/* Configure the vertical and horizontal sync properties. */
- lcd_cfg_vertical_sync(panel->vbp, panel->vsw, panel->vfp);
- lcd_cfg_horizontal_sync(panel->hbp, panel->hsw, panel->hfp);
+ lcd_cfg_vertical_sync(panel->lower_margin, panel->vsync_len,
+ panel->upper_margin);
+ lcd_cfg_horizontal_sync(panel->right_margin, panel->hsync_len,
+ panel->left_margin);
/* Configure for disply */
ret = lcd_cfg_display(cfg);
@@ -772,8 +714,8 @@ static int lcd_init(struct da8xx_fb_par *par, const struct lcd_ctrl_config *cfg,
bpp = cfg->p_disp_panel->max_bpp;
if (bpp = 12)
bpp = 16;
- ret = lcd_cfg_frame_buffer(par, (unsigned int)panel->width,
- (unsigned int)panel->height, bpp,
+ ret = lcd_cfg_frame_buffer(par, (unsigned int)panel->xres,
+ (unsigned int)panel->yres, bpp,
cfg->raster_order);
if (ret < 0)
return ret;
@@ -1235,12 +1177,12 @@ static int __devinit fb_probe(struct platform_device *device)
struct da8xx_lcdc_platform_data *fb_pdata device->dev.platform_data;
struct lcd_ctrl_config *lcd_cfg;
- struct da8xx_panel *lcdc_info;
+ struct fb_videomode *lcd_panel_info;
struct fb_info *da8xx_fb_info;
struct clk *fb_clk = NULL;
struct da8xx_fb_par *par;
resource_size_t len;
- int ret, i;
+ int ret;
unsigned long ulcm;
if (fb_pdata = NULL) {
@@ -1293,20 +1235,10 @@ static int __devinit fb_probe(struct platform_device *device)
break;
}
- for (i = 0, lcdc_info = known_lcd_panels;
- i < ARRAY_SIZE(known_lcd_panels);
- i++, lcdc_info++) {
- if (strcmp(fb_pdata->type, lcdc_info->name) = 0)
- break;
- }
+ lcd_panel_info = &fb_pdata->fb_videomode;
- if (i = ARRAY_SIZE(known_lcd_panels)) {
- dev_err(&device->dev, "GLCD: No valid panel found\n");
- ret = -ENODEV;
- goto err_pm_runtime_disable;
- } else
- dev_info(&device->dev, "GLCD: Found %s panel\n",
- fb_pdata->type);
+ dev_info(&device->dev, "Configuring GLCD %s panel\n",
+ lcd_panel_info->name);
lcd_cfg = (struct lcd_ctrl_config *)fb_pdata->controller_data;
@@ -1323,21 +1255,22 @@ static int __devinit fb_probe(struct platform_device *device)
#ifdef CONFIG_CPU_FREQ
par->lcd_fck_rate = clk_get_rate(fb_clk);
#endif
- par->pxl_clk = lcdc_info->pxl_clk;
+ par->pxl_clk = lcd_panel_info->pixclock;
if (fb_pdata->panel_power_ctrl) {
par->panel_power_ctrl = fb_pdata->panel_power_ctrl;
par->panel_power_ctrl(1);
}
- if (lcd_init(par, lcd_cfg, lcdc_info) < 0) {
+ if (lcd_init(par, lcd_cfg, lcd_panel_info) < 0) {
dev_err(&device->dev, "lcd_init failed\n");
ret = -EFAULT;
goto err_release_fb;
}
/* allocate frame buffer */
- par->vram_size = lcdc_info->width * lcdc_info->height * lcd_cfg->bpp;
- ulcm = lcm((lcdc_info->width * lcd_cfg->bpp)/8, PAGE_SIZE);
+ par->vram_size + lcd_panel_info->xres * lcd_panel_info->yres * lcd_cfg->bpp;
+ ulcm = lcm((lcd_panel_info->xres * lcd_cfg->bpp)/8, PAGE_SIZE);
par->vram_size = roundup(par->vram_size/8, ulcm);
par->vram_size = par->vram_size * LCD_NUM_BUFFERS;
@@ -1355,10 +1288,10 @@ static int __devinit fb_probe(struct platform_device *device)
da8xx_fb_info->screen_base = (char __iomem *) par->vram_virt;
da8xx_fb_fix.smem_start = par->vram_phys;
da8xx_fb_fix.smem_len = par->vram_size;
- da8xx_fb_fix.line_length = (lcdc_info->width * lcd_cfg->bpp) / 8;
+ da8xx_fb_fix.line_length = (lcd_panel_info->xres * lcd_cfg->bpp) / 8;
par->dma_start = par->vram_phys;
- par->dma_end = par->dma_start + lcdc_info->height *
+ par->dma_end = par->dma_start + lcd_panel_info->yres *
da8xx_fb_fix.line_length - 1;
/* allocate palette buffer */
@@ -1384,22 +1317,22 @@ static int __devinit fb_probe(struct platform_device *device)
/* Initialize par */
da8xx_fb_info->var.bits_per_pixel = lcd_cfg->bpp;
- da8xx_fb_var.xres = lcdc_info->width;
- da8xx_fb_var.xres_virtual = lcdc_info->width;
+ da8xx_fb_var.xres = lcd_panel_info->xres;
+ da8xx_fb_var.xres_virtual = lcd_panel_info->yres;
- da8xx_fb_var.yres = lcdc_info->height;
- da8xx_fb_var.yres_virtual = lcdc_info->height * LCD_NUM_BUFFERS;
+ da8xx_fb_var.yres = lcd_panel_info->yres;
+ da8xx_fb_var.yres_virtual = lcd_panel_info->yres * LCD_NUM_BUFFERS;
da8xx_fb_var.grayscale lcd_cfg->p_disp_panel->panel_shade = MONOCHROME ? 1 : 0;
da8xx_fb_var.bits_per_pixel = lcd_cfg->bpp;
- da8xx_fb_var.hsync_len = lcdc_info->hsw;
- da8xx_fb_var.vsync_len = lcdc_info->vsw;
- da8xx_fb_var.right_margin = lcdc_info->hfp;
- da8xx_fb_var.left_margin = lcdc_info->hbp;
- da8xx_fb_var.lower_margin = lcdc_info->vfp;
- da8xx_fb_var.upper_margin = lcdc_info->vbp;
+ da8xx_fb_var.hsync_len = lcd_panel_info->hsync_len;
+ da8xx_fb_var.vsync_len = lcd_panel_info->vsync_len;
+ da8xx_fb_var.right_margin = lcd_panel_info->left_margin;
+ da8xx_fb_var.left_margin = lcd_panel_info->right_margin;
+ da8xx_fb_var.lower_margin = lcd_panel_info->upper_margin;
+ da8xx_fb_var.upper_margin = lcd_panel_info->lower_margin;
da8xx_fb_var.pixclock = da8xxfb_pixel_clk_period(par);
/* Initialize fbinfo */
diff --git a/include/video/da8xx-fb.h b/include/video/da8xx-fb.h
index 5a0e4f9..a6796ff 100644
--- a/include/video/da8xx-fb.h
+++ b/include/video/da8xx-fb.h
@@ -12,6 +12,8 @@
#ifndef DA8XX_FB_H
#define DA8XX_FB_H
+#include <linux/fb.h>
+
enum panel_type {
QVGA = 0
};
@@ -35,10 +37,9 @@ struct display_panel {
};
struct da8xx_lcdc_platform_data {
- const char manu_name[10];
void *controller_data;
- const char type[25];
void (*panel_power_ctrl)(int);
+ struct fb_videomode fb_videomode;
};
struct lcd_ctrl_config {
@@ -103,5 +104,8 @@ struct lcd_sync_arg {
#define FBIPUT_HSYNC _IOW('F', 9, int)
#define FBIPUT_VSYNC _IOW('F', 10, int)
+/* Proprietary FB_SYNC_ flags */
+#define FB_SYNC_CLK_INVERT 0x40000000
+
#endif /* ifndef DA8XX_FB_H */
--
1.7.0.4
^ permalink raw reply related
* [PATCH 0/2] da8xx-fb LCDC driver cleanup
From: Manjunathappa, Prakash @ 2012-10-05 14:03 UTC (permalink / raw)
To: linux-fbdev
This patch series clean up driver as it is necessary for DT migration
1) Moves panel information from driver to platform file.
2) Panel independent LCDC configuration are set to optimal values.
Manjunathappa, Prakash (2):
da8xx-fb: move panel information from driver to platform file
da8xx-fb: cleanup LCDC configurations
arch/arm/mach-davinci/devices-da8xx.c | 55 ++++++-----
drivers/video/da8xx-fb.c | 164 +++++++++------------------------
include/video/da8xx-fb.h | 28 +-----
3 files changed, 79 insertions(+), 168 deletions(-)
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox