* [PATCH v12 0/6] of: add display helper
@ 2012-11-20 15:54 Steffen Trumtrar
2012-11-20 15:54 ` [PATCH v12 1/6] video: add display_timing and videomode Steffen Trumtrar
` (5 more replies)
0 siblings, 6 replies; 39+ messages in thread
From: Steffen Trumtrar @ 2012-11-20 15:54 UTC (permalink / raw)
To: devicetree-discuss
Cc: Steffen Trumtrar, Rob Herring, linux-fbdev, dri-devel,
Laurent Pinchart, Thierry Reding, Guennady Liakhovetski,
linux-media, Tomi Valkeinen, Stephen Warren, kernel,
Florian Tobias Schandinat, David Airlie
Hi!
Changes since v11:
- make pointers const where applicable
- add reviewed-by Laurent Pinchart
Regards,
Steffen
Steffen Trumtrar (6):
video: add display_timing and videomode
video: add of helper for videomode
fbmon: add videomode helpers
fbmon: add of_videomode helpers
drm_modes: add videomode helpers
drm_modes: add of_videomode helpers
.../devicetree/bindings/video/display-timings.txt | 107 ++++++++++
drivers/gpu/drm/drm_modes.c | 70 +++++++
drivers/video/Kconfig | 19 ++
drivers/video/Makefile | 4 +
drivers/video/display_timing.c | 24 +++
drivers/video/fbmon.c | 86 ++++++++
drivers/video/of_display_timing.c | 216 ++++++++++++++++++++
drivers/video/of_videomode.c | 48 +++++
drivers/video/videomode.c | 46 +++++
include/drm/drmP.h | 12 ++
include/linux/display_timing.h | 70 +++++++
include/linux/fb.h | 13 ++
include/linux/of_display_timings.h | 20 ++
include/linux/of_videomode.h | 18 ++
include/linux/videomode.h | 40 ++++
15 files changed, 793 insertions(+)
create mode 100644 Documentation/devicetree/bindings/video/display-timings.txt
create mode 100644 drivers/video/display_timing.c
create mode 100644 drivers/video/of_display_timing.c
create mode 100644 drivers/video/of_videomode.c
create mode 100644 drivers/video/videomode.c
create mode 100644 include/linux/display_timing.h
create mode 100644 include/linux/of_display_timings.h
create mode 100644 include/linux/of_videomode.h
create mode 100644 include/linux/videomode.h
--
1.7.10.4
^ permalink raw reply [flat|nested] 39+ messages in thread* [PATCH v12 1/6] video: add display_timing and videomode 2012-11-20 15:54 [PATCH v12 0/6] of: add display helper Steffen Trumtrar @ 2012-11-20 15:54 ` Steffen Trumtrar [not found] ` <1353426896-6045-2-git-send-email-s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2012-11-20 15:54 ` [PATCH v12 2/6] video: add of helper for videomode Steffen Trumtrar ` (4 subsequent siblings) 5 siblings, 1 reply; 39+ messages in thread From: Steffen Trumtrar @ 2012-11-20 15:54 UTC (permalink / raw) To: devicetree-discuss Cc: Steffen Trumtrar, Rob Herring, linux-fbdev, dri-devel, Laurent Pinchart, Thierry Reding, Guennady Liakhovetski, linux-media, Tomi Valkeinen, Stephen Warren, kernel, Florian Tobias Schandinat, David Airlie Add display_timing structure and the according helper functions. This allows the description of a display via its supported timing parameters. Every timing parameter can be specified as a single value or a range <min typ max>. Also, add helper functions to convert from display timings to a generic videomode structure. This videomode can then be converted to the corresponding subsystem mode representation (e.g. fb_videomode). Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de> Acked-by: Thierry Reding <thierry.reding@avionic-design.de> Tested-by: Thierry Reding <thierry.reding@avionic-design.de> Tested-by: Philipp Zabel <p.zabel@pengutronix.de> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- drivers/video/Kconfig | 6 ++++ drivers/video/Makefile | 2 ++ drivers/video/display_timing.c | 24 ++++++++++++++ drivers/video/videomode.c | 46 ++++++++++++++++++++++++++ include/linux/display_timing.h | 70 ++++++++++++++++++++++++++++++++++++++++ include/linux/videomode.h | 40 +++++++++++++++++++++++ 6 files changed, 188 insertions(+) create mode 100644 drivers/video/display_timing.c create mode 100644 drivers/video/videomode.c create mode 100644 include/linux/display_timing.h create mode 100644 include/linux/videomode.h diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index d08d799..2a23b18 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -33,6 +33,12 @@ config VIDEO_OUTPUT_CONTROL This framework adds support for low-level control of the video output switch. +config DISPLAY_TIMING + bool + +config VIDEOMODE + bool + menuconfig FB tristate "Support for frame buffer devices" ---help--- diff --git a/drivers/video/Makefile b/drivers/video/Makefile index 23e948e..fc30439 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -167,3 +167,5 @@ obj-$(CONFIG_FB_VIRTUAL) += vfb.o #video output switch sysfs driver obj-$(CONFIG_VIDEO_OUTPUT_CONTROL) += output.o +obj-$(CONFIG_DISPLAY_TIMING) += display_timing.o +obj-$(CONFIG_VIDEOMODE) += videomode.o diff --git a/drivers/video/display_timing.c b/drivers/video/display_timing.c new file mode 100644 index 0000000..ac9bbbc --- /dev/null +++ b/drivers/video/display_timing.c @@ -0,0 +1,24 @@ +/* + * generic display timing functions + * + * Copyright (c) 2012 Steffen Trumtrar <s.trumtrar@pengutronix.de>, Pengutronix + * + * This file is released under the GPLv2 + */ + +#include <linux/display_timing.h> +#include <linux/export.h> +#include <linux/slab.h> + +void display_timings_release(struct display_timings *disp) +{ + if (disp->timings) { + unsigned int i; + + for (i = 0; i < disp->num_timings; i++) + kfree(disp->timings[i]); + kfree(disp->timings); + } + kfree(disp); +} +EXPORT_SYMBOL_GPL(display_timings_release); diff --git a/drivers/video/videomode.c b/drivers/video/videomode.c new file mode 100644 index 0000000..e24f879 --- /dev/null +++ b/drivers/video/videomode.c @@ -0,0 +1,46 @@ +/* + * generic display timing functions + * + * Copyright (c) 2012 Steffen Trumtrar <s.trumtrar@pengutronix.de>, Pengutronix + * + * This file is released under the GPLv2 + */ + +#include <linux/export.h> +#include <linux/errno.h> +#include <linux/display_timing.h> +#include <linux/kernel.h> +#include <linux/videomode.h> + +int videomode_from_timing(const struct display_timings *disp, + struct videomode *vm, unsigned int index) +{ + struct display_timing *dt; + + dt = display_timings_get(disp, index); + if (!dt) + return -EINVAL; + + vm->pixelclock = display_timing_get_value(&dt->pixelclock, 0); + vm->hactive = display_timing_get_value(&dt->hactive, 0); + vm->hfront_porch = display_timing_get_value(&dt->hfront_porch, 0); + vm->hback_porch = display_timing_get_value(&dt->hback_porch, 0); + vm->hsync_len = display_timing_get_value(&dt->hsync_len, 0); + + vm->vactive = display_timing_get_value(&dt->vactive, 0); + vm->vfront_porch = display_timing_get_value(&dt->vfront_porch, 0); + vm->vback_porch = display_timing_get_value(&dt->vback_porch, 0); + vm->vsync_len = display_timing_get_value(&dt->vsync_len, 0); + + vm->vah = dt->vsync_pol_active; + vm->hah = dt->hsync_pol_active; + vm->de = dt->de_pol_active; + vm->pixelclk_pol = dt->pixelclk_pol; + + vm->interlaced = dt->interlaced; + vm->doublescan = dt->doublescan; + + return 0; +} + +EXPORT_SYMBOL_GPL(videomode_from_timing); diff --git a/include/linux/display_timing.h b/include/linux/display_timing.h new file mode 100644 index 0000000..d5bf03f --- /dev/null +++ b/include/linux/display_timing.h @@ -0,0 +1,70 @@ +/* + * Copyright 2012 Steffen Trumtrar <s.trumtrar@pengutronix.de> + * + * description of display timings + * + * This file is released under the GPLv2 + */ + +#ifndef __LINUX_DISPLAY_TIMINGS_H +#define __LINUX_DISPLAY_TIMINGS_H + +#include <linux/types.h> + +struct timing_entry { + u32 min; + u32 typ; + u32 max; +}; + +struct display_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; + + unsigned int vsync_pol_active; + unsigned int hsync_pol_active; + unsigned int de_pol_active; + unsigned int pixelclk_pol; + bool interlaced; + bool doublescan; +}; + +struct display_timings { + unsigned int num_timings; + unsigned int native_mode; + + struct display_timing **timings; +}; + +/* + * placeholder function until ranges are really needed + * the index parameter should then be used to select one of [min typ max] + */ +static inline u32 display_timing_get_value(const struct timing_entry *te, + unsigned int index) +{ + return te->typ; +} + +static inline struct display_timing *display_timings_get(const struct + display_timings *disp, + unsigned int index) +{ + if (disp->num_timings > index) + return disp->timings[index]; + else + return NULL; +} + +void display_timings_release(struct display_timings *disp); + +#endif diff --git a/include/linux/videomode.h b/include/linux/videomode.h new file mode 100644 index 0000000..5d3e796 --- /dev/null +++ b/include/linux/videomode.h @@ -0,0 +1,40 @@ +/* + * 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 <linux/display_timing.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; + + u32 hah; + u32 vah; + u32 de; + u32 pixelclk_pol; + + bool interlaced; + bool doublescan; +}; + +int videomode_from_timing(const struct display_timings *disp, + struct videomode *vm, unsigned int index); + +#endif -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 39+ messages in thread
[parent not found: <1353426896-6045-2-git-send-email-s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>]
* Re: [PATCH v12 1/6] video: add display_timing and videomode [not found] ` <1353426896-6045-2-git-send-email-s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> @ 2012-11-21 11:37 ` Tomi Valkeinen 2012-11-21 16:11 ` Steffen Trumtrar 0 siblings, 1 reply; 39+ messages in thread From: Tomi Valkeinen @ 2012-11-21 11:37 UTC (permalink / raw) To: Steffen Trumtrar Cc: linux-fbdev-u79uwXL29TY76Z2rM5mHXA, David Airlie, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ, Florian Tobias Schandinat, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Laurent Pinchart, kernel-bIcnvbaLZ9MEGnE8C9+IrQ, Guennady Liakhovetski, linux-media-u79uwXL29TY76Z2rM5mHXA [-- Attachment #1: Type: text/plain, Size: 6621 bytes --] Hi, On 2012-11-20 17:54, Steffen Trumtrar wrote: > Add display_timing structure and the according helper functions. This allows > the description of a display via its supported timing parameters. > > Every timing parameter can be specified as a single value or a range > <min typ max>. > > Also, add helper functions to convert from display timings to a generic videomode > structure. This videomode can then be converted to the corresponding subsystem > mode representation (e.g. fb_videomode). Sorry for reviewing this so late. One thing I'd like to see is some explanation of the structs involved. For example, in this patch you present structs videomode, display_timing and display_timings without giving any hint what they represent. I'm not asking for you to write a long documentation, but perhaps the header files could include a few lines of comments above the structs, explaining the idea. > +void display_timings_release(struct display_timings *disp) > +{ > + if (disp->timings) { > + unsigned int i; > + > + for (i = 0; i < disp->num_timings; i++) > + kfree(disp->timings[i]); > + kfree(disp->timings); > + } > + kfree(disp); > +} > +EXPORT_SYMBOL_GPL(display_timings_release); Perhaps this will become clearer after reading the following patches, but it feels a bit odd to add a release function, without anything in this patch that would actually allocate the timings. > diff --git a/drivers/video/videomode.c b/drivers/video/videomode.c > new file mode 100644 > index 0000000..e24f879 > --- /dev/null > +++ b/drivers/video/videomode.c > @@ -0,0 +1,46 @@ > +/* > + * generic display timing functions > + * > + * Copyright (c) 2012 Steffen Trumtrar <s.trumtrar@pengutronix.de>, Pengutronix > + * > + * This file is released under the GPLv2 > + */ > + > +#include <linux/export.h> > +#include <linux/errno.h> > +#include <linux/display_timing.h> > +#include <linux/kernel.h> > +#include <linux/videomode.h> > + > +int videomode_from_timing(const struct display_timings *disp, > + struct videomode *vm, unsigned int index) > +{ > + struct display_timing *dt; > + > + dt = display_timings_get(disp, index); > + if (!dt) > + return -EINVAL; > + > + vm->pixelclock = display_timing_get_value(&dt->pixelclock, 0); > + vm->hactive = display_timing_get_value(&dt->hactive, 0); > + vm->hfront_porch = display_timing_get_value(&dt->hfront_porch, 0); > + vm->hback_porch = display_timing_get_value(&dt->hback_porch, 0); > + vm->hsync_len = display_timing_get_value(&dt->hsync_len, 0); > + > + vm->vactive = display_timing_get_value(&dt->vactive, 0); > + vm->vfront_porch = display_timing_get_value(&dt->vfront_porch, 0); > + vm->vback_porch = display_timing_get_value(&dt->vback_porch, 0); > + vm->vsync_len = display_timing_get_value(&dt->vsync_len, 0); Shouldn't all these calls get the typical value, with index 1? > + > + vm->vah = dt->vsync_pol_active; > + vm->hah = dt->hsync_pol_active; > + vm->de = dt->de_pol_active; > + vm->pixelclk_pol = dt->pixelclk_pol; > + > + vm->interlaced = dt->interlaced; > + vm->doublescan = dt->doublescan; > + > + return 0; > +} > + > +EXPORT_SYMBOL_GPL(videomode_from_timing); > diff --git a/include/linux/display_timing.h b/include/linux/display_timing.h > new file mode 100644 > index 0000000..d5bf03f > --- /dev/null > +++ b/include/linux/display_timing.h > @@ -0,0 +1,70 @@ > +/* > + * Copyright 2012 Steffen Trumtrar <s.trumtrar@pengutronix.de> > + * > + * description of display timings > + * > + * This file is released under the GPLv2 > + */ > + > +#ifndef __LINUX_DISPLAY_TIMINGS_H > +#define __LINUX_DISPLAY_TIMINGS_H > + > +#include <linux/types.h> What is this needed for? u32? I don't see it defined in types.h > + > +struct timing_entry { > + u32 min; > + u32 typ; > + u32 max; > +}; > + > +struct display_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; > + > + unsigned int vsync_pol_active; > + unsigned int hsync_pol_active; > + unsigned int de_pol_active; > + unsigned int pixelclk_pol; > + bool interlaced; > + bool doublescan; > +}; > + > +struct display_timings { > + unsigned int num_timings; > + unsigned int native_mode; > + > + struct display_timing **timings; > +}; > + > +/* > + * placeholder function until ranges are really needed > + * the index parameter should then be used to select one of [min typ max] > + */ > +static inline u32 display_timing_get_value(const struct timing_entry *te, > + unsigned int index) > +{ > + return te->typ; > +} Why did you opt for a placeholder here? It feels trivial to me to have support to get the min/typ/max value properly. > +static inline struct display_timing *display_timings_get(const struct > + display_timings *disp, > + unsigned int index) > +{ > + if (disp->num_timings > index) > + return disp->timings[index]; > + else > + return NULL; > +} > + > +void display_timings_release(struct display_timings *disp); > + > +#endif > diff --git a/include/linux/videomode.h b/include/linux/videomode.h > new file mode 100644 > index 0000000..5d3e796 > --- /dev/null > +++ b/include/linux/videomode.h > @@ -0,0 +1,40 @@ > +/* > + * 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 <linux/display_timing.h> This is not needed, just add: struct display_timings; > +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; > + > + u32 hah; > + u32 vah; > + u32 de; > + u32 pixelclk_pol; > + > + bool interlaced; > + bool doublescan; > +}; > + > +int videomode_from_timing(const struct display_timings *disp, > + struct videomode *vm, unsigned int index); > + Are this and the few other functions above meant to be used from drivers? If so, some explanation of the parameters here would be nice. If they are just framework internal, they don't probably need that. Tomi [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 897 bytes --] ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v12 1/6] video: add display_timing and videomode 2012-11-21 11:37 ` Tomi Valkeinen @ 2012-11-21 16:11 ` Steffen Trumtrar [not found] ` <20121121161103.GA12657-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 0 siblings, 1 reply; 39+ messages in thread From: Steffen Trumtrar @ 2012-11-21 16:11 UTC (permalink / raw) To: Tomi Valkeinen Cc: devicetree-discuss, Rob Herring, linux-fbdev, dri-devel, Laurent Pinchart, Thierry Reding, Guennady Liakhovetski, linux-media, Stephen Warren, kernel, Florian Tobias Schandinat, David Airlie Hi, On Wed, Nov 21, 2012 at 01:37:08PM +0200, Tomi Valkeinen wrote: > Hi, > > On 2012-11-20 17:54, Steffen Trumtrar wrote: > > Add display_timing structure and the according helper functions. This allows > > the description of a display via its supported timing parameters. > > > > Every timing parameter can be specified as a single value or a range > > <min typ max>. > > > > Also, add helper functions to convert from display timings to a generic videomode > > structure. This videomode can then be converted to the corresponding subsystem > > mode representation (e.g. fb_videomode). > > Sorry for reviewing this so late. > > One thing I'd like to see is some explanation of the structs involved. > For example, in this patch you present structs videomode, display_timing > and display_timings without giving any hint what they represent. > > I'm not asking for you to write a long documentation, but perhaps the > header files could include a few lines of comments above the structs, > explaining the idea. > Okay. Will do. > > +void display_timings_release(struct display_timings *disp) > > +{ > > + if (disp->timings) { > > + unsigned int i; > > + > > + for (i = 0; i < disp->num_timings; i++) > > + kfree(disp->timings[i]); > > + kfree(disp->timings); > > + } > > + kfree(disp); > > +} > > +EXPORT_SYMBOL_GPL(display_timings_release); > > Perhaps this will become clearer after reading the following patches, > but it feels a bit odd to add a release function, without anything in > this patch that would actually allocate the timings. > 2/6 uses this function. And as this does not belong to the DT part, it is added in this patch. > > diff --git a/drivers/video/videomode.c b/drivers/video/videomode.c > > new file mode 100644 > > index 0000000..e24f879 > > --- /dev/null > > +++ b/drivers/video/videomode.c > > @@ -0,0 +1,46 @@ > > +/* > > + * generic display timing functions > > + * > > + * Copyright (c) 2012 Steffen Trumtrar <s.trumtrar@pengutronix.de>, Pengutronix > > + * > > + * This file is released under the GPLv2 > > + */ > > + > > +#include <linux/export.h> > > +#include <linux/errno.h> > > +#include <linux/display_timing.h> > > +#include <linux/kernel.h> > > +#include <linux/videomode.h> > > + > > +int videomode_from_timing(const struct display_timings *disp, > > + struct videomode *vm, unsigned int index) > > +{ > > + struct display_timing *dt; > > + > > + dt = display_timings_get(disp, index); > > + if (!dt) > > + return -EINVAL; > > + > > + vm->pixelclock = display_timing_get_value(&dt->pixelclock, 0); > > + vm->hactive = display_timing_get_value(&dt->hactive, 0); > > + vm->hfront_porch = display_timing_get_value(&dt->hfront_porch, 0); > > + vm->hback_porch = display_timing_get_value(&dt->hback_porch, 0); > > + vm->hsync_len = display_timing_get_value(&dt->hsync_len, 0); > > + > > + vm->vactive = display_timing_get_value(&dt->vactive, 0); > > + vm->vfront_porch = display_timing_get_value(&dt->vfront_porch, 0); > > + vm->vback_porch = display_timing_get_value(&dt->vback_porch, 0); > > + vm->vsync_len = display_timing_get_value(&dt->vsync_len, 0); > > Shouldn't all these calls get the typical value, with index 1? > Yes. I omitted the indexing until now. So it didn't matter what value was used. But I will integrate it in the next version. > > + > > + vm->vah = dt->vsync_pol_active; > > + vm->hah = dt->hsync_pol_active; > > + vm->de = dt->de_pol_active; > > + vm->pixelclk_pol = dt->pixelclk_pol; > > + > > + vm->interlaced = dt->interlaced; > > + vm->doublescan = dt->doublescan; > > + > > + return 0; > > +} > > + > > +EXPORT_SYMBOL_GPL(videomode_from_timing); > > diff --git a/include/linux/display_timing.h b/include/linux/display_timing.h > > new file mode 100644 > > index 0000000..d5bf03f > > --- /dev/null > > +++ b/include/linux/display_timing.h > > @@ -0,0 +1,70 @@ > > +/* > > + * Copyright 2012 Steffen Trumtrar <s.trumtrar@pengutronix.de> > > + * > > + * description of display timings > > + * > > + * This file is released under the GPLv2 > > + */ > > + > > +#ifndef __LINUX_DISPLAY_TIMINGS_H > > +#define __LINUX_DISPLAY_TIMINGS_H > > + > > +#include <linux/types.h> > > What is this needed for? u32? I don't see it defined in types.h > Yes, u32. What would be the right header for that if not types.h? > > + > > +struct timing_entry { > > + u32 min; > > + u32 typ; > > + u32 max; > > +}; > > + > > +struct display_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; > > + > > + unsigned int vsync_pol_active; > > + unsigned int hsync_pol_active; > > + unsigned int de_pol_active; > > + unsigned int pixelclk_pol; > > + bool interlaced; > > + bool doublescan; > > +}; > > + > > +struct display_timings { > > + unsigned int num_timings; > > + unsigned int native_mode; > > + > > + struct display_timing **timings; > > +}; > > + > > +/* > > + * placeholder function until ranges are really needed > > + * the index parameter should then be used to select one of [min typ max] > > + */ > > +static inline u32 display_timing_get_value(const struct timing_entry *te, > > + unsigned int index) > > +{ > > + return te->typ; > > +} > > Why did you opt for a placeholder here? It feels trivial to me to have > support to get the min/typ/max value properly. > I will add that in the next version. > > +static inline struct display_timing *display_timings_get(const struct > > + display_timings *disp, > > + unsigned int index) > > +{ > > + if (disp->num_timings > index) > > + return disp->timings[index]; > > + else > > + return NULL; > > +} > > + > > +void display_timings_release(struct display_timings *disp); > > + > > +#endif > > diff --git a/include/linux/videomode.h b/include/linux/videomode.h > > new file mode 100644 > > index 0000000..5d3e796 > > --- /dev/null > > +++ b/include/linux/videomode.h > > @@ -0,0 +1,40 @@ > > +/* > > + * 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 <linux/display_timing.h> > > This is not needed, just add: > > struct display_timings; > Okay. > > +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; > > + > > + u32 hah; > > + u32 vah; > > + u32 de; > > + u32 pixelclk_pol; > > + > > + bool interlaced; > > + bool doublescan; > > +}; > > + > > +int videomode_from_timing(const struct display_timings *disp, > > + struct videomode *vm, unsigned int index); > > + > > Are this and the few other functions above meant to be used from > drivers? If so, some explanation of the parameters here would be nice. > If they are just framework internal, they don't probably need that. > Okay. I will add some more documentation. 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 [flat|nested] 39+ messages in thread
[parent not found: <20121121161103.GA12657-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>]
* Re: [PATCH v12 1/6] video: add display_timing and videomode [not found] ` <20121121161103.GA12657-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> @ 2012-11-21 16:42 ` Tomi Valkeinen 0 siblings, 0 replies; 39+ messages in thread From: Tomi Valkeinen @ 2012-11-21 16:42 UTC (permalink / raw) To: Steffen Trumtrar Cc: linux-fbdev-u79uwXL29TY76Z2rM5mHXA, David Airlie, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ, Florian Tobias Schandinat, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Laurent Pinchart, kernel-bIcnvbaLZ9MEGnE8C9+IrQ, Guennady Liakhovetski, linux-media-u79uwXL29TY76Z2rM5mHXA [-- Attachment #1: Type: text/plain, Size: 460 bytes --] On 2012-11-21 18:11, Steffen Trumtrar wrote: > Hi, > > On Wed, Nov 21, 2012 at 01:37:08PM +0200, Tomi Valkeinen wrote: >>> +#include <linux/types.h> >> >> What is this needed for? u32? I don't see it defined in types.h >> > > Yes, u32. What would be the right header for that if not types.h? Yes, it looks like u32 comes via linux/types.h. It's defined elsewhere, but linux/types.h sounds like the most reasonable header for it. Tomi [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 897 bytes --] ^ permalink raw reply [flat|nested] 39+ messages in thread
* [PATCH v12 2/6] video: add of helper for videomode 2012-11-20 15:54 [PATCH v12 0/6] of: add display helper Steffen Trumtrar 2012-11-20 15:54 ` [PATCH v12 1/6] video: add display_timing and videomode Steffen Trumtrar @ 2012-11-20 15:54 ` Steffen Trumtrar [not found] ` <1353426896-6045-3-git-send-email-s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> [not found] ` <1353426896-6045-1-git-send-email-s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> ` (3 subsequent siblings) 5 siblings, 1 reply; 39+ messages in thread From: Steffen Trumtrar @ 2012-11-20 15:54 UTC (permalink / raw) To: devicetree-discuss Cc: Steffen Trumtrar, Philipp Zabel, Rob Herring, linux-fbdev, dri-devel, Laurent Pinchart, Thierry Reding, Guennady Liakhovetski, linux-media, Tomi Valkeinen, Stephen Warren, kernel, Florian Tobias Schandinat, David Airlie This adds support for reading display timings from DT or/and convert one of those timings to a videomode. The of_display_timing implementation supports multiple children where each property can have up to 3 values. All children are read into an array, that can be queried. of_get_videomode converts exactly one of that timings to a struct videomode. Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Acked-by: Stephen Warren <swarren@nvidia.com> Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de> Acked-by: Thierry Reding <thierry.reding@avionic-design.de> Tested-by: Thierry Reding <thierry.reding@avionic-design.de> Tested-by: Philipp Zabel <p.zabel@pengutronix.de> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- .../devicetree/bindings/video/display-timings.txt | 107 ++++++++++ drivers/video/Kconfig | 13 ++ drivers/video/Makefile | 2 + drivers/video/of_display_timing.c | 216 ++++++++++++++++++++ drivers/video/of_videomode.c | 48 +++++ include/linux/of_display_timings.h | 20 ++ include/linux/of_videomode.h | 18 ++ 7 files changed, 424 insertions(+) create mode 100644 Documentation/devicetree/bindings/video/display-timings.txt create mode 100644 drivers/video/of_display_timing.c create mode 100644 drivers/video/of_videomode.c create mode 100644 include/linux/of_display_timings.h create mode 100644 include/linux/of_videomode.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..a05cade --- /dev/null +++ b/Documentation/devicetree/bindings/video/display-timings.txt @@ -0,0 +1,107 @@ +display-timings bindings +============ + +display-timings node +-------------------- + +required properties: + - none + +optional properties: + - native-mode: The native mode for the display, in case multiple modes are + provided. When omitted, assume the first node is the native. + +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-frequency: display clock in Hz + +optional properties: + - hsync-active: Hsync pulse is active low/high/ignored + - vsync-active: Vsync pulse is active low/high/ignored + - de-active: Data-Enable pulse is active low/high/ignored + - pixelclk-inverted: pixelclock is inverted/non-inverted/ignored + - interlaced (bool) + - doublescan (bool) + +All the optional properties that are not bool follow the following logic: + <1>: high active + <0>: low active + omitted: not used on hardware + +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 native-mode can be specified. + +The parameters are defined as + +struct display_timing +==========+ + +----------+---------------------------------------------+----------+-------+ + | | ↑ | | | + | | |vback_porch | | | + | | ↓ | | | + +----------###############################################----------+-------+ + | # ↑ # | | + | # | # | | + | hback # | # hfront | hsync | + | porch # | hactive # porch | len | + |<-------->#<---------------+--------------------------->#<-------->|<----->| + | # | # | | + | # |vactive # | | + | # | # | | + | # ↓ # | | + +----------###############################################----------+-------+ + | | ↑ | | | + | | |vfront_porch | | | + | | ↓ | | | + +----------+---------------------------------------------+----------+-------+ + | | ↑ | | | + | | |vsync_len | | | + | | ↓ | | | + +----------+---------------------------------------------+----------+-------+ + + +Example: + + display-timings { + native-mode = <&timing0>; + timing0: 1920p24 { + /* 1920x1080p24 */ + clock-frequency = <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 = <1>; + }; + }; + +Every required 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-frequency = <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>; + }; diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 2a23b18..807fedd 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -39,6 +39,19 @@ config DISPLAY_TIMING config VIDEOMODE bool +config OF_DISPLAY_TIMING + bool "Enable OF display timing support" + select DISPLAY_TIMING + help + helper to parse display timings from the devicetree + +config OF_VIDEOMODE + bool "Enable OF videomode support" + select VIDEOMODE + select OF_DISPLAY_TIMING + help + helper to get videomodes from the devicetree + menuconfig FB tristate "Support for frame buffer devices" ---help--- diff --git a/drivers/video/Makefile b/drivers/video/Makefile index fc30439..b936b00 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -168,4 +168,6 @@ obj-$(CONFIG_FB_VIRTUAL) += vfb.o #video output switch sysfs driver obj-$(CONFIG_VIDEO_OUTPUT_CONTROL) += output.o obj-$(CONFIG_DISPLAY_TIMING) += display_timing.o +obj-$(CONFIG_OF_DISPLAY_TIMING) += of_display_timing.o obj-$(CONFIG_VIDEOMODE) += videomode.o +obj-$(CONFIG_OF_VIDEOMODE) += of_videomode.o diff --git a/drivers/video/of_display_timing.c b/drivers/video/of_display_timing.c new file mode 100644 index 0000000..3eb731f --- /dev/null +++ b/drivers/video/of_display_timing.c @@ -0,0 +1,216 @@ +/* + * 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> + +/** + * parse_property - parse timing_entry from device_node + * @np: device_node with the property + * @name: name of the property + * @result: will be set to the return value + * + * DESCRIPTION: + * Every display_timing can be specified with either just the typical value or + * a range consisting of min/typ/max. This function helps handling this + **/ +static int parse_property(const struct device_node *np, const char *name, + struct timing_entry *result) +{ + struct property *prop; + int length, cells, 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(np, name, &result->typ); + result->min = result->typ; + result->max = result->typ; + } 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; +} + +/** + * of_get_display_timing - parse display_timing entry from device_node + * @np: device_node with the properties + **/ +static struct display_timing *of_get_display_timing(const struct device_node *np) +{ + struct display_timing *dt; + int ret = 0; + + dt = kzalloc(sizeof(*dt), GFP_KERNEL); + if (!dt) { + pr_err("%s: could not allocate display_timing struct\n", __func__); + return NULL; + } + + ret |= parse_property(np, "hback-porch", &dt->hback_porch); + ret |= parse_property(np, "hfront-porch", &dt->hfront_porch); + ret |= parse_property(np, "hactive", &dt->hactive); + ret |= parse_property(np, "hsync-len", &dt->hsync_len); + ret |= parse_property(np, "vback-porch", &dt->vback_porch); + ret |= parse_property(np, "vfront-porch", &dt->vfront_porch); + ret |= parse_property(np, "vactive", &dt->vactive); + ret |= parse_property(np, "vsync-len", &dt->vsync_len); + ret |= parse_property(np, "clock-frequency", &dt->pixelclock); + + of_property_read_u32(np, "vsync-active", &dt->vsync_pol_active); + of_property_read_u32(np, "hsync-active", &dt->hsync_pol_active); + of_property_read_u32(np, "de-active", &dt->de_pol_active); + of_property_read_u32(np, "pixelclk-inverted", &dt->pixelclk_pol); + dt->interlaced = of_property_read_bool(np, "interlaced"); + dt->doublescan = of_property_read_bool(np, "doublescan"); + + if (ret) { + pr_err("%s: error reading timing properties\n", __func__); + kfree(dt); + return NULL; + } + + return dt; +} + +/** + * of_get_display_timings - parse all display_timing entries from a device_node + * @np: device_node with the subnodes + **/ +struct display_timings *of_get_display_timings(const struct device_node *np) +{ + struct device_node *timings_np; + struct device_node *entry; + struct device_node *native_mode; + struct display_timings *disp; + + 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); + if (!disp) { + pr_err("%s: could not allocate struct disp'\n", __func__); + goto dispfail; + } + + entry = of_parse_phandle(timings_np, "native-mode", 0); + /* assume first child as native mode if none provided */ + if (!entry) + entry = of_get_next_child(np, NULL); + /* if there is no child, it is useless to go on */ + if (!entry) { + pr_err("%s: no timing specifications given\n", __func__); + goto entryfail; + } + + pr_info("%s: using %s as default timing\n", __func__, entry->name); + + native_mode = entry; + + disp->num_timings = of_get_child_count(timings_np); + if (disp->num_timings = 0) { + /* should never happen, as entry was already found above */ + pr_err("%s: no timings specified\n", __func__); + goto entryfail; + } + + disp->timings = kzalloc(sizeof(struct display_timing *) * disp->num_timings, + GFP_KERNEL); + if (!disp->timings) { + pr_err("%s: could not allocate timings array\n", __func__); + goto entryfail; + } + + disp->num_timings = 0; + disp->native_mode = 0; + + for_each_child_of_node(timings_np, entry) { + struct display_timing *dt; + + dt = of_get_display_timing(entry); + if (!dt) { + /* + * to not encourage wrong devicetrees, fail in case of + * an error + */ + pr_err("%s: error in timing %d\n", __func__, + disp->num_timings + 1); + goto timingfail; + } + + if (native_mode = entry) + disp->native_mode = disp->num_timings; + + disp->timings[disp->num_timings] = dt; + disp->num_timings++; + } + of_node_put(timings_np); + of_node_put(native_mode); + + if (disp->num_timings > 0) + pr_info("%s: got %d timings. Using timing #%d as default\n", + __func__, disp->num_timings, disp->native_mode + 1); + else { + pr_err("%s: no valid timings specified\n", __func__); + display_timings_release(disp); + return NULL; + } + return disp; + +timingfail: + if (native_mode) + of_node_put(native_mode); + display_timings_release(disp); +entryfail: + if (disp) + kfree(disp); +dispfail: + of_node_put(timings_np); + return NULL; +} +EXPORT_SYMBOL_GPL(of_get_display_timings); + +/** + * of_display_timings_exists - check if a display-timings node is provided + * @np: device_node with the timing + **/ +int of_display_timings_exists(const struct device_node *np) +{ + struct device_node *timings_np; + + if (!np) + return -EINVAL; + + timings_np = of_parse_phandle(np, "display-timings", 0); + if (!timings_np) + return -EINVAL; + + of_node_put(timings_np); + return 1; +} +EXPORT_SYMBOL_GPL(of_display_timings_exists); diff --git a/drivers/video/of_videomode.c b/drivers/video/of_videomode.c new file mode 100644 index 0000000..c573f92 --- /dev/null +++ b/drivers/video/of_videomode.c @@ -0,0 +1,48 @@ +/* + * 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/of_display_timings.h> +#include <linux/of_videomode.h> +#include <linux/export.h> + +/** + * of_get_videomode - get the videomode #<index> from devicetree + * @np - devicenode with the display_timings + * @vm - set to return value + * @index - index into list of display_timings + * DESCRIPTION: + * Get a list of all display timings and put the one + * specified by index into *vm. This function should only be used, if + * only one videomode is to be retrieved. A driver that needs to work + * with multiple/all videomodes should work with + * of_get_display_timings instead. + **/ +int of_get_videomode(const struct device_node *np, struct videomode *vm, + int index) +{ + struct display_timings *disp; + int ret; + + disp = of_get_display_timings(np); + if (!disp) { + pr_err("%s: no timings specified\n", __func__); + return -EINVAL; + } + + if (index = OF_USE_NATIVE_MODE) + index = disp->native_mode; + + ret = videomode_from_timing(disp, vm, index); + if (ret) + return ret; + + display_timings_release(disp); + + return 0; +} +EXPORT_SYMBOL_GPL(of_get_videomode); diff --git a/include/linux/of_display_timings.h b/include/linux/of_display_timings.h new file mode 100644 index 0000000..2b4fa0a --- /dev/null +++ b/include/linux/of_display_timings.h @@ -0,0 +1,20 @@ +/* + * Copyright 2012 Steffen Trumtrar <s.trumtrar@pengutronix.de> + * + * display timings of helpers + * + * This file is released under the GPLv2 + */ + +#ifndef __LINUX_OF_DISPLAY_TIMINGS_H +#define __LINUX_OF_DISPLAY_TIMINGS_H + +#include <linux/display_timing.h> +#include <linux/of.h> + +#define OF_USE_NATIVE_MODE -1 + +struct display_timings *of_get_display_timings(const struct device_node *np); +int of_display_timings_exists(const struct device_node *np); + +#endif diff --git a/include/linux/of_videomode.h b/include/linux/of_videomode.h new file mode 100644 index 0000000..4de5fcc --- /dev/null +++ b/include/linux/of_videomode.h @@ -0,0 +1,18 @@ +/* + * Copyright 2012 Steffen Trumtrar <s.trumtrar@pengutronix.de> + * + * videomode of-helpers + * + * This file is released under the GPLv2 + */ + +#ifndef __LINUX_OF_VIDEOMODE_H +#define __LINUX_OF_VIDEOMODE_H + +#include <linux/videomode.h> +#include <linux/of.h> + +int of_get_videomode(const struct device_node *np, struct videomode *vm, + int index); + +#endif /* __LINUX_OF_VIDEOMODE_H */ -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 39+ messages in thread
[parent not found: <1353426896-6045-3-git-send-email-s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>]
* RE: [PATCH v12 2/6] video: add of helper for videomode [not found] ` <1353426896-6045-3-git-send-email-s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> @ 2012-11-21 10:12 ` Manjunathappa, Prakash 2012-11-21 11:48 ` Steffen Trumtrar 2012-11-21 12:22 ` Tomi Valkeinen 1 sibling, 1 reply; 39+ messages in thread From: Manjunathappa, Prakash @ 2012-11-21 10:12 UTC (permalink / raw) To: Steffen Trumtrar, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org Cc: linux-fbdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org, David Airlie, Florian Tobias Schandinat, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Valkeinen, Tomi, Laurent Pinchart, Philipp Zabel, Guennady Liakhovetski, linux-media-u79uwXL29TY76Z2rM5mHXA@public.gmane.org SGkgU3RlZmZlbiwNCg0KT24gVHVlLCBOb3YgMjAsIDIwMTIgYXQgMjE6MjQ6NTIsIFN0ZWZmZW4g VHJ1bXRyYXIgd3JvdGU6DQo+IFRoaXMgYWRkcyBzdXBwb3J0IGZvciByZWFkaW5nIGRpc3BsYXkg dGltaW5ncyBmcm9tIERUIG9yL2FuZCBjb252ZXJ0IG9uZSBvZiB0aG9zZQ0KPiB0aW1pbmdzIHRv IGEgdmlkZW9tb2RlLg0KPiBUaGUgb2ZfZGlzcGxheV90aW1pbmcgaW1wbGVtZW50YXRpb24gc3Vw cG9ydHMgbXVsdGlwbGUgY2hpbGRyZW4gd2hlcmUgZWFjaA0KPiBwcm9wZXJ0eSBjYW4gaGF2ZSB1 cCB0byAzIHZhbHVlcy4gQWxsIGNoaWxkcmVuIGFyZSByZWFkIGludG8gYW4gYXJyYXksIHRoYXQN Cj4gY2FuIGJlIHF1ZXJpZWQuDQo+IG9mX2dldF92aWRlb21vZGUgY29udmVydHMgZXhhY3RseSBv bmUgb2YgdGhhdCB0aW1pbmdzIHRvIGEgc3RydWN0IHZpZGVvbW9kZS4NCj4gDQo+IFNpZ25lZC1v ZmYtYnk6IFN0ZWZmZW4gVHJ1bXRyYXIgPHMudHJ1bXRyYXJAcGVuZ3V0cm9uaXguZGU+DQo+IFNp Z25lZC1vZmYtYnk6IFBoaWxpcHAgWmFiZWwgPHAuemFiZWxAcGVuZ3V0cm9uaXguZGU+DQo+IEFj a2VkLWJ5OiBTdGVwaGVuIFdhcnJlbiA8c3dhcnJlbkBudmlkaWEuY29tPg0KPiBSZXZpZXdlZC1i eTogVGhpZXJyeSBSZWRpbmcgPHRoaWVycnkucmVkaW5nQGF2aW9uaWMtZGVzaWduLmRlPg0KPiBB Y2tlZC1ieTogVGhpZXJyeSBSZWRpbmcgPHRoaWVycnkucmVkaW5nQGF2aW9uaWMtZGVzaWduLmRl Pg0KPiBUZXN0ZWQtYnk6IFRoaWVycnkgUmVkaW5nIDx0aGllcnJ5LnJlZGluZ0BhdmlvbmljLWRl c2lnbi5kZT4NCj4gVGVzdGVkLWJ5OiBQaGlsaXBwIFphYmVsIDxwLnphYmVsQHBlbmd1dHJvbml4 LmRlPg0KPiBSZXZpZXdlZC1ieTogTGF1cmVudCBQaW5jaGFydCA8bGF1cmVudC5waW5jaGFydEBp ZGVhc29uYm9hcmQuY29tPg0KPiAtLS0NCj4gIC4uLi9kZXZpY2V0cmVlL2JpbmRpbmdzL3ZpZGVv L2Rpc3BsYXktdGltaW5ncy50eHQgIHwgIDEwNyArKysrKysrKysrDQo+ICBkcml2ZXJzL3ZpZGVv L0tjb25maWcgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTMgKysNCj4gIGRyaXZl cnMvdmlkZW8vTWFrZWZpbGUgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAgMiArDQo+ ICBkcml2ZXJzL3ZpZGVvL29mX2Rpc3BsYXlfdGltaW5nLmMgICAgICAgICAgICAgICAgICB8ICAy MTYgKysrKysrKysrKysrKysrKysrKysNCj4gIGRyaXZlcnMvdmlkZW8vb2ZfdmlkZW9tb2RlLmMg ICAgICAgICAgICAgICAgICAgICAgIHwgICA0OCArKysrKw0KPiAgaW5jbHVkZS9saW51eC9vZl9k aXNwbGF5X3RpbWluZ3MuaCAgICAgICAgICAgICAgICAgfCAgIDIwICsrDQo+ICBpbmNsdWRlL2xp bnV4L29mX3ZpZGVvbW9kZS5oICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTggKysNCj4gIDcg ZmlsZXMgY2hhbmdlZCwgNDI0IGluc2VydGlvbnMoKykNCj4gIGNyZWF0ZSBtb2RlIDEwMDY0NCBE b2N1bWVudGF0aW9uL2RldmljZXRyZWUvYmluZGluZ3MvdmlkZW8vZGlzcGxheS10aW1pbmdzLnR4 dA0KPiAgY3JlYXRlIG1vZGUgMTAwNjQ0IGRyaXZlcnMvdmlkZW8vb2ZfZGlzcGxheV90aW1pbmcu Yw0KPiAgY3JlYXRlIG1vZGUgMTAwNjQ0IGRyaXZlcnMvdmlkZW8vb2ZfdmlkZW9tb2RlLmMNCj4g IGNyZWF0ZSBtb2RlIDEwMDY0NCBpbmNsdWRlL2xpbnV4L29mX2Rpc3BsYXlfdGltaW5ncy5oDQo+ ICBjcmVhdGUgbW9kZSAxMDA2NDQgaW5jbHVkZS9saW51eC9vZl92aWRlb21vZGUuaA0KPiANCj4g ZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vZGV2aWNldHJlZS9iaW5kaW5ncy92aWRlby9kaXNw bGF5LXRpbWluZ3MudHh0IGIvRG9jdW1lbnRhdGlvbi9kZXZpY2V0cmVlL2JpbmRpbmdzL3ZpZGVv L2Rpc3BsYXktdGltaW5ncy50eHQNCj4gbmV3IGZpbGUgbW9kZSAxMDA2NDQNCj4gaW5kZXggMDAw MDAwMC4uYTA1Y2FkZQ0KPiAtLS0gL2Rldi9udWxsDQo+ICsrKyBiL0RvY3VtZW50YXRpb24vZGV2 aWNldHJlZS9iaW5kaW5ncy92aWRlby9kaXNwbGF5LXRpbWluZ3MudHh0DQo+IEBAIC0wLDAgKzEs MTA3IEBADQo+ICtkaXNwbGF5LXRpbWluZ3MgYmluZGluZ3MNCj4gKz09PT09PT09PT09PT09PT09 PT09PT09PQ0KPiArDQo+ICtkaXNwbGF5LXRpbWluZ3Mgbm9kZQ0KPiArLS0tLS0tLS0tLS0tLS0t LS0tLS0NCj4gKw0KPiArcmVxdWlyZWQgcHJvcGVydGllczoNCj4gKyAtIG5vbmUNCj4gKw0KPiAr b3B0aW9uYWwgcHJvcGVydGllczoNCj4gKyAtIG5hdGl2ZS1tb2RlOiBUaGUgbmF0aXZlIG1vZGUg Zm9yIHRoZSBkaXNwbGF5LCBpbiBjYXNlIG11bHRpcGxlIG1vZGVzIGFyZQ0KPiArCQlwcm92aWRl ZC4gV2hlbiBvbWl0dGVkLCBhc3N1bWUgdGhlIGZpcnN0IG5vZGUgaXMgdGhlIG5hdGl2ZS4NCj4g Kw0KPiArdGltaW5ncyBzdWJub2RlDQo+ICstLS0tLS0tLS0tLS0tLS0NCj4gKw0KPiArcmVxdWly ZWQgcHJvcGVydGllczoNCj4gKyAtIGhhY3RpdmUsIHZhY3RpdmU6IERpc3BsYXkgcmVzb2x1dGlv bg0KPiArIC0gaGZyb250LXBvcmNoLCBoYmFjay1wb3JjaCwgaHN5bmMtbGVuOiBIb3Jpem9udGFs IERpc3BsYXkgdGltaW5nIHBhcmFtZXRlcnMNCj4gKyAgIGluIHBpeGVscw0KPiArICAgdmZyb250 LXBvcmNoLCB2YmFjay1wb3JjaCwgdnN5bmMtbGVuOiBWZXJ0aWNhbCBkaXNwbGF5IHRpbWluZyBw YXJhbWV0ZXJzIGluDQo+ICsgICBsaW5lcw0KPiArIC0gY2xvY2stZnJlcXVlbmN5OiBkaXNwbGF5 IGNsb2NrIGluIEh6DQo+ICsNCj4gK29wdGlvbmFsIHByb3BlcnRpZXM6DQo+ICsgLSBoc3luYy1h Y3RpdmU6IEhzeW5jIHB1bHNlIGlzIGFjdGl2ZSBsb3cvaGlnaC9pZ25vcmVkDQo+ICsgLSB2c3lu Yy1hY3RpdmU6IFZzeW5jIHB1bHNlIGlzIGFjdGl2ZSBsb3cvaGlnaC9pZ25vcmVkDQo+ICsgLSBk ZS1hY3RpdmU6IERhdGEtRW5hYmxlIHB1bHNlIGlzIGFjdGl2ZSBsb3cvaGlnaC9pZ25vcmVkDQo+ ICsgLSBwaXhlbGNsay1pbnZlcnRlZDogcGl4ZWxjbG9jayBpcyBpbnZlcnRlZC9ub24taW52ZXJ0 ZWQvaWdub3JlZA0KPiArIC0gaW50ZXJsYWNlZCAoYm9vbCkNCj4gKyAtIGRvdWJsZXNjYW4gKGJv b2wpDQo+ICsNCj4gK0FsbCB0aGUgb3B0aW9uYWwgcHJvcGVydGllcyB0aGF0IGFyZSBub3QgYm9v bCBmb2xsb3cgdGhlIGZvbGxvd2luZyBsb2dpYzoNCj4gKyAgICA8MT46IGhpZ2ggYWN0aXZlDQo+ ICsgICAgPDA+OiBsb3cgYWN0aXZlDQo+ICsgICAgb21pdHRlZDogbm90IHVzZWQgb24gaGFyZHdh cmUNCj4gKw0KPiArVGhlcmUgYXJlIGRpZmZlcmVudCB3YXlzIG9mIGRlc2NyaWJpbmcgdGhlIGNh cGFiaWxpdGllcyBvZiBhIGRpc3BsYXkuIFRoZSBkZXZpY2V0cmVlDQo+ICtyZXByZXNlbnRhdGlv biBjb3JyZXNwb25kcyB0byB0aGUgb25lIGNvbW1vbmx5IGZvdW5kIGluIGRhdGFzaGVldHMgZm9y IGRpc3BsYXlzLg0KPiArSWYgYSBkaXNwbGF5IHN1cHBvcnRzIG11bHRpcGxlIHNpZ25hbCB0aW1p bmdzLCB0aGUgbmF0aXZlLW1vZGUgY2FuIGJlIHNwZWNpZmllZC4NCj4gKw0KPiArVGhlIHBhcmFt ZXRlcnMgYXJlIGRlZmluZWQgYXMNCj4gKw0KPiArc3RydWN0IGRpc3BsYXlfdGltaW5nDQo+ICs9 PT09PT09PT09PT09PT09PT09PT0NCj4gKw0KPiArICArLS0tLS0tLS0tLSstLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0rLS0tLS0tLS0tLSstLS0tLS0tKw0KPiAr ICB8ICAgICAgICAgIHwgICAgICAgICAgICAgICAg4oaRICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHwgICAgICAgICAgfCAgICAgICB8DQo+ICsgIHwgICAgICAgICAgfCAgICAgICAgICAgICAg ICB8dmJhY2tfcG9yY2ggICAgICAgICAgICAgICAgIHwgICAgICAgICAgfCAgICAgICB8DQo+ICsg IHwgICAgICAgICAgfCAgICAgICAgICAgICAgICDihpMgICAgICAgICAgICAgICAgICAgICAgICAg ICAgfCAgICAgICAgICB8ICAgICAgIHwNCj4gKyAgKy0tLS0tLS0tLS0jIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy0tLS0tLS0tLS0rLS0tLS0tLSsNCj4gKyAg fCAgICAgICAgICAjICAgICAgICAgICAgICAgIOKGkSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAjICAgICAgICAgIHwgICAgICAgfA0KPiArICB8ICAgICAgICAgICMgICAgICAgICAgICAgICAg fCAgICAgICAgICAgICAgICAgICAgICAgICAgICAjICAgICAgICAgIHwgICAgICAgfA0KPiArICB8 ICBoYmFjayAgICMgICAgICAgICAgICAgICAgfCAgICAgICAgICAgICAgICAgICAgICAgICAgICAj ICBoZnJvbnQgIHwgaHN5bmMgfA0KPiArICB8ICAgcG9yY2ggICMgICAgICAgICAgICAgICAgfCAg ICAgICBoYWN0aXZlICAgICAgICAgICAgICAjICBwb3JjaCAgIHwgIGxlbiAgfA0KPiArICB8PC0t LS0tLS0tPiM8LS0tLS0tLS0tLS0tLS0tKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLT4jPC0t LS0tLS0tPnw8LS0tLS0+fA0KPiArICB8ICAgICAgICAgICMgICAgICAgICAgICAgICAgfCAgICAg ICAgICAgICAgICAgICAgICAgICAgICAjICAgICAgICAgIHwgICAgICAgfA0KPiArICB8ICAgICAg ICAgICMgICAgICAgICAgICAgICAgfHZhY3RpdmUgICAgICAgICAgICAgICAgICAgICAjICAgICAg ICAgIHwgICAgICAgfA0KPiArICB8ICAgICAgICAgICMgICAgICAgICAgICAgICAgfCAgICAgICAg ICAgICAgICAgICAgICAgICAgICAjICAgICAgICAgIHwgICAgICAgfA0KPiArICB8ICAgICAgICAg ICMgICAgICAgICAgICAgICAg4oaTICAgICAgICAgICAgICAgICAgICAgICAgICAgICMgICAgICAg ICAgfCAgICAgICB8DQo+ICsgICstLS0tLS0tLS0tIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMtLS0tLS0tLS0tKy0tLS0tLS0rDQo+ICsgIHwgICAgICAgICAg fCAgICAgICAgICAgICAgICDihpEgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgICAgICAg ICB8ICAgICAgIHwNCj4gKyAgfCAgICAgICAgICB8ICAgICAgICAgICAgICAgIHx2ZnJvbnRfcG9y Y2ggICAgICAgICAgICAgICAgfCAgICAgICAgICB8ICAgICAgIHwNCj4gKyAgfCAgICAgICAgICB8 ICAgICAgICAgICAgICAgIOKGkyAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgICAgICAg IHwgICAgICAgfA0KPiArICArLS0tLS0tLS0tLSstLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0rLS0tLS0tLS0tLSstLS0tLS0tKw0KPiArICB8ICAgICAgICAgIHwg ICAgICAgICAgICAgICAg4oaRICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAgICAgICAg fCAgICAgICB8DQo+ICsgIHwgICAgICAgICAgfCAgICAgICAgICAgICAgICB8dnN5bmNfbGVuICAg ICAgICAgICAgICAgICAgIHwgICAgICAgICAgfCAgICAgICB8DQo+ICsgIHwgICAgICAgICAgfCAg ICAgICAgICAgICAgICDihpMgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgICAgICAgICB8 ICAgICAgIHwNCj4gKyAgKy0tLS0tLS0tLS0rLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tKy0tLS0tLS0tLS0rLS0tLS0tLSsNCj4gKw0KPiArDQo+ICtFeGFtcGxl Og0KPiArDQo+ICsJZGlzcGxheS10aW1pbmdzIHsNCj4gKwkJbmF0aXZlLW1vZGUgPSA8JnRpbWlu ZzA+Ow0KPiArCQl0aW1pbmcwOiAxOTIwcDI0IHsNCj4gKwkJCS8qIDE5MjB4MTA4MHAyNCAqLw0K PiArCQkJY2xvY2stZnJlcXVlbmN5ID0gPDUyMDAwMDAwPjsNCj4gKwkJCWhhY3RpdmUgPSA8MTky MD47DQo+ICsJCQl2YWN0aXZlID0gPDEwODA+Ow0KPiArCQkJaGZyb250LXBvcmNoID0gPDI1PjsN Cj4gKwkJCWhiYWNrLXBvcmNoID0gPDI1PjsNCj4gKwkJCWhzeW5jLWxlbiA9IDwyNT47DQo+ICsJ CQl2YmFjay1wb3JjaCA9IDwyPjsNCj4gKwkJCXZmcm9udC1wb3JjaCA9IDwyPjsNCj4gKwkJCXZz eW5jLWxlbiA9IDwyPjsNCj4gKwkJCWhzeW5jLWFjdGl2ZSA9IDwxPjsNCj4gKwkJfTsNCj4gKwl9 Ow0KPiArDQo+ICtFdmVyeSByZXF1aXJlZCBwcm9wZXJ0eSBhbHNvIHN1cHBvcnRzIHRoZSB1c2Ug b2YgcmFuZ2VzLCBzbyB0aGUgY29tbW9ubHkgdXNlZA0KPiArZGF0YXNoZWV0IGRlc2NyaXB0aW9u IHdpdGggPG1pbiB0eXAgbWF4Pi10dXBsZXMgY2FuIGJlIHVzZWQuDQo+ICsNCj4gK0V4YW1wbGU6 DQo+ICsNCj4gKwl0aW1pbmcxOiB0aW1pbmcgew0KPiArCQkvKiAxOTIweDEwODBwMjQgKi8NCj4g KwkJY2xvY2stZnJlcXVlbmN5ID0gPDE0ODUwMDAwMD47DQo+ICsJCWhhY3RpdmUgPSA8MTkyMD47 DQo+ICsJCXZhY3RpdmUgPSA8MTA4MD47DQo+ICsJCWhzeW5jLWxlbiA9IDwwIDQ0IDYwPjsNCj4g KwkJaGZyb250LXBvcmNoID0gPDgwIDg4IDk1PjsNCj4gKwkJaGJhY2stcG9yY2ggPSA8MTAwIDE0 OCAxNjA+Ow0KPiArCQl2ZnJvbnQtcG9yY2ggPSA8MCA0IDY+Ow0KPiArCQl2YmFjay1wb3JjaCA9 IDwwIDM2IDUwPjsNCj4gKwkJdnN5bmMtbGVuID0gPDAgNSA2PjsNCj4gKwl9Ow0KPiBkaWZmIC0t Z2l0IGEvZHJpdmVycy92aWRlby9LY29uZmlnIGIvZHJpdmVycy92aWRlby9LY29uZmlnDQo+IGlu ZGV4IDJhMjNiMTguLjgwN2ZlZGQgMTAwNjQ0DQo+IC0tLSBhL2RyaXZlcnMvdmlkZW8vS2NvbmZp Zw0KPiArKysgYi9kcml2ZXJzL3ZpZGVvL0tjb25maWcNCj4gQEAgLTM5LDYgKzM5LDE5IEBAIGNv bmZpZyBESVNQTEFZX1RJTUlORw0KPiAgY29uZmlnIFZJREVPTU9ERQ0KPiAgICAgICAgIGJvb2wN Cj4gIA0KPiArY29uZmlnIE9GX0RJU1BMQVlfVElNSU5HDQo+ICsJYm9vbCAiRW5hYmxlIE9GIGRp c3BsYXkgdGltaW5nIHN1cHBvcnQiDQo+ICsJc2VsZWN0IERJU1BMQVlfVElNSU5HDQo+ICsJaGVs cA0KPiArCSAgaGVscGVyIHRvIHBhcnNlIGRpc3BsYXkgdGltaW5ncyBmcm9tIHRoZSBkZXZpY2V0 cmVlDQo+ICsNCj4gK2NvbmZpZyBPRl9WSURFT01PREUNCj4gKwlib29sICJFbmFibGUgT0Ygdmlk ZW9tb2RlIHN1cHBvcnQiDQo+ICsJc2VsZWN0IFZJREVPTU9ERQ0KPiArCXNlbGVjdCBPRl9ESVNQ TEFZX1RJTUlORw0KPiArCWhlbHANCj4gKwkgIGhlbHBlciB0byBnZXQgdmlkZW9tb2RlcyBmcm9t IHRoZSBkZXZpY2V0cmVlDQo+ICsNCj4gIG1lbnVjb25maWcgRkINCj4gIAl0cmlzdGF0ZSAiU3Vw cG9ydCBmb3IgZnJhbWUgYnVmZmVyIGRldmljZXMiDQo+ICAJLS0taGVscC0tLQ0KPiBkaWZmIC0t Z2l0IGEvZHJpdmVycy92aWRlby9NYWtlZmlsZSBiL2RyaXZlcnMvdmlkZW8vTWFrZWZpbGUNCj4g aW5kZXggZmMzMDQzOS4uYjkzNmIwMCAxMDA2NDQNCj4gLS0tIGEvZHJpdmVycy92aWRlby9NYWtl ZmlsZQ0KPiArKysgYi9kcml2ZXJzL3ZpZGVvL01ha2VmaWxlDQo+IEBAIC0xNjgsNCArMTY4LDYg QEAgb2JqLSQoQ09ORklHX0ZCX1ZJUlRVQUwpICAgICAgICAgICs9IHZmYi5vDQo+ICAjdmlkZW8g b3V0cHV0IHN3aXRjaCBzeXNmcyBkcml2ZXINCj4gIG9iai0kKENPTkZJR19WSURFT19PVVRQVVRf Q09OVFJPTCkgKz0gb3V0cHV0Lm8NCj4gIG9iai0kKENPTkZJR19ESVNQTEFZX1RJTUlORykgKz0g ZGlzcGxheV90aW1pbmcubw0KPiArb2JqLSQoQ09ORklHX09GX0RJU1BMQVlfVElNSU5HKSArPSBv Zl9kaXNwbGF5X3RpbWluZy5vDQo+ICBvYmotJChDT05GSUdfVklERU9NT0RFKSArPSB2aWRlb21v ZGUubw0KPiArb2JqLSQoQ09ORklHX09GX1ZJREVPTU9ERSkgKz0gb2ZfdmlkZW9tb2RlLm8NCj4g ZGlmZiAtLWdpdCBhL2RyaXZlcnMvdmlkZW8vb2ZfZGlzcGxheV90aW1pbmcuYyBiL2RyaXZlcnMv dmlkZW8vb2ZfZGlzcGxheV90aW1pbmcuYw0KPiBuZXcgZmlsZSBtb2RlIDEwMDY0NA0KPiBpbmRl eCAwMDAwMDAwLi4zZWI3MzFmDQo+IC0tLSAvZGV2L251bGwNCj4gKysrIGIvZHJpdmVycy92aWRl by9vZl9kaXNwbGF5X3RpbWluZy5jDQo+IEBAIC0wLDAgKzEsMjE2IEBADQo+ICsvKg0KPiArICog T0YgaGVscGVycyBmb3IgcGFyc2luZyBkaXNwbGF5IHRpbWluZ3MNCj4gKyAqDQo+ICsgKiBDb3B5 cmlnaHQgKGMpIDIwMTIgU3RlZmZlbiBUcnVtdHJhciA8cy50cnVtdHJhckBwZW5ndXRyb25peC5k ZT4sIFBlbmd1dHJvbml4DQo+ICsgKg0KPiArICogYmFzZWQgb24gb2ZfdmlkZW9tb2RlLmMgYnkg U2FzY2hhIEhhdWVyIDxzLmhhdWVyQHBlbmd1dHJvbml4LmRlPg0KPiArICoNCj4gKyAqIFRoaXMg ZmlsZSBpcyByZWxlYXNlZCB1bmRlciB0aGUgR1BMdjINCj4gKyAqLw0KPiArI2luY2x1ZGUgPGxp bnV4L29mLmg+DQo+ICsjaW5jbHVkZSA8bGludXgvc2xhYi5oPg0KPiArI2luY2x1ZGUgPGxpbnV4 L2V4cG9ydC5oPg0KPiArI2luY2x1ZGUgPGxpbnV4L29mX2Rpc3BsYXlfdGltaW5ncy5oPg0KPiAr DQo+ICsvKioNCj4gKyAqIHBhcnNlX3Byb3BlcnR5IC0gcGFyc2UgdGltaW5nX2VudHJ5IGZyb20g ZGV2aWNlX25vZGUNCj4gKyAqIEBucDogZGV2aWNlX25vZGUgd2l0aCB0aGUgcHJvcGVydHkNCj4g KyAqIEBuYW1lOiBuYW1lIG9mIHRoZSBwcm9wZXJ0eQ0KPiArICogQHJlc3VsdDogd2lsbCBiZSBz ZXQgdG8gdGhlIHJldHVybiB2YWx1ZQ0KPiArICoNCj4gKyAqIERFU0NSSVBUSU9OOg0KPiArICog RXZlcnkgZGlzcGxheV90aW1pbmcgY2FuIGJlIHNwZWNpZmllZCB3aXRoIGVpdGhlciBqdXN0IHRo ZSB0eXBpY2FsIHZhbHVlIG9yDQo+ICsgKiBhIHJhbmdlIGNvbnNpc3Rpbmcgb2YgbWluL3R5cC9t YXguIFRoaXMgZnVuY3Rpb24gaGVscHMgaGFuZGxpbmcgdGhpcw0KPiArICoqLw0KPiArc3RhdGlj IGludCBwYXJzZV9wcm9wZXJ0eShjb25zdCBzdHJ1Y3QgZGV2aWNlX25vZGUgKm5wLCBjb25zdCBj aGFyICpuYW1lLA0KPiArCQkJICBzdHJ1Y3QgdGltaW5nX2VudHJ5ICpyZXN1bHQpDQo+ICt7DQo+ ICsJc3RydWN0IHByb3BlcnR5ICpwcm9wOw0KPiArCWludCBsZW5ndGgsIGNlbGxzLCByZXQ7DQo+ ICsNCj4gKwlwcm9wID0gb2ZfZmluZF9wcm9wZXJ0eShucCwgbmFtZSwgJmxlbmd0aCk7DQo+ICsJ aWYgKCFwcm9wKSB7DQo+ICsJCXByX2VycigiJXM6IGNvdWxkIG5vdCBmaW5kIHByb3BlcnR5ICVz XG4iLCBfX2Z1bmNfXywgbmFtZSk7DQo+ICsJCXJldHVybiAtRUlOVkFMOw0KPiArCX0NCj4gKw0K PiArCWNlbGxzID0gbGVuZ3RoIC8gc2l6ZW9mKHUzMik7DQo+ICsJaWYgKGNlbGxzID09IDEpIHsN Cj4gKwkJcmV0ID0gb2ZfcHJvcGVydHlfcmVhZF91MzIobnAsIG5hbWUsICZyZXN1bHQtPnR5cCk7 DQo+ICsJCXJlc3VsdC0+bWluID0gcmVzdWx0LT50eXA7DQo+ICsJCXJlc3VsdC0+bWF4ID0gcmVz dWx0LT50eXA7DQo+ICsJfSBlbHNlIGlmIChjZWxscyA9PSAzKSB7DQo+ICsJCXJldCA9IG9mX3By b3BlcnR5X3JlYWRfdTMyX2FycmF5KG5wLCBuYW1lLCAmcmVzdWx0LT5taW4sIGNlbGxzKTsNCj4g Kwl9IGVsc2Ugew0KPiArCQlwcl9lcnIoIiVzOiBpbGxlZ2FsIHRpbWluZyBzcGVjaWZpY2F0aW9u IGluICVzXG4iLCBfX2Z1bmNfXywgbmFtZSk7DQo+ICsJCXJldHVybiAtRUlOVkFMOw0KPiArCX0N Cj4gKw0KPiArCXJldHVybiByZXQ7DQo+ICt9DQo+ICsNCj4gKy8qKg0KPiArICogb2ZfZ2V0X2Rp c3BsYXlfdGltaW5nIC0gcGFyc2UgZGlzcGxheV90aW1pbmcgZW50cnkgZnJvbSBkZXZpY2Vfbm9k ZQ0KPiArICogQG5wOiBkZXZpY2Vfbm9kZSB3aXRoIHRoZSBwcm9wZXJ0aWVzDQo+ICsgKiovDQo+ ICtzdGF0aWMgc3RydWN0IGRpc3BsYXlfdGltaW5nICpvZl9nZXRfZGlzcGxheV90aW1pbmcoY29u c3Qgc3RydWN0IGRldmljZV9ub2RlICpucCkNCj4gK3sNCj4gKwlzdHJ1Y3QgZGlzcGxheV90aW1p bmcgKmR0Ow0KPiArCWludCByZXQgPSAwOw0KPiArDQo+ICsJZHQgPSBremFsbG9jKHNpemVvZigq ZHQpLCBHRlBfS0VSTkVMKTsNCj4gKwlpZiAoIWR0KSB7DQo+ICsJCXByX2VycigiJXM6IGNvdWxk IG5vdCBhbGxvY2F0ZSBkaXNwbGF5X3RpbWluZyBzdHJ1Y3RcbiIsIF9fZnVuY19fKTsNCj4gKwkJ cmV0dXJuIE5VTEw7DQo+ICsJfQ0KPiArDQo+ICsJcmV0IHw9IHBhcnNlX3Byb3BlcnR5KG5wLCAi aGJhY2stcG9yY2giLCAmZHQtPmhiYWNrX3BvcmNoKTsNCj4gKwlyZXQgfD0gcGFyc2VfcHJvcGVy dHkobnAsICJoZnJvbnQtcG9yY2giLCAmZHQtPmhmcm9udF9wb3JjaCk7DQo+ICsJcmV0IHw9IHBh cnNlX3Byb3BlcnR5KG5wLCAiaGFjdGl2ZSIsICZkdC0+aGFjdGl2ZSk7DQo+ICsJcmV0IHw9IHBh cnNlX3Byb3BlcnR5KG5wLCAiaHN5bmMtbGVuIiwgJmR0LT5oc3luY19sZW4pOw0KPiArCXJldCB8 PSBwYXJzZV9wcm9wZXJ0eShucCwgInZiYWNrLXBvcmNoIiwgJmR0LT52YmFja19wb3JjaCk7DQo+ ICsJcmV0IHw9IHBhcnNlX3Byb3BlcnR5KG5wLCAidmZyb250LXBvcmNoIiwgJmR0LT52ZnJvbnRf cG9yY2gpOw0KPiArCXJldCB8PSBwYXJzZV9wcm9wZXJ0eShucCwgInZhY3RpdmUiLCAmZHQtPnZh Y3RpdmUpOw0KPiArCXJldCB8PSBwYXJzZV9wcm9wZXJ0eShucCwgInZzeW5jLWxlbiIsICZkdC0+ dnN5bmNfbGVuKTsNCj4gKwlyZXQgfD0gcGFyc2VfcHJvcGVydHkobnAsICJjbG9jay1mcmVxdWVu Y3kiLCAmZHQtPnBpeGVsY2xvY2spOw0KPiArDQo+ICsJb2ZfcHJvcGVydHlfcmVhZF91MzIobnAs ICJ2c3luYy1hY3RpdmUiLCAmZHQtPnZzeW5jX3BvbF9hY3RpdmUpOw0KPiArCW9mX3Byb3BlcnR5 X3JlYWRfdTMyKG5wLCAiaHN5bmMtYWN0aXZlIiwgJmR0LT5oc3luY19wb2xfYWN0aXZlKTsNCj4g KwlvZl9wcm9wZXJ0eV9yZWFkX3UzMihucCwgImRlLWFjdGl2ZSIsICZkdC0+ZGVfcG9sX2FjdGl2 ZSk7DQo+ICsJb2ZfcHJvcGVydHlfcmVhZF91MzIobnAsICJwaXhlbGNsay1pbnZlcnRlZCIsICZk dC0+cGl4ZWxjbGtfcG9sKTsNCj4gKwlkdC0+aW50ZXJsYWNlZCA9IG9mX3Byb3BlcnR5X3JlYWRf Ym9vbChucCwgImludGVybGFjZWQiKTsNCj4gKwlkdC0+ZG91Ymxlc2NhbiA9IG9mX3Byb3BlcnR5 X3JlYWRfYm9vbChucCwgImRvdWJsZXNjYW4iKTsNCj4gKw0KPiArCWlmIChyZXQpIHsNCj4gKwkJ cHJfZXJyKCIlczogZXJyb3IgcmVhZGluZyB0aW1pbmcgcHJvcGVydGllc1xuIiwgX19mdW5jX18p Ow0KPiArCQlrZnJlZShkdCk7DQo+ICsJCXJldHVybiBOVUxMOw0KPiArCX0NCj4gKw0KPiArCXJl dHVybiBkdDsNCj4gK30NCj4gKw0KPiArLyoqDQo+ICsgKiBvZl9nZXRfZGlzcGxheV90aW1pbmdz IC0gcGFyc2UgYWxsIGRpc3BsYXlfdGltaW5nIGVudHJpZXMgZnJvbSBhIGRldmljZV9ub2RlDQo+ ICsgKiBAbnA6IGRldmljZV9ub2RlIHdpdGggdGhlIHN1Ym5vZGVzDQo+ICsgKiovDQo+ICtzdHJ1 Y3QgZGlzcGxheV90aW1pbmdzICpvZl9nZXRfZGlzcGxheV90aW1pbmdzKGNvbnN0IHN0cnVjdCBk ZXZpY2Vfbm9kZSAqbnApDQo+ICt7DQo+ICsJc3RydWN0IGRldmljZV9ub2RlICp0aW1pbmdzX25w Ow0KPiArCXN0cnVjdCBkZXZpY2Vfbm9kZSAqZW50cnk7DQo+ICsJc3RydWN0IGRldmljZV9ub2Rl ICpuYXRpdmVfbW9kZTsNCj4gKwlzdHJ1Y3QgZGlzcGxheV90aW1pbmdzICpkaXNwOw0KPiArDQo+ ICsJaWYgKCFucCkgew0KPiArCQlwcl9lcnIoIiVzOiBubyBkZXZpY2Vub2RlIGdpdmVuXG4iLCBf X2Z1bmNfXyk7DQo+ICsJCXJldHVybiBOVUxMOw0KPiArCX0NCj4gKw0KPiArCXRpbWluZ3NfbnAg PSBvZl9maW5kX25vZGVfYnlfbmFtZShucCwgImRpc3BsYXktdGltaW5ncyIpOw0KDQpJIGdldCBi ZWxvdyBidWlsZCB3YXJuaW5ncyBvbiB0aGlzIGxpbmUNCmRyaXZlcnMvdmlkZW8vb2ZfZGlzcGxh eV90aW1pbmcuYzogSW4gZnVuY3Rpb24gJ29mX2dldF9kaXNwbGF5X3RpbWluZ3MnOg0KZHJpdmVy cy92aWRlby9vZl9kaXNwbGF5X3RpbWluZy5jOjEwOToyOiB3YXJuaW5nOiBwYXNzaW5nIGFyZ3Vt ZW50IDEgb2YgJ29mX2ZpbmRfbm9kZV9ieV9uYW1lJyBkaXNjYXJkcyBxdWFsaWZpZXJzIGZyb20g cG9pbnRlciB0YXJnZXQgdHlwZQ0KaW5jbHVkZS9saW51eC9vZi5oOjE2NzoyODogbm90ZTogZXhw ZWN0ZWQgJ3N0cnVjdCBkZXZpY2Vfbm9kZSAqJyBidXQgYXJndW1lbnQgaXMgb2YgdHlwZSAnY29u c3Qgc3RydWN0IGRldmljZV9ub2RlIConDQoNCj4gKwlpZiAoIXRpbWluZ3NfbnApIHsNCj4gKwkJ cHJfZXJyKCIlczogY291bGQgbm90IGZpbmQgZGlzcGxheS10aW1pbmdzIG5vZGVcbiIsIF9fZnVu Y19fKTsNCj4gKwkJcmV0dXJuIE5VTEw7DQo+ICsJfQ0KPiArDQo+ICsJZGlzcCA9IGt6YWxsb2Mo c2l6ZW9mKCpkaXNwKSwgR0ZQX0tFUk5FTCk7DQo+ICsJaWYgKCFkaXNwKSB7DQo+ICsJCXByX2Vy cigiJXM6IGNvdWxkIG5vdCBhbGxvY2F0ZSBzdHJ1Y3QgZGlzcCdcbiIsIF9fZnVuY19fKTsNCj4g KwkJZ290byBkaXNwZmFpbDsNCj4gKwl9DQo+ICsNCj4gKwllbnRyeSA9IG9mX3BhcnNlX3BoYW5k bGUodGltaW5nc19ucCwgIm5hdGl2ZS1tb2RlIiwgMCk7DQo+ICsJLyogYXNzdW1lIGZpcnN0IGNo aWxkIGFzIG5hdGl2ZSBtb2RlIGlmIG5vbmUgcHJvdmlkZWQgKi8NCj4gKwlpZiAoIWVudHJ5KQ0K PiArCQllbnRyeSA9IG9mX2dldF9uZXh0X2NoaWxkKG5wLCBOVUxMKTsNCj4gKwkvKiBpZiB0aGVy ZSBpcyBubyBjaGlsZCwgaXQgaXMgdXNlbGVzcyB0byBnbyBvbiAqLw0KPiArCWlmICghZW50cnkp IHsNCj4gKwkJcHJfZXJyKCIlczogbm8gdGltaW5nIHNwZWNpZmljYXRpb25zIGdpdmVuXG4iLCBf X2Z1bmNfXyk7DQo+ICsJCWdvdG8gZW50cnlmYWlsOw0KPiArCX0NCj4gKw0KPiArCXByX2luZm8o IiVzOiB1c2luZyAlcyBhcyBkZWZhdWx0IHRpbWluZ1xuIiwgX19mdW5jX18sIGVudHJ5LT5uYW1l KTsNCj4gKw0KPiArCW5hdGl2ZV9tb2RlID0gZW50cnk7DQo+ICsNCj4gKwlkaXNwLT5udW1fdGlt aW5ncyA9IG9mX2dldF9jaGlsZF9jb3VudCh0aW1pbmdzX25wKTsNCj4gKwlpZiAoZGlzcC0+bnVt X3RpbWluZ3MgPT0gMCkgew0KPiArCQkvKiBzaG91bGQgbmV2ZXIgaGFwcGVuLCBhcyBlbnRyeSB3 YXMgYWxyZWFkeSBmb3VuZCBhYm92ZSAqLw0KPiArCQlwcl9lcnIoIiVzOiBubyB0aW1pbmdzIHNw ZWNpZmllZFxuIiwgX19mdW5jX18pOw0KPiArCQlnb3RvIGVudHJ5ZmFpbDsNCj4gKwl9DQo+ICsN Cj4gKwlkaXNwLT50aW1pbmdzID0ga3phbGxvYyhzaXplb2Yoc3RydWN0IGRpc3BsYXlfdGltaW5n ICopICogZGlzcC0+bnVtX3RpbWluZ3MsDQo+ICsJCQkJR0ZQX0tFUk5FTCk7DQo+ICsJaWYgKCFk aXNwLT50aW1pbmdzKSB7DQo+ICsJCXByX2VycigiJXM6IGNvdWxkIG5vdCBhbGxvY2F0ZSB0aW1p bmdzIGFycmF5XG4iLCBfX2Z1bmNfXyk7DQo+ICsJCWdvdG8gZW50cnlmYWlsOw0KPiArCX0NCj4g Kw0KPiArCWRpc3AtPm51bV90aW1pbmdzID0gMDsNCj4gKwlkaXNwLT5uYXRpdmVfbW9kZSA9IDA7 DQo+ICsNCj4gKwlmb3JfZWFjaF9jaGlsZF9vZl9ub2RlKHRpbWluZ3NfbnAsIGVudHJ5KSB7DQo+ ICsJCXN0cnVjdCBkaXNwbGF5X3RpbWluZyAqZHQ7DQo+ICsNCj4gKwkJZHQgPSBvZl9nZXRfZGlz cGxheV90aW1pbmcoZW50cnkpOw0KPiArCQlpZiAoIWR0KSB7DQo+ICsJCQkvKg0KPiArCQkJICog dG8gbm90IGVuY291cmFnZSB3cm9uZyBkZXZpY2V0cmVlcywgZmFpbCBpbiBjYXNlIG9mDQo+ICsJ CQkgKiBhbiBlcnJvcg0KPiArCQkJICovDQo+ICsJCQlwcl9lcnIoIiVzOiBlcnJvciBpbiB0aW1p bmcgJWRcbiIsIF9fZnVuY19fLA0KPiArCQkJICAgICAgIGRpc3AtPm51bV90aW1pbmdzICsgMSk7 DQo+ICsJCQlnb3RvIHRpbWluZ2ZhaWw7DQo+ICsJCX0NCj4gKw0KPiArCQlpZiAobmF0aXZlX21v ZGUgPT0gZW50cnkpDQo+ICsJCQlkaXNwLT5uYXRpdmVfbW9kZSA9IGRpc3AtPm51bV90aW1pbmdz Ow0KPiArDQo+ICsJCWRpc3AtPnRpbWluZ3NbZGlzcC0+bnVtX3RpbWluZ3NdID0gZHQ7DQo+ICsJ CWRpc3AtPm51bV90aW1pbmdzKys7DQo+ICsJfQ0KPiArCW9mX25vZGVfcHV0KHRpbWluZ3NfbnAp Ow0KPiArCW9mX25vZGVfcHV0KG5hdGl2ZV9tb2RlKTsNCj4gKw0KPiArCWlmIChkaXNwLT5udW1f dGltaW5ncyA+IDApDQo+ICsJCXByX2luZm8oIiVzOiBnb3QgJWQgdGltaW5ncy4gVXNpbmcgdGlt aW5nICMlZCBhcyBkZWZhdWx0XG4iLA0KPiArCQkJX19mdW5jX18sIGRpc3AtPm51bV90aW1pbmdz LCBkaXNwLT5uYXRpdmVfbW9kZSArIDEpOw0KPiArCWVsc2Ugew0KPiArCQlwcl9lcnIoIiVzOiBu byB2YWxpZCB0aW1pbmdzIHNwZWNpZmllZFxuIiwgX19mdW5jX18pOw0KPiArCQlkaXNwbGF5X3Rp bWluZ3NfcmVsZWFzZShkaXNwKTsNCj4gKwkJcmV0dXJuIE5VTEw7DQo+ICsJfQ0KPiArCXJldHVy biBkaXNwOw0KPiArDQo+ICt0aW1pbmdmYWlsOg0KPiArCWlmIChuYXRpdmVfbW9kZSkNCj4gKwkJ b2Zfbm9kZV9wdXQobmF0aXZlX21vZGUpOw0KPiArCWRpc3BsYXlfdGltaW5nc19yZWxlYXNlKGRp c3ApOw0KPiArZW50cnlmYWlsOg0KPiArCWlmIChkaXNwKQ0KPiArCQlrZnJlZShkaXNwKTsNCj4g K2Rpc3BmYWlsOg0KPiArCW9mX25vZGVfcHV0KHRpbWluZ3NfbnApOw0KPiArCXJldHVybiBOVUxM Ow0KPiArfQ0KPiArRVhQT1JUX1NZTUJPTF9HUEwob2ZfZ2V0X2Rpc3BsYXlfdGltaW5ncyk7DQo+ ICsNCj4gKy8qKg0KPiArICogb2ZfZGlzcGxheV90aW1pbmdzX2V4aXN0cyAtIGNoZWNrIGlmIGEg ZGlzcGxheS10aW1pbmdzIG5vZGUgaXMgcHJvdmlkZWQNCj4gKyAqIEBucDogZGV2aWNlX25vZGUg d2l0aCB0aGUgdGltaW5nDQo+ICsgKiovDQo+ICtpbnQgb2ZfZGlzcGxheV90aW1pbmdzX2V4aXN0 cyhjb25zdCBzdHJ1Y3QgZGV2aWNlX25vZGUgKm5wKQ0KPiArew0KPiArCXN0cnVjdCBkZXZpY2Vf bm9kZSAqdGltaW5nc19ucDsNCj4gKw0KPiArCWlmICghbnApDQo+ICsJCXJldHVybiAtRUlOVkFM Ow0KPiArDQo+ICsJdGltaW5nc19ucCA9IG9mX3BhcnNlX3BoYW5kbGUobnAsICJkaXNwbGF5LXRp bWluZ3MiLCAwKTsNCg0KQWxzbyBoZXJlOg0KZHJpdmVycy92aWRlby9vZl9kaXNwbGF5X3RpbWlu Zy5jOiBJbiBmdW5jdGlvbiAnb2ZfZGlzcGxheV90aW1pbmdzX2V4aXN0cyc6DQpkcml2ZXJzL3Zp ZGVvL29mX2Rpc3BsYXlfdGltaW5nLmM6MjA5OjI6IHdhcm5pbmc6IHBhc3NpbmcgYXJndW1lbnQg MSBvZiAnb2ZfcGFyc2VfcGhhbmRsZScgZGlzY2FyZHMgcXVhbGlmaWVycyBmcm9tIHBvaW50ZXIg dGFyZ2V0IHR5cGUNCmluY2x1ZGUvbGludXgvb2YuaDoyNTg6Mjg6IG5vdGU6IGV4cGVjdGVkICdz dHJ1Y3QgZGV2aWNlX25vZGUgKicgYnV0IGFyZ3VtZW50IGlzIG9mIHR5cGUgJ2NvbnN0IHN0cnVj dCBkZXZpY2Vfbm9kZSAqJw0KDQpUaGFua3MsDQpQcmFrYXNoDQoNCj4gKwlpZiAoIXRpbWluZ3Nf bnApDQo+ICsJCXJldHVybiAtRUlOVkFMOw0KPiArDQo+ICsJb2Zfbm9kZV9wdXQodGltaW5nc19u cCk7DQo+ICsJcmV0dXJuIDE7DQo+ICt9DQo+ICtFWFBPUlRfU1lNQk9MX0dQTChvZl9kaXNwbGF5 X3RpbWluZ3NfZXhpc3RzKTsNCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvdmlkZW8vb2ZfdmlkZW9t b2RlLmMgYi9kcml2ZXJzL3ZpZGVvL29mX3ZpZGVvbW9kZS5jDQo+IG5ldyBmaWxlIG1vZGUgMTAw NjQ0DQo+IGluZGV4IDAwMDAwMDAuLmM1NzNmOTINCj4gLS0tIC9kZXYvbnVsbA0KPiArKysgYi9k cml2ZXJzL3ZpZGVvL29mX3ZpZGVvbW9kZS5jDQo+IEBAIC0wLDAgKzEsNDggQEANCj4gKy8qDQo+ ICsgKiBnZW5lcmljIHZpZGVvbW9kZSBoZWxwZXINCj4gKyAqDQo+ICsgKiBDb3B5cmlnaHQgKGMp IDIwMTIgU3RlZmZlbiBUcnVtdHJhciA8cy50cnVtdHJhckBwZW5ndXRyb25peC5kZT4sIFBlbmd1 dHJvbml4DQo+ICsgKg0KPiArICogVGhpcyBmaWxlIGlzIHJlbGVhc2VkIHVuZGVyIHRoZSBHUEx2 Mg0KPiArICovDQo+ICsjaW5jbHVkZSA8bGludXgvb2YuaD4NCj4gKyNpbmNsdWRlIDxsaW51eC9v Zl9kaXNwbGF5X3RpbWluZ3MuaD4NCj4gKyNpbmNsdWRlIDxsaW51eC9vZl92aWRlb21vZGUuaD4N Cj4gKyNpbmNsdWRlIDxsaW51eC9leHBvcnQuaD4NCj4gKw0KPiArLyoqDQo+ICsgKiBvZl9nZXRf dmlkZW9tb2RlIC0gZ2V0IHRoZSB2aWRlb21vZGUgIzxpbmRleD4gZnJvbSBkZXZpY2V0cmVlDQo+ ICsgKiBAbnAgLSBkZXZpY2Vub2RlIHdpdGggdGhlIGRpc3BsYXlfdGltaW5ncw0KPiArICogQHZt IC0gc2V0IHRvIHJldHVybiB2YWx1ZQ0KPiArICogQGluZGV4IC0gaW5kZXggaW50byBsaXN0IG9m IGRpc3BsYXlfdGltaW5ncw0KPiArICogREVTQ1JJUFRJT046DQo+ICsgKiBHZXQgYSBsaXN0IG9m IGFsbCBkaXNwbGF5IHRpbWluZ3MgYW5kIHB1dCB0aGUgb25lDQo+ICsgKiBzcGVjaWZpZWQgYnkg aW5kZXggaW50byAqdm0uIFRoaXMgZnVuY3Rpb24gc2hvdWxkIG9ubHkgYmUgdXNlZCwgaWYNCj4g KyAqIG9ubHkgb25lIHZpZGVvbW9kZSBpcyB0byBiZSByZXRyaWV2ZWQuIEEgZHJpdmVyIHRoYXQg bmVlZHMgdG8gd29yaw0KPiArICogd2l0aCBtdWx0aXBsZS9hbGwgdmlkZW9tb2RlcyBzaG91bGQg d29yayB3aXRoDQo+ICsgKiBvZl9nZXRfZGlzcGxheV90aW1pbmdzIGluc3RlYWQuDQo+ICsgKiov DQo+ICtpbnQgb2ZfZ2V0X3ZpZGVvbW9kZShjb25zdCBzdHJ1Y3QgZGV2aWNlX25vZGUgKm5wLCBz dHJ1Y3QgdmlkZW9tb2RlICp2bSwNCj4gKwkJICAgICBpbnQgaW5kZXgpDQo+ICt7DQo+ICsJc3Ry dWN0IGRpc3BsYXlfdGltaW5ncyAqZGlzcDsNCj4gKwlpbnQgcmV0Ow0KPiArDQo+ICsJZGlzcCA9 IG9mX2dldF9kaXNwbGF5X3RpbWluZ3MobnApOw0KPiArCWlmICghZGlzcCkgew0KPiArCQlwcl9l cnIoIiVzOiBubyB0aW1pbmdzIHNwZWNpZmllZFxuIiwgX19mdW5jX18pOw0KPiArCQlyZXR1cm4g LUVJTlZBTDsNCj4gKwl9DQo+ICsNCj4gKwlpZiAoaW5kZXggPT0gT0ZfVVNFX05BVElWRV9NT0RF KQ0KPiArCQlpbmRleCA9IGRpc3AtPm5hdGl2ZV9tb2RlOw0KPiArDQo+ICsJcmV0ID0gdmlkZW9t b2RlX2Zyb21fdGltaW5nKGRpc3AsIHZtLCBpbmRleCk7DQo+ICsJaWYgKHJldCkNCj4gKwkJcmV0 dXJuIHJldDsNCj4gKw0KPiArCWRpc3BsYXlfdGltaW5nc19yZWxlYXNlKGRpc3ApOw0KPiArDQo+ ICsJcmV0dXJuIDA7DQo+ICt9DQo+ICtFWFBPUlRfU1lNQk9MX0dQTChvZl9nZXRfdmlkZW9tb2Rl KTsNCj4gZGlmZiAtLWdpdCBhL2luY2x1ZGUvbGludXgvb2ZfZGlzcGxheV90aW1pbmdzLmggYi9p bmNsdWRlL2xpbnV4L29mX2Rpc3BsYXlfdGltaW5ncy5oDQo+IG5ldyBmaWxlIG1vZGUgMTAwNjQ0 DQo+IGluZGV4IDAwMDAwMDAuLjJiNGZhMGENCj4gLS0tIC9kZXYvbnVsbA0KPiArKysgYi9pbmNs dWRlL2xpbnV4L29mX2Rpc3BsYXlfdGltaW5ncy5oDQo+IEBAIC0wLDAgKzEsMjAgQEANCj4gKy8q DQo+ICsgKiBDb3B5cmlnaHQgMjAxMiBTdGVmZmVuIFRydW10cmFyIDxzLnRydW10cmFyQHBlbmd1 dHJvbml4LmRlPg0KPiArICoNCj4gKyAqIGRpc3BsYXkgdGltaW5ncyBvZiBoZWxwZXJzDQo+ICsg Kg0KPiArICogVGhpcyBmaWxlIGlzIHJlbGVhc2VkIHVuZGVyIHRoZSBHUEx2Mg0KPiArICovDQo+ ICsNCj4gKyNpZm5kZWYgX19MSU5VWF9PRl9ESVNQTEFZX1RJTUlOR1NfSA0KPiArI2RlZmluZSBf X0xJTlVYX09GX0RJU1BMQVlfVElNSU5HU19IDQo+ICsNCj4gKyNpbmNsdWRlIDxsaW51eC9kaXNw bGF5X3RpbWluZy5oPg0KPiArI2luY2x1ZGUgPGxpbnV4L29mLmg+DQo+ICsNCj4gKyNkZWZpbmUg T0ZfVVNFX05BVElWRV9NT0RFIC0xDQo+ICsNCj4gK3N0cnVjdCBkaXNwbGF5X3RpbWluZ3MgKm9m X2dldF9kaXNwbGF5X3RpbWluZ3MoY29uc3Qgc3RydWN0IGRldmljZV9ub2RlICpucCk7DQo+ICtp bnQgb2ZfZGlzcGxheV90aW1pbmdzX2V4aXN0cyhjb25zdCBzdHJ1Y3QgZGV2aWNlX25vZGUgKm5w KTsNCj4gKw0KPiArI2VuZGlmDQo+IGRpZmYgLS1naXQgYS9pbmNsdWRlL2xpbnV4L29mX3ZpZGVv bW9kZS5oIGIvaW5jbHVkZS9saW51eC9vZl92aWRlb21vZGUuaA0KPiBuZXcgZmlsZSBtb2RlIDEw MDY0NA0KPiBpbmRleCAwMDAwMDAwLi40ZGU1ZmNjDQo+IC0tLSAvZGV2L251bGwNCj4gKysrIGIv aW5jbHVkZS9saW51eC9vZl92aWRlb21vZGUuaA0KPiBAQCAtMCwwICsxLDE4IEBADQo+ICsvKg0K PiArICogQ29weXJpZ2h0IDIwMTIgU3RlZmZlbiBUcnVtdHJhciA8cy50cnVtdHJhckBwZW5ndXRy b25peC5kZT4NCj4gKyAqDQo+ICsgKiB2aWRlb21vZGUgb2YtaGVscGVycw0KPiArICoNCj4gKyAq IFRoaXMgZmlsZSBpcyByZWxlYXNlZCB1bmRlciB0aGUgR1BMdjINCj4gKyAqLw0KPiArDQo+ICsj aWZuZGVmIF9fTElOVVhfT0ZfVklERU9NT0RFX0gNCj4gKyNkZWZpbmUgX19MSU5VWF9PRl9WSURF T01PREVfSA0KPiArDQo+ICsjaW5jbHVkZSA8bGludXgvdmlkZW9tb2RlLmg+DQo+ICsjaW5jbHVk ZSA8bGludXgvb2YuaD4NCj4gKw0KPiAraW50IG9mX2dldF92aWRlb21vZGUoY29uc3Qgc3RydWN0 IGRldmljZV9ub2RlICpucCwgc3RydWN0IHZpZGVvbW9kZSAqdm0sDQo+ICsJCSAgICAgaW50IGlu ZGV4KTsNCj4gKw0KPiArI2VuZGlmIC8qIF9fTElOVVhfT0ZfVklERU9NT0RFX0ggKi8NCj4gLS0g DQo+IDEuNy4xMC40DQo+IA0KPiAtLQ0KPiBUbyB1bnN1YnNjcmliZSBmcm9tIHRoaXMgbGlzdDog c2VuZCB0aGUgbGluZSAidW5zdWJzY3JpYmUgbGludXgtZmJkZXYiIGluDQo+IHRoZSBib2R5IG9m IGEgbWVzc2FnZSB0byBtYWpvcmRvbW9Admdlci5rZXJuZWwub3JnDQo+IE1vcmUgbWFqb3Jkb21v IGluZm8gYXQgIGh0dHA6Ly92Z2VyLmtlcm5lbC5vcmcvbWFqb3Jkb21vLWluZm8uaHRtbA0KPiAN Cg0K ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v12 2/6] video: add of helper for videomode 2012-11-21 10:12 ` Manjunathappa, Prakash @ 2012-11-21 11:48 ` Steffen Trumtrar 2012-11-21 11:52 ` Thierry Reding 0 siblings, 1 reply; 39+ messages in thread From: Steffen Trumtrar @ 2012-11-21 11:48 UTC (permalink / raw) To: Manjunathappa, Prakash Cc: devicetree-discuss@lists.ozlabs.org, Philipp Zabel, Rob Herring, linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, Laurent Pinchart, Thierry Reding, Guennady Liakhovetski, linux-media@vger.kernel.org, Valkeinen, Tomi, Stephen Warren, kernel@pengutronix.de, Florian Tobias Schandinat, David Airlie Hi! On Wed, Nov 21, 2012 at 10:12:43AM +0000, Manjunathappa, Prakash wrote: > Hi Steffen, > > On Tue, Nov 20, 2012 at 21:24:52, Steffen Trumtrar wrote: > > +/** > > + * of_get_display_timings - parse all display_timing entries from a device_node > > + * @np: device_node with the subnodes > > + **/ > > +struct display_timings *of_get_display_timings(const struct device_node *np) > > +{ > > + struct device_node *timings_np; > > + struct device_node *entry; > > + struct device_node *native_mode; > > + struct display_timings *disp; > > + > > + if (!np) { > > + pr_err("%s: no devicenode given\n", __func__); > > + return NULL; > > + } > > + > > + timings_np = of_find_node_by_name(np, "display-timings"); > > I get below build warnings on this line > drivers/video/of_display_timing.c: In function 'of_get_display_timings': > drivers/video/of_display_timing.c:109:2: warning: passing argument 1 of 'of_find_node_by_name' discards qualifiers from pointer target type > include/linux/of.h:167:28: note: expected 'struct device_node *' but argument is of type 'const struct device_node *' > > > + * of_display_timings_exists - check if a display-timings node is provided > > + * @np: device_node with the timing > > + **/ > > +int of_display_timings_exists(const struct device_node *np) > > +{ > > + struct device_node *timings_np; > > + > > + if (!np) > > + return -EINVAL; > > + > > + timings_np = of_parse_phandle(np, "display-timings", 0); > > Also here: > drivers/video/of_display_timing.c: In function 'of_display_timings_exists': > drivers/video/of_display_timing.c:209:2: warning: passing argument 1 of 'of_parse_phandle' discards qualifiers from pointer target type > include/linux/of.h:258:28: note: expected 'struct device_node *' but argument is of type 'const struct device_node *' > The warnings are because the of-functions do not use const pointers where they should. I had two options: don't use const pointers even if they should be and have no warnings or use const pointers and have a correct API. (Third option: send patches for of-functions). I chose the second option. 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 [flat|nested] 39+ messages in thread
* Re: [PATCH v12 2/6] video: add of helper for videomode 2012-11-21 11:48 ` Steffen Trumtrar @ 2012-11-21 11:52 ` Thierry Reding 2012-11-21 15:03 ` Rob Herring 0 siblings, 1 reply; 39+ messages in thread From: Thierry Reding @ 2012-11-21 11:52 UTC (permalink / raw) To: Steffen Trumtrar Cc: Manjunathappa, Prakash, devicetree-discuss@lists.ozlabs.org, Philipp Zabel, Rob Herring, linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, Laurent Pinchart, Guennady Liakhovetski, linux-media@vger.kernel.org, Valkeinen, Tomi, Stephen Warren, kernel@pengutronix.de, Florian Tobias Schandinat, David Airlie [-- Attachment #1: Type: text/plain, Size: 2568 bytes --] On Wed, Nov 21, 2012 at 12:48:43PM +0100, Steffen Trumtrar wrote: > Hi! > > On Wed, Nov 21, 2012 at 10:12:43AM +0000, Manjunathappa, Prakash wrote: > > Hi Steffen, > > > > On Tue, Nov 20, 2012 at 21:24:52, Steffen Trumtrar wrote: > > > +/** > > > + * of_get_display_timings - parse all display_timing entries from a device_node > > > + * @np: device_node with the subnodes > > > + **/ > > > +struct display_timings *of_get_display_timings(const struct device_node *np) > > > +{ > > > + struct device_node *timings_np; > > > + struct device_node *entry; > > > + struct device_node *native_mode; > > > + struct display_timings *disp; > > > + > > > + if (!np) { > > > + pr_err("%s: no devicenode given\n", __func__); > > > + return NULL; > > > + } > > > + > > > + timings_np = of_find_node_by_name(np, "display-timings"); > > > > I get below build warnings on this line > > drivers/video/of_display_timing.c: In function 'of_get_display_timings': > > drivers/video/of_display_timing.c:109:2: warning: passing argument 1 of 'of_find_node_by_name' discards qualifiers from pointer target type > > include/linux/of.h:167:28: note: expected 'struct device_node *' but argument is of type 'const struct device_node *' > > > > > + * of_display_timings_exists - check if a display-timings node is provided > > > + * @np: device_node with the timing > > > + **/ > > > +int of_display_timings_exists(const struct device_node *np) > > > +{ > > > + struct device_node *timings_np; > > > + > > > + if (!np) > > > + return -EINVAL; > > > + > > > + timings_np = of_parse_phandle(np, "display-timings", 0); > > > > Also here: > > drivers/video/of_display_timing.c: In function 'of_display_timings_exists': > > drivers/video/of_display_timing.c:209:2: warning: passing argument 1 of 'of_parse_phandle' discards qualifiers from pointer target type > > include/linux/of.h:258:28: note: expected 'struct device_node *' but argument is of type 'const struct device_node *' > > > > The warnings are because the of-functions do not use const pointers where they > should. I had two options: don't use const pointers even if they should be and > have no warnings or use const pointers and have a correct API. (Third option: > send patches for of-functions). I chose the second option. Maybe a better approach would be a combination of 1 and 3: don't use const pointers for struct device_node for now and bring the issue up with the OF maintainers, possibly with patches attached that fix the problematic functions. Thierry [-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v12 2/6] video: add of helper for videomode 2012-11-21 11:52 ` Thierry Reding @ 2012-11-21 15:03 ` Rob Herring [not found] ` <50ACED4A.5040806-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 0 siblings, 1 reply; 39+ messages in thread From: Rob Herring @ 2012-11-21 15:03 UTC (permalink / raw) To: Thierry Reding Cc: Steffen Trumtrar, Manjunathappa, Prakash, devicetree-discuss@lists.ozlabs.org, Philipp Zabel, linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, Laurent Pinchart, Guennady Liakhovetski, linux-media@vger.kernel.org, Valkeinen, Tomi, Stephen Warren, kernel@pengutronix.de, Florian Tobias Schandinat, David Airlie, Grant Likely On 11/21/2012 05:52 AM, Thierry Reding wrote: > On Wed, Nov 21, 2012 at 12:48:43PM +0100, Steffen Trumtrar wrote: >> Hi! >> >> On Wed, Nov 21, 2012 at 10:12:43AM +0000, Manjunathappa, Prakash wrote: >>> Hi Steffen, >>> >>> On Tue, Nov 20, 2012 at 21:24:52, Steffen Trumtrar wrote: >>>> +/** >>>> + * of_get_display_timings - parse all display_timing entries from a device_node >>>> + * @np: device_node with the subnodes >>>> + **/ >>>> +struct display_timings *of_get_display_timings(const struct device_node *np) >>>> +{ >>>> + struct device_node *timings_np; >>>> + struct device_node *entry; >>>> + struct device_node *native_mode; >>>> + struct display_timings *disp; >>>> + >>>> + if (!np) { >>>> + pr_err("%s: no devicenode given\n", __func__); >>>> + return NULL; >>>> + } >>>> + >>>> + timings_np = of_find_node_by_name(np, "display-timings"); >>> >>> I get below build warnings on this line >>> drivers/video/of_display_timing.c: In function 'of_get_display_timings': >>> drivers/video/of_display_timing.c:109:2: warning: passing argument 1 of 'of_find_node_by_name' discards qualifiers from pointer target type >>> include/linux/of.h:167:28: note: expected 'struct device_node *' but argument is of type 'const struct device_node *' >>> >>>> + * of_display_timings_exists - check if a display-timings node is provided >>>> + * @np: device_node with the timing >>>> + **/ >>>> +int of_display_timings_exists(const struct device_node *np) >>>> +{ >>>> + struct device_node *timings_np; >>>> + >>>> + if (!np) >>>> + return -EINVAL; >>>> + >>>> + timings_np = of_parse_phandle(np, "display-timings", 0); >>> >>> Also here: >>> drivers/video/of_display_timing.c: In function 'of_display_timings_exists': >>> drivers/video/of_display_timing.c:209:2: warning: passing argument 1 of 'of_parse_phandle' discards qualifiers from pointer target type >>> include/linux/of.h:258:28: note: expected 'struct device_node *' but argument is of type 'const struct device_node *' >>> >> >> The warnings are because the of-functions do not use const pointers where they >> should. I had two options: don't use const pointers even if they should be and >> have no warnings or use const pointers and have a correct API. (Third option: >> send patches for of-functions). I chose the second option. > > Maybe a better approach would be a combination of 1 and 3: don't use > const pointers for struct device_node for now and bring the issue up > with the OF maintainers, possibly with patches attached that fix the > problematic functions. Why does this need to be const? Since some DT functions increment refcount the node, I'm not sure that making struct device_node const in general is right thing to do. I do think it should be okay for of_parse_phandle. Rob ^ permalink raw reply [flat|nested] 39+ messages in thread
[parent not found: <50ACED4A.5040806-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>]
* Re: [PATCH v12 2/6] video: add of helper for videomode [not found] ` <50ACED4A.5040806-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> @ 2012-11-21 15:13 ` Thierry Reding 2012-11-22 9:10 ` Steffen Trumtrar 1 sibling, 0 replies; 39+ messages in thread From: Thierry Reding @ 2012-11-21 15:13 UTC (permalink / raw) To: Rob Herring Cc: linux-fbdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org, David Airlie, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org, Florian Tobias Schandinat, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Manjunathappa, Prakash, Valkeinen, Tomi, Laurent Pinchart, Philipp Zabel, Steffen Trumtrar, Guennady Liakhovetski, linux-media-u79uwXL29TY76Z2rM5mHXA@public.gmane.org [-- Attachment #1: Type: text/plain, Size: 3155 bytes --] On Wed, Nov 21, 2012 at 09:03:38AM -0600, Rob Herring wrote: > On 11/21/2012 05:52 AM, Thierry Reding wrote: > > On Wed, Nov 21, 2012 at 12:48:43PM +0100, Steffen Trumtrar wrote: > >> Hi! > >> > >> On Wed, Nov 21, 2012 at 10:12:43AM +0000, Manjunathappa, Prakash wrote: > >>> Hi Steffen, > >>> > >>> On Tue, Nov 20, 2012 at 21:24:52, Steffen Trumtrar wrote: > >>>> +/** > >>>> + * of_get_display_timings - parse all display_timing entries from a device_node > >>>> + * @np: device_node with the subnodes > >>>> + **/ > >>>> +struct display_timings *of_get_display_timings(const struct device_node *np) > >>>> +{ > >>>> + struct device_node *timings_np; > >>>> + struct device_node *entry; > >>>> + struct device_node *native_mode; > >>>> + struct display_timings *disp; > >>>> + > >>>> + if (!np) { > >>>> + pr_err("%s: no devicenode given\n", __func__); > >>>> + return NULL; > >>>> + } > >>>> + > >>>> + timings_np = of_find_node_by_name(np, "display-timings"); > >>> > >>> I get below build warnings on this line > >>> drivers/video/of_display_timing.c: In function 'of_get_display_timings': > >>> drivers/video/of_display_timing.c:109:2: warning: passing argument 1 of 'of_find_node_by_name' discards qualifiers from pointer target type > >>> include/linux/of.h:167:28: note: expected 'struct device_node *' but argument is of type 'const struct device_node *' > >>> > >>>> + * of_display_timings_exists - check if a display-timings node is provided > >>>> + * @np: device_node with the timing > >>>> + **/ > >>>> +int of_display_timings_exists(const struct device_node *np) > >>>> +{ > >>>> + struct device_node *timings_np; > >>>> + > >>>> + if (!np) > >>>> + return -EINVAL; > >>>> + > >>>> + timings_np = of_parse_phandle(np, "display-timings", 0); > >>> > >>> Also here: > >>> drivers/video/of_display_timing.c: In function 'of_display_timings_exists': > >>> drivers/video/of_display_timing.c:209:2: warning: passing argument 1 of 'of_parse_phandle' discards qualifiers from pointer target type > >>> include/linux/of.h:258:28: note: expected 'struct device_node *' but argument is of type 'const struct device_node *' > >>> > >> > >> The warnings are because the of-functions do not use const pointers where they > >> should. I had two options: don't use const pointers even if they should be and > >> have no warnings or use const pointers and have a correct API. (Third option: > >> send patches for of-functions). I chose the second option. > > > > Maybe a better approach would be a combination of 1 and 3: don't use > > const pointers for struct device_node for now and bring the issue up > > with the OF maintainers, possibly with patches attached that fix the > > problematic functions. > > Why does this need to be const? Since some DT functions increment > refcount the node, I'm not sure that making struct device_node const in > general is right thing to do. I do think it should be okay for > of_parse_phandle. I wasn't proposing to do it everywhere but only where possible. If the node is modified in some way then obviously it shouldn't be const. Thierry [-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v12 2/6] video: add of helper for videomode [not found] ` <50ACED4A.5040806-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2012-11-21 15:13 ` Thierry Reding @ 2012-11-22 9:10 ` Steffen Trumtrar 1 sibling, 0 replies; 39+ messages in thread From: Steffen Trumtrar @ 2012-11-22 9:10 UTC (permalink / raw) To: Rob Herring Cc: linux-fbdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org, David Airlie, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org, Florian Tobias Schandinat, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Manjunathappa, Prakash, Valkeinen, Tomi, Laurent Pinchart, Philipp Zabel, Guennady Liakhovetski, linux-media-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Hi! On Wed, Nov 21, 2012 at 09:03:38AM -0600, Rob Herring wrote: > On 11/21/2012 05:52 AM, Thierry Reding wrote: > > On Wed, Nov 21, 2012 at 12:48:43PM +0100, Steffen Trumtrar wrote: > >> Hi! > >> > >> On Wed, Nov 21, 2012 at 10:12:43AM +0000, Manjunathappa, Prakash wrote: > >>> Hi Steffen, > >>> > >>> On Tue, Nov 20, 2012 at 21:24:52, Steffen Trumtrar wrote: > >>>> +/** > >>>> + * of_get_display_timings - parse all display_timing entries from a device_node > >>>> + * @np: device_node with the subnodes > >>>> + **/ > >>>> +struct display_timings *of_get_display_timings(const struct device_node *np) > >>>> +{ > >>>> + struct device_node *timings_np; > >>>> + struct device_node *entry; > >>>> + struct device_node *native_mode; > >>>> + struct display_timings *disp; > >>>> + > >>>> + if (!np) { > >>>> + pr_err("%s: no devicenode given\n", __func__); > >>>> + return NULL; > >>>> + } > >>>> + > >>>> + timings_np = of_find_node_by_name(np, "display-timings"); > >>> > >>> I get below build warnings on this line > >>> drivers/video/of_display_timing.c: In function 'of_get_display_timings': > >>> drivers/video/of_display_timing.c:109:2: warning: passing argument 1 of 'of_find_node_by_name' discards qualifiers from pointer target type > >>> include/linux/of.h:167:28: note: expected 'struct device_node *' but argument is of type 'const struct device_node *' > >>> > >>>> + * of_display_timings_exists - check if a display-timings node is provided > >>>> + * @np: device_node with the timing > >>>> + **/ > >>>> +int of_display_timings_exists(const struct device_node *np) > >>>> +{ > >>>> + struct device_node *timings_np; > >>>> + > >>>> + if (!np) > >>>> + return -EINVAL; > >>>> + > >>>> + timings_np = of_parse_phandle(np, "display-timings", 0); > >>> > >>> Also here: > >>> drivers/video/of_display_timing.c: In function 'of_display_timings_exists': > >>> drivers/video/of_display_timing.c:209:2: warning: passing argument 1 of 'of_parse_phandle' discards qualifiers from pointer target type > >>> include/linux/of.h:258:28: note: expected 'struct device_node *' but argument is of type 'const struct device_node *' > >>> > >> > >> The warnings are because the of-functions do not use const pointers where they > >> should. I had two options: don't use const pointers even if they should be and > >> have no warnings or use const pointers and have a correct API. (Third option: > >> send patches for of-functions). I chose the second option. > > > > Maybe a better approach would be a combination of 1 and 3: don't use > > const pointers for struct device_node for now and bring the issue up > > with the OF maintainers, possibly with patches attached that fix the > > problematic functions. > > Why does this need to be const? Since some DT functions increment > refcount the node, I'm not sure that making struct device_node const in > general is right thing to do. I do think it should be okay for > of_parse_phandle. > Okay, that seems right. I went a little to far with const'ing. I will send a patch for of_parse_phandle as this function does not seem to change the pointer it is given, but returns a new one on which the refcount gets incremented. 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 [flat|nested] 39+ messages in thread
* Re: [PATCH v12 2/6] video: add of helper for videomode [not found] ` <1353426896-6045-3-git-send-email-s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2012-11-21 10:12 ` Manjunathappa, Prakash @ 2012-11-21 12:22 ` Tomi Valkeinen 1 sibling, 0 replies; 39+ messages in thread From: Tomi Valkeinen @ 2012-11-21 12:22 UTC (permalink / raw) To: Steffen Trumtrar Cc: linux-fbdev-u79uwXL29TY76Z2rM5mHXA, kernel-bIcnvbaLZ9MEGnE8C9+IrQ, David Airlie, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ, Florian Tobias Schandinat, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Laurent Pinchart, Philipp Zabel, Guennady Liakhovetski, linux-media-u79uwXL29TY76Z2rM5mHXA [-- Attachment #1: Type: text/plain, Size: 3641 bytes --] On 2012-11-20 17:54, Steffen Trumtrar wrote: > +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-frequency: display clock in Hz > + > +optional properties: > + - hsync-active: Hsync pulse is active low/high/ignored > + - vsync-active: Vsync pulse is active low/high/ignored > + - de-active: Data-Enable pulse is active low/high/ignored > + - pixelclk-inverted: pixelclock is inverted/non-inverted/ignored Inverted related to what? And isn't this a bool? Pixel clock is either normal (whatever that is), or inverted. It can't be "not used". I guess normal case is "pixel data is driven on the rising edge of pixel clock"? If that's common knowledge, I guess it doesn't need to be mentioned. But I always have to verify from the documentation what "normal" means on this particular panel/soc =). > + - interlaced (bool) > + - doublescan (bool) > + > +All the optional properties that are not bool follow the following logic: > + <1>: high active > + <0>: low active > + omitted: not used on hardware Perhaps it's obvious, but no harm being explicit: mention that the bool properties are off is omitted. And I didn't read the rest of the patches yet, so perhaps this is already correct, but as I think this framework is usable without DT also, the meanings of the fields in the structs should be explained in the header files also in case they are not obvious. > +Example: > + > + display-timings { > + native-mode = <&timing0>; > + timing0: 1920p24 { This should still be 1080p24, not 1920p24 =). > + /* 1920x1080p24 */ > + clock-frequency = <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 = <1>; > + }; > + }; > + > diff --git a/include/linux/of_display_timings.h b/include/linux/of_display_timings.h > new file mode 100644 > index 0000000..2b4fa0a > --- /dev/null > +++ b/include/linux/of_display_timings.h > @@ -0,0 +1,20 @@ > +/* > + * Copyright 2012 Steffen Trumtrar <s.trumtrar@pengutronix.de> > + * > + * display timings of helpers > + * > + * This file is released under the GPLv2 > + */ > + > +#ifndef __LINUX_OF_DISPLAY_TIMINGS_H > +#define __LINUX_OF_DISPLAY_TIMINGS_H > + > +#include <linux/display_timing.h> > +#include <linux/of.h> No need to include these, just add "struct ...;". > +#define OF_USE_NATIVE_MODE -1 > + > +struct display_timings *of_get_display_timings(const struct device_node *np); > +int of_display_timings_exists(const struct device_node *np); > + > +#endif > diff --git a/include/linux/of_videomode.h b/include/linux/of_videomode.h > new file mode 100644 > index 0000000..4de5fcc > --- /dev/null > +++ b/include/linux/of_videomode.h > @@ -0,0 +1,18 @@ > +/* > + * Copyright 2012 Steffen Trumtrar <s.trumtrar@pengutronix.de> > + * > + * videomode of-helpers > + * > + * This file is released under the GPLv2 > + */ > + > +#ifndef __LINUX_OF_VIDEOMODE_H > +#define __LINUX_OF_VIDEOMODE_H > + > +#include <linux/videomode.h> > +#include <linux/of.h> Same here. > +int of_get_videomode(const struct device_node *np, struct videomode *vm, > + int index); > + > +#endif /* __LINUX_OF_VIDEOMODE_H */ > Tomi [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 897 bytes --] ^ permalink raw reply [flat|nested] 39+ messages in thread
[parent not found: <1353426896-6045-1-git-send-email-s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>]
* [PATCH v12 3/6] fbmon: add videomode helpers [not found] ` <1353426896-6045-1-git-send-email-s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> @ 2012-11-20 15:54 ` Steffen Trumtrar 2012-11-21 10:09 ` Manjunathappa, Prakash ` (2 more replies) 2012-11-20 15:54 ` [PATCH v12 6/6] drm_modes: add of_videomode helpers Steffen Trumtrar 1 sibling, 3 replies; 39+ messages in thread From: Steffen Trumtrar @ 2012-11-20 15:54 UTC (permalink / raw) To: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ Cc: linux-fbdev-u79uwXL29TY76Z2rM5mHXA, David Airlie, Florian Tobias Schandinat, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Tomi Valkeinen, Laurent Pinchart, kernel-bIcnvbaLZ9MEGnE8C9+IrQ, Steffen Trumtrar, Guennady Liakhovetski, linux-media-u79uwXL29TY76Z2rM5mHXA Add a function to convert from the generic videomode to a fb_videomode. Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de> Acked-by: Thierry Reding <thierry.reding@avionic-design.de> Tested-by: Thierry Reding <thierry.reding@avionic-design.de> Tested-by: Philipp Zabel <p.zabel@pengutronix.de> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- drivers/video/fbmon.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ include/linux/fb.h | 6 ++++++ 2 files changed, 52 insertions(+) diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c index cef6557..c1939a6 100644 --- a/drivers/video/fbmon.c +++ b/drivers/video/fbmon.c @@ -31,6 +31,7 @@ #include <linux/pci.h> #include <linux/slab.h> #include <video/edid.h> +#include <linux/videomode.h> #ifdef CONFIG_PPC_OF #include <asm/prom.h> #include <asm/pci-bridge.h> @@ -1373,6 +1374,51 @@ int fb_get_mode(int flags, u32 val, struct fb_var_screeninfo *var, struct fb_inf kfree(timings); return err; } + +#if IS_ENABLED(CONFIG_VIDEOMODE) +int fb_videomode_from_videomode(const struct videomode *vm, + struct fb_videomode *fbmode) +{ + unsigned int htotal, vtotal; + + 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); + + fbmode->sync = 0; + fbmode->vmode = 0; + 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; + if (vm->de) + fbmode->sync |= FB_SYNC_DATA_ENABLE_HIGH_ACT; + fbmode->flag = 0; + + htotal = vm->hactive + vm->hfront_porch + vm->hback_porch + + vm->hsync_len; + vtotal = vm->vactive + vm->vfront_porch + vm->vback_porch + + vm->vsync_len; + fbmode->refresh = (vm->pixelclock * 1000) / (htotal * vtotal); + + return 0; +} +EXPORT_SYMBOL_GPL(fb_videomode_from_videomode); +#endif + + #else int fb_parse_edid(unsigned char *edid, struct fb_var_screeninfo *var) { diff --git a/include/linux/fb.h b/include/linux/fb.h index c7a9571..920cbe3 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -14,6 +14,7 @@ #include <linux/backlight.h> #include <linux/slab.h> #include <asm/io.h> +#include <linux/videomode.h> struct vm_area_struct; struct fb_info; @@ -714,6 +715,11 @@ extern void fb_destroy_modedb(struct fb_videomode *modedb); extern int fb_find_mode_cvt(struct fb_videomode *mode, int margins, int rb); extern unsigned char *fb_ddc_read(struct i2c_adapter *adapter); +#if IS_ENABLED(CONFIG_VIDEOMODE) +extern int fb_videomode_from_videomode(const struct videomode *vm, + struct fb_videomode *fbmode); +#endif + /* drivers/video/modedb.c */ #define VESA_MODEDB_SIZE 34 extern void fb_var_to_videomode(struct fb_videomode *mode, -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 39+ messages in thread
* RE: [PATCH v12 3/6] fbmon: add videomode helpers 2012-11-20 15:54 ` [PATCH v12 3/6] fbmon: add videomode helpers Steffen Trumtrar @ 2012-11-21 10:09 ` Manjunathappa, Prakash 2012-11-21 11:21 ` Leela Krishna Amudala 2012-11-21 12:27 ` Tomi Valkeinen [not found] ` <1353426896-6045-4-git-send-email-s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2 siblings, 1 reply; 39+ messages in thread From: Manjunathappa, Prakash @ 2012-11-21 10:09 UTC (permalink / raw) To: Steffen Trumtrar, devicetree-discuss@lists.ozlabs.org Cc: Rob Herring, linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, Laurent Pinchart, Thierry Reding, Guennady Liakhovetski, linux-media@vger.kernel.org, Valkeinen, Tomi, Stephen Warren, kernel@pengutronix.de, Florian Tobias Schandinat, David Airlie Hi Steffen, I am trying to add DT support for da8xx-fb driver on top of your patches. Encountered below build error. Sorry for reporting it late. On Tue, Nov 20, 2012 at 21:24:53, Steffen Trumtrar wrote: > Add a function to convert from the generic videomode to a fb_videomode. > > Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> > Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de> > Acked-by: Thierry Reding <thierry.reding@avionic-design.de> > Tested-by: Thierry Reding <thierry.reding@avionic-design.de> > Tested-by: Philipp Zabel <p.zabel@pengutronix.de> > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/video/fbmon.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ > include/linux/fb.h | 6 ++++++ > 2 files changed, 52 insertions(+) > > diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c > index cef6557..c1939a6 100644 > --- a/drivers/video/fbmon.c > +++ b/drivers/video/fbmon.c > @@ -31,6 +31,7 @@ > #include <linux/pci.h> > #include <linux/slab.h> > #include <video/edid.h> > +#include <linux/videomode.h> > #ifdef CONFIG_PPC_OF > #include <asm/prom.h> > #include <asm/pci-bridge.h> > @@ -1373,6 +1374,51 @@ int fb_get_mode(int flags, u32 val, struct fb_var_screeninfo *var, struct fb_inf > kfree(timings); > return err; > } > + > +#if IS_ENABLED(CONFIG_VIDEOMODE) > +int fb_videomode_from_videomode(const struct videomode *vm, > + struct fb_videomode *fbmode) > +{ > + unsigned int htotal, vtotal; > + > + 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); > + > + fbmode->sync = 0; > + fbmode->vmode = 0; > + 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; > + if (vm->de) > + fbmode->sync |= FB_SYNC_DATA_ENABLE_HIGH_ACT; "FB_SYNC_DATA_ENABLE_HIGH_ACT" seems to be mxsfb specific flag, I am getting build error on this. Please let me know if I am missing something. Thanks, Prakash > + fbmode->flag = 0; > + > + htotal = vm->hactive + vm->hfront_porch + vm->hback_porch + > + vm->hsync_len; > + vtotal = vm->vactive + vm->vfront_porch + vm->vback_porch + > + vm->vsync_len; > + fbmode->refresh = (vm->pixelclock * 1000) / (htotal * vtotal); > + > + return 0; > +} > +EXPORT_SYMBOL_GPL(fb_videomode_from_videomode); > +#endif > + > + > #else > int fb_parse_edid(unsigned char *edid, struct fb_var_screeninfo *var) > { > diff --git a/include/linux/fb.h b/include/linux/fb.h > index c7a9571..920cbe3 100644 > --- a/include/linux/fb.h > +++ b/include/linux/fb.h > @@ -14,6 +14,7 @@ > #include <linux/backlight.h> > #include <linux/slab.h> > #include <asm/io.h> > +#include <linux/videomode.h> > > struct vm_area_struct; > struct fb_info; > @@ -714,6 +715,11 @@ extern void fb_destroy_modedb(struct fb_videomode *modedb); > extern int fb_find_mode_cvt(struct fb_videomode *mode, int margins, int rb); > extern unsigned char *fb_ddc_read(struct i2c_adapter *adapter); > > +#if IS_ENABLED(CONFIG_VIDEOMODE) > +extern int fb_videomode_from_videomode(const struct videomode *vm, > + struct fb_videomode *fbmode); > +#endif > + > /* drivers/video/modedb.c */ > #define VESA_MODEDB_SIZE 34 > extern void fb_var_to_videomode(struct fb_videomode *mode, > -- > 1.7.10.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v12 3/6] fbmon: add videomode helpers 2012-11-21 10:09 ` Manjunathappa, Prakash @ 2012-11-21 11:21 ` Leela Krishna Amudala 2012-11-21 11:58 ` Steffen Trumtrar 0 siblings, 1 reply; 39+ messages in thread From: Leela Krishna Amudala @ 2012-11-21 11:21 UTC (permalink / raw) To: Manjunathappa, Prakash Cc: Steffen Trumtrar, devicetree-discuss@lists.ozlabs.org, linux-fbdev@vger.kernel.org, David Airlie, Florian Tobias Schandinat, dri-devel@lists.freedesktop.org, Valkeinen, Tomi, Laurent Pinchart, kernel@pengutronix.de, Guennady Liakhovetski, linux-media@vger.kernel.org Yes, Even I got the same build error. later I fixed it by including "#include <linux/mxsfb.h>" Best Wishes, Leela Krishna. On Wed, Nov 21, 2012 at 3:39 PM, Manjunathappa, Prakash <prakash.pm@ti.com> wrote: > Hi Steffen, > > I am trying to add DT support for da8xx-fb driver on top of your patches. > Encountered below build error. Sorry for reporting it late. > > On Tue, Nov 20, 2012 at 21:24:53, Steffen Trumtrar wrote: >> Add a function to convert from the generic videomode to a fb_videomode. >> >> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> >> Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de> >> Acked-by: Thierry Reding <thierry.reding@avionic-design.de> >> Tested-by: Thierry Reding <thierry.reding@avionic-design.de> >> Tested-by: Philipp Zabel <p.zabel@pengutronix.de> >> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> >> --- >> drivers/video/fbmon.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ >> include/linux/fb.h | 6 ++++++ >> 2 files changed, 52 insertions(+) >> >> diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c >> index cef6557..c1939a6 100644 >> --- a/drivers/video/fbmon.c >> +++ b/drivers/video/fbmon.c >> @@ -31,6 +31,7 @@ >> #include <linux/pci.h> >> #include <linux/slab.h> >> #include <video/edid.h> >> +#include <linux/videomode.h> >> #ifdef CONFIG_PPC_OF >> #include <asm/prom.h> >> #include <asm/pci-bridge.h> >> @@ -1373,6 +1374,51 @@ int fb_get_mode(int flags, u32 val, struct fb_var_screeninfo *var, struct fb_inf >> kfree(timings); >> return err; >> } >> + >> +#if IS_ENABLED(CONFIG_VIDEOMODE) >> +int fb_videomode_from_videomode(const struct videomode *vm, >> + struct fb_videomode *fbmode) >> +{ >> + unsigned int htotal, vtotal; >> + >> + 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); >> + >> + fbmode->sync = 0; >> + fbmode->vmode = 0; >> + 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; >> + if (vm->de) >> + fbmode->sync |= FB_SYNC_DATA_ENABLE_HIGH_ACT; > > "FB_SYNC_DATA_ENABLE_HIGH_ACT" seems to be mxsfb specific flag, I am getting > build error on this. Please let me know if I am missing something. > > Thanks, > Prakash > >> + fbmode->flag = 0; >> + >> + htotal = vm->hactive + vm->hfront_porch + vm->hback_porch + >> + vm->hsync_len; >> + vtotal = vm->vactive + vm->vfront_porch + vm->vback_porch + >> + vm->vsync_len; >> + fbmode->refresh = (vm->pixelclock * 1000) / (htotal * vtotal); >> + >> + return 0; >> +} >> +EXPORT_SYMBOL_GPL(fb_videomode_from_videomode); >> +#endif >> + >> + >> #else >> int fb_parse_edid(unsigned char *edid, struct fb_var_screeninfo *var) >> { >> diff --git a/include/linux/fb.h b/include/linux/fb.h >> index c7a9571..920cbe3 100644 >> --- a/include/linux/fb.h >> +++ b/include/linux/fb.h >> @@ -14,6 +14,7 @@ >> #include <linux/backlight.h> >> #include <linux/slab.h> >> #include <asm/io.h> >> +#include <linux/videomode.h> >> >> struct vm_area_struct; >> struct fb_info; >> @@ -714,6 +715,11 @@ extern void fb_destroy_modedb(struct fb_videomode *modedb); >> extern int fb_find_mode_cvt(struct fb_videomode *mode, int margins, int rb); >> extern unsigned char *fb_ddc_read(struct i2c_adapter *adapter); >> >> +#if IS_ENABLED(CONFIG_VIDEOMODE) >> +extern int fb_videomode_from_videomode(const struct videomode *vm, >> + struct fb_videomode *fbmode); >> +#endif >> + >> /* drivers/video/modedb.c */ >> #define VESA_MODEDB_SIZE 34 >> extern void fb_var_to_videomode(struct fb_videomode *mode, >> -- >> 1.7.10.4 >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html >> > > _______________________________________________ > devicetree-discuss mailing list > devicetree-discuss@lists.ozlabs.org > https://lists.ozlabs.org/listinfo/devicetree-discuss ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v12 3/6] fbmon: add videomode helpers 2012-11-21 11:21 ` Leela Krishna Amudala @ 2012-11-21 11:58 ` Steffen Trumtrar 0 siblings, 0 replies; 39+ messages in thread From: Steffen Trumtrar @ 2012-11-21 11:58 UTC (permalink / raw) To: Leela Krishna Amudala Cc: Manjunathappa, Prakash, devicetree-discuss@lists.ozlabs.org, linux-fbdev@vger.kernel.org, David Airlie, Florian Tobias Schandinat, dri-devel@lists.freedesktop.org, Valkeinen, Tomi, Laurent Pinchart, kernel@pengutronix.de, Guennady Liakhovetski, linux-media@vger.kernel.org Hi! On Wed, Nov 21, 2012 at 04:39:01PM +0530, Leela Krishna Amudala wrote: > Yes, > Even I got the same build error. > later I fixed it by including "#include <linux/mxsfb.h>" > > Best Wishes, > Leela Krishna. > > On Wed, Nov 21, 2012 at 3:39 PM, Manjunathappa, Prakash > <prakash.pm@ti.com> wrote: > > Hi Steffen, > > > > I am trying to add DT support for da8xx-fb driver on top of your patches. > > Encountered below build error. Sorry for reporting it late. > > > > On Tue, Nov 20, 2012 at 21:24:53, Steffen Trumtrar wrote: > >> Add a function to convert from the generic videomode to a fb_videomode. > >> > >> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> > >> Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de> > >> Acked-by: Thierry Reding <thierry.reding@avionic-design.de> > >> Tested-by: Thierry Reding <thierry.reding@avionic-design.de> > >> Tested-by: Philipp Zabel <p.zabel@pengutronix.de> > >> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > >> --- > >> drivers/video/fbmon.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ > >> include/linux/fb.h | 6 ++++++ > >> 2 files changed, 52 insertions(+) > >> > >> diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c > >> index cef6557..c1939a6 100644 > >> --- a/drivers/video/fbmon.c > >> +++ b/drivers/video/fbmon.c > >> @@ -31,6 +31,7 @@ > >> #include <linux/pci.h> > >> #include <linux/slab.h> > >> #include <video/edid.h> > >> +#include <linux/videomode.h> > >> #ifdef CONFIG_PPC_OF > >> #include <asm/prom.h> > >> #include <asm/pci-bridge.h> > >> @@ -1373,6 +1374,51 @@ int fb_get_mode(int flags, u32 val, struct fb_var_screeninfo *var, struct fb_inf > >> kfree(timings); > >> return err; > >> } > >> + > >> +#if IS_ENABLED(CONFIG_VIDEOMODE) > >> +int fb_videomode_from_videomode(const struct videomode *vm, > >> + struct fb_videomode *fbmode) > >> +{ > >> + unsigned int htotal, vtotal; > >> + > >> + 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); > >> + > >> + fbmode->sync = 0; > >> + fbmode->vmode = 0; > >> + 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; > >> + if (vm->de) > >> + fbmode->sync |= FB_SYNC_DATA_ENABLE_HIGH_ACT; > > > > "FB_SYNC_DATA_ENABLE_HIGH_ACT" seems to be mxsfb specific flag, I am getting > > build error on this. Please let me know if I am missing something. > > > > Thanks, > > Prakash > > I compile-tested the series and didn't have that error. But obviously I should have. As this is a mxsfs flag, I will throw it out. 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 [flat|nested] 39+ messages in thread
* Re: [PATCH v12 3/6] fbmon: add videomode helpers 2012-11-20 15:54 ` [PATCH v12 3/6] fbmon: add videomode helpers Steffen Trumtrar 2012-11-21 10:09 ` Manjunathappa, Prakash @ 2012-11-21 12:27 ` Tomi Valkeinen [not found] ` <1353426896-6045-4-git-send-email-s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2 siblings, 0 replies; 39+ messages in thread From: Tomi Valkeinen @ 2012-11-21 12:27 UTC (permalink / raw) To: Steffen Trumtrar Cc: devicetree-discuss, Rob Herring, linux-fbdev, dri-devel, Laurent Pinchart, Thierry Reding, Guennady Liakhovetski, linux-media, Stephen Warren, kernel, Florian Tobias Schandinat, David Airlie [-- Attachment #1: Type: text/plain, Size: 969 bytes --] On 2012-11-20 17:54, Steffen Trumtrar wrote: > diff --git a/include/linux/fb.h b/include/linux/fb.h > index c7a9571..920cbe3 100644 > --- a/include/linux/fb.h > +++ b/include/linux/fb.h > @@ -14,6 +14,7 @@ > #include <linux/backlight.h> > #include <linux/slab.h> > #include <asm/io.h> > +#include <linux/videomode.h> No need for this, just add "struct xxx;". > struct vm_area_struct; > struct fb_info; > @@ -714,6 +715,11 @@ extern void fb_destroy_modedb(struct fb_videomode *modedb); > extern int fb_find_mode_cvt(struct fb_videomode *mode, int margins, int rb); > extern unsigned char *fb_ddc_read(struct i2c_adapter *adapter); > > +#if IS_ENABLED(CONFIG_VIDEOMODE) > +extern int fb_videomode_from_videomode(const struct videomode *vm, > + struct fb_videomode *fbmode); > +#endif > + > /* drivers/video/modedb.c */ > #define VESA_MODEDB_SIZE 34 > extern void fb_var_to_videomode(struct fb_videomode *mode, > [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 897 bytes --] ^ permalink raw reply [flat|nested] 39+ messages in thread
[parent not found: <1353426896-6045-4-git-send-email-s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>]
* Re: [PATCH v12 3/6] fbmon: add videomode helpers [not found] ` <1353426896-6045-4-git-send-email-s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> @ 2012-11-21 22:02 ` Laurent Pinchart 2012-11-22 6:20 ` Sascha Hauer 0 siblings, 1 reply; 39+ messages in thread From: Laurent Pinchart @ 2012-11-21 22:02 UTC (permalink / raw) To: Steffen Trumtrar Cc: linux-fbdev-u79uwXL29TY76Z2rM5mHXA, David Airlie, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ, Florian Tobias Schandinat, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Tomi Valkeinen, kernel-bIcnvbaLZ9MEGnE8C9+IrQ, Guennady Liakhovetski, linux-media-u79uwXL29TY76Z2rM5mHXA Hi Steffen, Sorry, I've just found another small bug below. On Tuesday 20 November 2012 16:54:53 Steffen Trumtrar wrote: > Add a function to convert from the generic videomode to a fb_videomode. > > Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> > Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de> > Acked-by: Thierry Reding <thierry.reding@avionic-design.de> > Tested-by: Thierry Reding <thierry.reding@avionic-design.de> > Tested-by: Philipp Zabel <p.zabel@pengutronix.de> > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/video/fbmon.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ > include/linux/fb.h | 6 ++++++ > 2 files changed, 52 insertions(+) > > diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c > index cef6557..c1939a6 100644 > --- a/drivers/video/fbmon.c > +++ b/drivers/video/fbmon.c > @@ -31,6 +31,7 @@ > #include <linux/pci.h> > #include <linux/slab.h> > #include <video/edid.h> > +#include <linux/videomode.h> > #ifdef CONFIG_PPC_OF > #include <asm/prom.h> > #include <asm/pci-bridge.h> > @@ -1373,6 +1374,51 @@ int fb_get_mode(int flags, u32 val, struct > fb_var_screeninfo *var, struct fb_inf kfree(timings); > return err; > } > + > +#if IS_ENABLED(CONFIG_VIDEOMODE) > +int fb_videomode_from_videomode(const struct videomode *vm, > + struct fb_videomode *fbmode) > +{ > + unsigned int htotal, vtotal; > + > + 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); > + > + fbmode->sync = 0; > + fbmode->vmode = 0; > + 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; > + if (vm->de) > + fbmode->sync |= FB_SYNC_DATA_ENABLE_HIGH_ACT; > + fbmode->flag = 0; > + > + htotal = vm->hactive + vm->hfront_porch + vm->hback_porch + > + vm->hsync_len; > + vtotal = vm->vactive + vm->vfront_porch + vm->vback_porch + > + vm->vsync_len; > + fbmode->refresh = (vm->pixelclock * 1000) / (htotal * vtotal); This will fail if vm->pixelclock >= ((1 << 32) / 1000). The easiest solution is probably to use 64-bit computation. > + > + return 0; > +} > +EXPORT_SYMBOL_GPL(fb_videomode_from_videomode); > +#endif > + > + > #else > int fb_parse_edid(unsigned char *edid, struct fb_var_screeninfo *var) > { > diff --git a/include/linux/fb.h b/include/linux/fb.h > index c7a9571..920cbe3 100644 > --- a/include/linux/fb.h > +++ b/include/linux/fb.h > @@ -14,6 +14,7 @@ > #include <linux/backlight.h> > #include <linux/slab.h> > #include <asm/io.h> > +#include <linux/videomode.h> > > struct vm_area_struct; > struct fb_info; > @@ -714,6 +715,11 @@ extern void fb_destroy_modedb(struct fb_videomode > *modedb); extern int fb_find_mode_cvt(struct fb_videomode *mode, int > margins, int rb); extern unsigned char *fb_ddc_read(struct i2c_adapter > *adapter); > > +#if IS_ENABLED(CONFIG_VIDEOMODE) > +extern int fb_videomode_from_videomode(const struct videomode *vm, > + struct fb_videomode *fbmode); > +#endif > + > /* drivers/video/modedb.c */ > #define VESA_MODEDB_SIZE 34 > extern void fb_var_to_videomode(struct fb_videomode *mode, -- Regards, Laurent Pinchart ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v12 3/6] fbmon: add videomode helpers 2012-11-21 22:02 ` Laurent Pinchart @ 2012-11-22 6:20 ` Sascha Hauer [not found] ` <20121122062000.GW10369-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 0 siblings, 1 reply; 39+ messages in thread From: Sascha Hauer @ 2012-11-22 6:20 UTC (permalink / raw) To: Laurent Pinchart Cc: linux-fbdev-u79uwXL29TY76Z2rM5mHXA, David Airlie, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ, Florian Tobias Schandinat, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Tomi Valkeinen, kernel-bIcnvbaLZ9MEGnE8C9+IrQ, Steffen Trumtrar, Guennady Liakhovetski, linux-media-u79uwXL29TY76Z2rM5mHXA Hi Laurent, On Wed, Nov 21, 2012 at 11:02:44PM +0100, Laurent Pinchart wrote: > Hi Steffen, > > > + > > + htotal = vm->hactive + vm->hfront_porch + vm->hback_porch + > > + vm->hsync_len; > > + vtotal = vm->vactive + vm->vfront_porch + vm->vback_porch + > > + vm->vsync_len; > > + fbmode->refresh = (vm->pixelclock * 1000) / (htotal * vtotal); > > This will fail if vm->pixelclock >= ((1 << 32) / 1000). The easiest solution > is probably to use 64-bit computation. You have displays with a pixelclock > 4GHz? Sascha -- 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 [flat|nested] 39+ messages in thread
[parent not found: <20121122062000.GW10369-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>]
* Re: [PATCH v12 3/6] fbmon: add videomode helpers [not found] ` <20121122062000.GW10369-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> @ 2012-11-22 8:50 ` Laurent Pinchart 2012-11-22 8:53 ` Sascha Hauer 0 siblings, 1 reply; 39+ messages in thread From: Laurent Pinchart @ 2012-11-22 8:50 UTC (permalink / raw) To: Sascha Hauer Cc: linux-fbdev-u79uwXL29TY76Z2rM5mHXA, David Airlie, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ, Florian Tobias Schandinat, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Tomi Valkeinen, kernel-bIcnvbaLZ9MEGnE8C9+IrQ, Steffen Trumtrar, Guennady Liakhovetski, linux-media-u79uwXL29TY76Z2rM5mHXA Hi Sascha, On Thursday 22 November 2012 07:20:00 Sascha Hauer wrote: > On Wed, Nov 21, 2012 at 11:02:44PM +0100, Laurent Pinchart wrote: > > Hi Steffen, > > > > > + > > > + htotal = vm->hactive + vm->hfront_porch + vm->hback_porch + > > > + vm->hsync_len; > > > + vtotal = vm->vactive + vm->vfront_porch + vm->vback_porch + > > > + vm->vsync_len; > > > + fbmode->refresh = (vm->pixelclock * 1000) / (htotal * vtotal); > > > > This will fail if vm->pixelclock >= ((1 << 32) / 1000). The easiest > > solution is probably to use 64-bit computation. > > You have displays with a pixelclock > 4GHz? vm->pixelclock is expressed in Hz. vm->pixelclock * 1000 will thus overflow if the clock frequency is >= ~4.3 MHz. I have displays with a clock frequency higher than that :-) -- Regards, Laurent Pinchart ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v12 3/6] fbmon: add videomode helpers 2012-11-22 8:50 ` Laurent Pinchart @ 2012-11-22 8:53 ` Sascha Hauer [not found] ` <20121122085342.GB10369-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 0 siblings, 1 reply; 39+ messages in thread From: Sascha Hauer @ 2012-11-22 8:53 UTC (permalink / raw) To: Laurent Pinchart Cc: linux-fbdev-u79uwXL29TY76Z2rM5mHXA, David Airlie, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ, Florian Tobias Schandinat, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Tomi Valkeinen, kernel-bIcnvbaLZ9MEGnE8C9+IrQ, Steffen Trumtrar, Guennady Liakhovetski, linux-media-u79uwXL29TY76Z2rM5mHXA On Thu, Nov 22, 2012 at 09:50:10AM +0100, Laurent Pinchart wrote: > Hi Sascha, > > On Thursday 22 November 2012 07:20:00 Sascha Hauer wrote: > > On Wed, Nov 21, 2012 at 11:02:44PM +0100, Laurent Pinchart wrote: > > > Hi Steffen, > > > > > > > + > > > > + htotal = vm->hactive + vm->hfront_porch + vm->hback_porch + > > > > + vm->hsync_len; > > > > + vtotal = vm->vactive + vm->vfront_porch + vm->vback_porch + > > > > + vm->vsync_len; > > > > + fbmode->refresh = (vm->pixelclock * 1000) / (htotal * vtotal); > > > > > > This will fail if vm->pixelclock >= ((1 << 32) / 1000). The easiest > > > solution is probably to use 64-bit computation. > > > > You have displays with a pixelclock > 4GHz? > > vm->pixelclock is expressed in Hz. vm->pixelclock * 1000 will thus overflow if > the clock frequency is >= ~4.3 MHz. I have displays with a clock frequency > higher than that :-) If vm->pixelclock is in Hz, then the * 1000 above is wrong. Sascha -- 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 [flat|nested] 39+ messages in thread
[parent not found: <20121122085342.GB10369-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>]
* Re: [PATCH v12 3/6] fbmon: add videomode helpers [not found] ` <20121122085342.GB10369-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> @ 2012-11-22 9:07 ` Laurent Pinchart 2012-11-22 11:23 ` Steffen Trumtrar 0 siblings, 1 reply; 39+ messages in thread From: Laurent Pinchart @ 2012-11-22 9:07 UTC (permalink / raw) To: Sascha Hauer Cc: linux-fbdev-u79uwXL29TY76Z2rM5mHXA, David Airlie, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ, Florian Tobias Schandinat, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Tomi Valkeinen, kernel-bIcnvbaLZ9MEGnE8C9+IrQ, Steffen Trumtrar, Guennady Liakhovetski, linux-media-u79uwXL29TY76Z2rM5mHXA On Thursday 22 November 2012 09:53:42 Sascha Hauer wrote: > On Thu, Nov 22, 2012 at 09:50:10AM +0100, Laurent Pinchart wrote: > > On Thursday 22 November 2012 07:20:00 Sascha Hauer wrote: > > > On Wed, Nov 21, 2012 at 11:02:44PM +0100, Laurent Pinchart wrote: > > > > Hi Steffen, > > > > > > > > > + > > > > > + htotal = vm->hactive + vm->hfront_porch + vm->hback_porch + > > > > > + vm->hsync_len; > > > > > + vtotal = vm->vactive + vm->vfront_porch + vm->vback_porch + > > > > > + vm->vsync_len; > > > > > + fbmode->refresh = (vm->pixelclock * 1000) / (htotal * vtotal); > > > > > > > > This will fail if vm->pixelclock >= ((1 << 32) / 1000). The easiest > > > > solution is probably to use 64-bit computation. > > > > > > You have displays with a pixelclock > 4GHz? > > > > vm->pixelclock is expressed in Hz. vm->pixelclock * 1000 will thus > > overflow if the clock frequency is >= ~4.3 MHz. I have displays with a > > clock frequency higher than that :-) > > If vm->pixelclock is in Hz, then the * 1000 above is wrong. My bad, I though refresh was expressed in mHz. So yes, the above computation is wrong. BTW it seems that the refreshrate field in struct videomode isn't used. It should then be removed. I've just realized that the struct videomode fields are not documented. kerneldoc in include/linux/videomode.h would be a good addition. -- Regards, Laurent Pinchart ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v12 3/6] fbmon: add videomode helpers 2012-11-22 9:07 ` Laurent Pinchart @ 2012-11-22 11:23 ` Steffen Trumtrar 0 siblings, 0 replies; 39+ messages in thread From: Steffen Trumtrar @ 2012-11-22 11:23 UTC (permalink / raw) To: Laurent Pinchart Cc: linux-fbdev-u79uwXL29TY76Z2rM5mHXA, David Airlie, Sascha Hauer, Florian Tobias Schandinat, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Guennady Liakhovetski, Tomi Valkeinen, kernel-bIcnvbaLZ9MEGnE8C9+IrQ, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ, linux-media-u79uwXL29TY76Z2rM5mHXA On Thu, Nov 22, 2012 at 10:07:07AM +0100, Laurent Pinchart wrote: > On Thursday 22 November 2012 09:53:42 Sascha Hauer wrote: > > On Thu, Nov 22, 2012 at 09:50:10AM +0100, Laurent Pinchart wrote: > > > On Thursday 22 November 2012 07:20:00 Sascha Hauer wrote: > > > > On Wed, Nov 21, 2012 at 11:02:44PM +0100, Laurent Pinchart wrote: > > > > > Hi Steffen, > > > > > > > > > > > + > > > > > > + htotal = vm->hactive + vm->hfront_porch + vm->hback_porch + > > > > > > + vm->hsync_len; > > > > > > + vtotal = vm->vactive + vm->vfront_porch + vm->vback_porch + > > > > > > + vm->vsync_len; > > > > > > + fbmode->refresh = (vm->pixelclock * 1000) / (htotal * vtotal); > > > > > > > > > > This will fail if vm->pixelclock >= ((1 << 32) / 1000). The easiest > > > > > solution is probably to use 64-bit computation. > > > > > > > > You have displays with a pixelclock > 4GHz? > > > > > > vm->pixelclock is expressed in Hz. vm->pixelclock * 1000 will thus > > > overflow if the clock frequency is >= ~4.3 MHz. I have displays with a > > > clock frequency higher than that :-) > > > > If vm->pixelclock is in Hz, then the * 1000 above is wrong. > > My bad, I though refresh was expressed in mHz. So yes, the above computation > is wrong. > Okay. I will fix that with the next version... > BTW it seems that the refreshrate field in struct videomode isn't used. It > should then be removed. > ...and remove this field. > I've just realized that the struct videomode fields are not documented. > kerneldoc in include/linux/videomode.h would be a good addition. > 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 [flat|nested] 39+ messages in thread
* [PATCH v12 6/6] drm_modes: add of_videomode helpers [not found] ` <1353426896-6045-1-git-send-email-s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2012-11-20 15:54 ` [PATCH v12 3/6] fbmon: add videomode helpers Steffen Trumtrar @ 2012-11-20 15:54 ` Steffen Trumtrar [not found] ` <1353426896-6045-7-git-send-email-s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 1 sibling, 1 reply; 39+ messages in thread From: Steffen Trumtrar @ 2012-11-20 15:54 UTC (permalink / raw) To: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ Cc: linux-fbdev-u79uwXL29TY76Z2rM5mHXA, David Airlie, Florian Tobias Schandinat, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Tomi Valkeinen, Laurent Pinchart, kernel-bIcnvbaLZ9MEGnE8C9+IrQ, Steffen Trumtrar, Guennady Liakhovetski, linux-media-u79uwXL29TY76Z2rM5mHXA Add helper to get drm_display_mode from devicetree. Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de> Acked-by: Thierry Reding <thierry.reding@avionic-design.de> Tested-by: Thierry Reding <thierry.reding@avionic-design.de> Tested-by: Philipp Zabel <p.zabel@pengutronix.de> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- drivers/gpu/drm/drm_modes.c | 35 ++++++++++++++++++++++++++++++++++- include/drm/drmP.h | 6 ++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index 0073b27..04feef8 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -35,7 +35,8 @@ #include <linux/export.h> #include <drm/drmP.h> #include <drm/drm_crtc.h> -#include <linux/videomode.h> +#include <linux/of.h> +#include <linux/of_videomode.h> /** * drm_mode_debug_printmodeline - debug print a mode @@ -541,6 +542,38 @@ int drm_display_mode_from_videomode(const struct videomode *vm, EXPORT_SYMBOL_GPL(drm_display_mode_from_videomode); #endif +#if IS_ENABLED(CONFIG_OF_VIDEOMODE) +/** + * of_get_drm_display_mode - get a drm_display_mode from devicetree + * @np: device_node with the timing specification + * @dmode: will be set to the return value + * @index: index into the list of display timings in devicetree + * + * This function is expensive and should only be used, if only one mode is to be + * read from DT. To get multiple modes start with of_get_display_timings and + * work with that instead. + */ +int of_get_drm_display_mode(const struct device_node *np, + struct drm_display_mode *dmode, unsigned int index) +{ + struct videomode vm; + int ret; + + ret = of_get_videomode(np, &vm, index); + if (ret) + return ret; + + drm_display_mode_from_videomode(&vm, dmode); + + pr_info("%s: got %dx%d display mode from %s\n", __func__, vm.hactive, + vm.vactive, np->name); + drm_mode_debug_printmodeline(dmode); + + return 0; +} +EXPORT_SYMBOL_GPL(of_get_drm_display_mode); +#endif + /** * drm_mode_set_name - set the name on a mode * @mode: name will be set in this mode diff --git a/include/drm/drmP.h b/include/drm/drmP.h index de2f6cf..377280f 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -56,6 +56,7 @@ #include <linux/cdev.h> #include <linux/mutex.h> #include <linux/slab.h> +#include <linux/of.h> #include <linux/videomode.h> #if defined(__alpha__) || defined(__powerpc__) #include <asm/pgtable.h> /* For pte_wrprotect */ @@ -1459,6 +1460,11 @@ drm_mode_create_from_cmdline_mode(struct drm_device *dev, extern int drm_display_mode_from_videomode(const struct videomode *vm, struct drm_display_mode *dmode); #endif +#if IS_ENABLED(CONFIG_OF_VIDEOMODE) +extern int of_get_drm_display_mode(const struct device_node *np, + struct drm_display_mode *dmode, + unsigned int index); +#endif /* Modesetting support */ extern void drm_vblank_pre_modeset(struct drm_device *dev, int crtc); -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 39+ messages in thread
[parent not found: <1353426896-6045-7-git-send-email-s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>]
* Re: [PATCH v12 6/6] drm_modes: add of_videomode helpers [not found] ` <1353426896-6045-7-git-send-email-s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> @ 2012-11-21 12:52 ` Tomi Valkeinen 0 siblings, 0 replies; 39+ messages in thread From: Tomi Valkeinen @ 2012-11-21 12:52 UTC (permalink / raw) To: Steffen Trumtrar Cc: linux-fbdev-u79uwXL29TY76Z2rM5mHXA, David Airlie, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ, Florian Tobias Schandinat, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Laurent Pinchart, kernel-bIcnvbaLZ9MEGnE8C9+IrQ, Guennady Liakhovetski, linux-media-u79uwXL29TY76Z2rM5mHXA [-- Attachment #1: Type: text/plain, Size: 1654 bytes --] On 2012-11-20 17:54, Steffen Trumtrar wrote: > Add helper to get drm_display_mode from devicetree. > > Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> > Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de> > Acked-by: Thierry Reding <thierry.reding@avionic-design.de> > Tested-by: Thierry Reding <thierry.reding@avionic-design.de> > Tested-by: Philipp Zabel <p.zabel@pengutronix.de> > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/gpu/drm/drm_modes.c | 35 ++++++++++++++++++++++++++++++++++- > include/drm/drmP.h | 6 ++++++ > 2 files changed, 40 insertions(+), 1 deletion(-) > > diff --git a/include/drm/drmP.h b/include/drm/drmP.h > index de2f6cf..377280f 100644 > --- a/include/drm/drmP.h > +++ b/include/drm/drmP.h > @@ -56,6 +56,7 @@ > #include <linux/cdev.h> > #include <linux/mutex.h> > #include <linux/slab.h> > +#include <linux/of.h> > #include <linux/videomode.h> > #if defined(__alpha__) || defined(__powerpc__) > #include <asm/pgtable.h> /* For pte_wrprotect */ > @@ -1459,6 +1460,11 @@ drm_mode_create_from_cmdline_mode(struct drm_device *dev, > extern int drm_display_mode_from_videomode(const struct videomode *vm, > struct drm_display_mode *dmode); > #endif > +#if IS_ENABLED(CONFIG_OF_VIDEOMODE) > +extern int of_get_drm_display_mode(const struct device_node *np, > + struct drm_display_mode *dmode, > + unsigned int index); > +#endif > > /* Modesetting support */ > extern void drm_vblank_pre_modeset(struct drm_device *dev, int crtc); And the same comments here also. Tomi [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 897 bytes --] ^ permalink raw reply [flat|nested] 39+ messages in thread
* [PATCH v12 4/6] fbmon: add of_videomode helpers 2012-11-20 15:54 [PATCH v12 0/6] of: add display helper Steffen Trumtrar ` (2 preceding siblings ...) [not found] ` <1353426896-6045-1-git-send-email-s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> @ 2012-11-20 15:54 ` Steffen Trumtrar [not found] ` <1353426896-6045-5-git-send-email-s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2012-11-20 15:54 ` [PATCH v12 5/6] drm_modes: add videomode helpers Steffen Trumtrar 2012-11-20 16:13 ` [PATCH v12 0/6] of: add display helper Laurent Pinchart 5 siblings, 1 reply; 39+ messages in thread From: Steffen Trumtrar @ 2012-11-20 15:54 UTC (permalink / raw) To: devicetree-discuss Cc: Steffen Trumtrar, Rob Herring, linux-fbdev, dri-devel, Laurent Pinchart, Thierry Reding, Guennady Liakhovetski, linux-media, Tomi Valkeinen, Stephen Warren, kernel, Florian Tobias Schandinat, David Airlie Add helper to get fb_videomode from devicetree. Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de> Acked-by: Thierry Reding <thierry.reding@avionic-design.de> Tested-by: Thierry Reding <thierry.reding@avionic-design.de> Tested-by: Philipp Zabel <p.zabel@pengutronix.de> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- drivers/video/fbmon.c | 42 +++++++++++++++++++++++++++++++++++++++++- include/linux/fb.h | 7 +++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c index c1939a6..16c353c 100644 --- a/drivers/video/fbmon.c +++ b/drivers/video/fbmon.c @@ -31,7 +31,7 @@ #include <linux/pci.h> #include <linux/slab.h> #include <video/edid.h> -#include <linux/videomode.h> +#include <linux/of_videomode.h> #ifdef CONFIG_PPC_OF #include <asm/prom.h> #include <asm/pci-bridge.h> @@ -1418,6 +1418,46 @@ int fb_videomode_from_videomode(const struct videomode *vm, EXPORT_SYMBOL_GPL(fb_videomode_from_videomode); #endif +#if IS_ENABLED(CONFIG_OF_VIDEOMODE) +static inline void dump_fb_videomode(const struct fb_videomode *m) +{ + pr_debug("fb_videomode = %ux%u@%uHz (%ukHz) %u %u %u %u %u %u %u %u %u\n", + m->xres, m->yres, m->refresh, 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); +} + +/** + * of_get_fb_videomode - get a fb_videomode from devicetree + * @np: device_node with the timing specification + * @fb: will be set to the return value + * @index: index into the list of display timings in devicetree + * + * DESCRIPTION: + * This function is expensive and should only be used, if only one mode is to be + * read from DT. To get multiple modes start with of_get_display_timings ond + * work with that instead. + */ +int of_get_fb_videomode(const struct device_node *np, struct fb_videomode *fb, + unsigned int index) +{ + struct videomode vm; + int ret; + + ret = of_get_videomode(np, &vm, index); + if (ret) + return ret; + + fb_videomode_from_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_fb_videomode); +#endif #else int fb_parse_edid(unsigned char *edid, struct fb_var_screeninfo *var) diff --git a/include/linux/fb.h b/include/linux/fb.h index 920cbe3..41b5e49 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -15,6 +15,8 @@ #include <linux/slab.h> #include <asm/io.h> #include <linux/videomode.h> +#include <linux/of.h> +#include <linux/of_videomode.h> struct vm_area_struct; struct fb_info; @@ -715,6 +717,11 @@ extern void fb_destroy_modedb(struct fb_videomode *modedb); extern int fb_find_mode_cvt(struct fb_videomode *mode, int margins, int rb); extern unsigned char *fb_ddc_read(struct i2c_adapter *adapter); +#if IS_ENABLED(CONFIG_OF_VIDEOMODE) +extern int of_get_fb_videomode(const struct device_node *np, + struct fb_videomode *fb, + unsigned int index); +#endif #if IS_ENABLED(CONFIG_VIDEOMODE) extern int fb_videomode_from_videomode(const struct videomode *vm, struct fb_videomode *fbmode); -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 39+ messages in thread
[parent not found: <1353426896-6045-5-git-send-email-s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>]
* Re: [PATCH v12 4/6] fbmon: add of_videomode helpers [not found] ` <1353426896-6045-5-git-send-email-s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> @ 2012-11-21 12:49 ` Tomi Valkeinen 2012-11-21 13:08 ` Laurent Pinchart 2012-11-21 16:24 ` Steffen Trumtrar 0 siblings, 2 replies; 39+ messages in thread From: Tomi Valkeinen @ 2012-11-21 12:49 UTC (permalink / raw) To: Steffen Trumtrar Cc: linux-fbdev-u79uwXL29TY76Z2rM5mHXA, David Airlie, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ, Florian Tobias Schandinat, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Laurent Pinchart, kernel-bIcnvbaLZ9MEGnE8C9+IrQ, Guennady Liakhovetski, linux-media-u79uwXL29TY76Z2rM5mHXA [-- Attachment #1: Type: text/plain, Size: 1994 bytes --] On 2012-11-20 17:54, Steffen Trumtrar wrote: > Add helper to get fb_videomode from devicetree. > > Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> > Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de> > Acked-by: Thierry Reding <thierry.reding@avionic-design.de> > Tested-by: Thierry Reding <thierry.reding@avionic-design.de> > Tested-by: Philipp Zabel <p.zabel@pengutronix.de> > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/video/fbmon.c | 42 +++++++++++++++++++++++++++++++++++++++++- > include/linux/fb.h | 7 +++++++ > 2 files changed, 48 insertions(+), 1 deletion(-) > diff --git a/include/linux/fb.h b/include/linux/fb.h > index 920cbe3..41b5e49 100644 > --- a/include/linux/fb.h > +++ b/include/linux/fb.h > @@ -15,6 +15,8 @@ > #include <linux/slab.h> > #include <asm/io.h> > #include <linux/videomode.h> > +#include <linux/of.h> > +#include <linux/of_videomode.h> Guess what? =) To be honest, I don't know what the general opinion is about including header files from header files. But I always leave them out if they are not strictly needed. > struct vm_area_struct; > struct fb_info; > @@ -715,6 +717,11 @@ extern void fb_destroy_modedb(struct fb_videomode *modedb); > extern int fb_find_mode_cvt(struct fb_videomode *mode, int margins, int rb); > extern unsigned char *fb_ddc_read(struct i2c_adapter *adapter); > > +#if IS_ENABLED(CONFIG_OF_VIDEOMODE) > +extern int of_get_fb_videomode(const struct device_node *np, > + struct fb_videomode *fb, > + unsigned int index); > +#endif > #if IS_ENABLED(CONFIG_VIDEOMODE) > extern int fb_videomode_from_videomode(const struct videomode *vm, > struct fb_videomode *fbmode); Do you really need these #ifs in the header files? They do make it look a bit messy. If somebody uses the functions and CONFIG_VIDEOMODE is not enabled, he'll get a linker error anyway. Tomi [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 897 bytes --] ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v12 4/6] fbmon: add of_videomode helpers 2012-11-21 12:49 ` Tomi Valkeinen @ 2012-11-21 13:08 ` Laurent Pinchart 2012-11-21 16:24 ` Steffen Trumtrar 1 sibling, 0 replies; 39+ messages in thread From: Laurent Pinchart @ 2012-11-21 13:08 UTC (permalink / raw) To: Tomi Valkeinen Cc: Steffen Trumtrar, devicetree-discuss, Rob Herring, linux-fbdev, dri-devel, Thierry Reding, Guennady Liakhovetski, linux-media, Stephen Warren, kernel, Florian Tobias Schandinat, David Airlie [-- Attachment #1: Type: text/plain, Size: 2230 bytes --] Hi Tomi, On Wednesday 21 November 2012 14:49:30 Tomi Valkeinen wrote: > On 2012-11-20 17:54, Steffen Trumtrar wrote: > > Add helper to get fb_videomode from devicetree. > > > > Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> > > Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de> > > Acked-by: Thierry Reding <thierry.reding@avionic-design.de> > > Tested-by: Thierry Reding <thierry.reding@avionic-design.de> > > Tested-by: Philipp Zabel <p.zabel@pengutronix.de> > > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > --- > > > > drivers/video/fbmon.c | 42 +++++++++++++++++++++++++++++++++++++++++- > > include/linux/fb.h | 7 +++++++ > > 2 files changed, 48 insertions(+), 1 deletion(-) > > > > diff --git a/include/linux/fb.h b/include/linux/fb.h > > index 920cbe3..41b5e49 100644 > > --- a/include/linux/fb.h > > +++ b/include/linux/fb.h > > @@ -15,6 +15,8 @@ > > > > #include <linux/slab.h> > > #include <asm/io.h> > > #include <linux/videomode.h> > > > > +#include <linux/of.h> > > +#include <linux/of_videomode.h> > > Guess what? =) > > To be honest, I don't know what the general opinion is about including > header files from header files. But I always leave them out if they are > not strictly needed. I agree, I favor structure declaration as well when possible. > > struct vm_area_struct; > > struct fb_info; > > > > @@ -715,6 +717,11 @@ extern void fb_destroy_modedb(struct fb_videomode > > *modedb);> > > extern int fb_find_mode_cvt(struct fb_videomode *mode, int margins, int > > rb); extern unsigned char *fb_ddc_read(struct i2c_adapter *adapter); > > > > +#if IS_ENABLED(CONFIG_OF_VIDEOMODE) > > +extern int of_get_fb_videomode(const struct device_node *np, > > + struct fb_videomode *fb, > > + unsigned int index); > > +#endif > > > > #if IS_ENABLED(CONFIG_VIDEOMODE) > > extern int fb_videomode_from_videomode(const struct videomode *vm, > > > > struct fb_videomode *fbmode); > > Do you really need these #ifs in the header files? They do make it look > a bit messy. If somebody uses the functions and CONFIG_VIDEOMODE is not > enabled, he'll get a linker error anyway. -- Regards, Laurent Pinchart [-- Attachment #2: This is a digitally signed message part. --] [-- Type: application/pgp-signature, Size: 490 bytes --] ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v12 4/6] fbmon: add of_videomode helpers 2012-11-21 12:49 ` Tomi Valkeinen 2012-11-21 13:08 ` Laurent Pinchart @ 2012-11-21 16:24 ` Steffen Trumtrar 2012-11-21 16:47 ` Tomi Valkeinen 1 sibling, 1 reply; 39+ messages in thread From: Steffen Trumtrar @ 2012-11-21 16:24 UTC (permalink / raw) To: Tomi Valkeinen Cc: devicetree-discuss, Rob Herring, linux-fbdev, dri-devel, Laurent Pinchart, Thierry Reding, Guennady Liakhovetski, linux-media, Stephen Warren, kernel, Florian Tobias Schandinat, David Airlie On Wed, Nov 21, 2012 at 02:49:30PM +0200, Tomi Valkeinen wrote: > On 2012-11-20 17:54, Steffen Trumtrar wrote: > > Add helper to get fb_videomode from devicetree. > > > > Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> > > Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de> > > Acked-by: Thierry Reding <thierry.reding@avionic-design.de> > > Tested-by: Thierry Reding <thierry.reding@avionic-design.de> > > Tested-by: Philipp Zabel <p.zabel@pengutronix.de> > > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > --- > > drivers/video/fbmon.c | 42 +++++++++++++++++++++++++++++++++++++++++- > > include/linux/fb.h | 7 +++++++ > > 2 files changed, 48 insertions(+), 1 deletion(-) > > > > diff --git a/include/linux/fb.h b/include/linux/fb.h > > index 920cbe3..41b5e49 100644 > > --- a/include/linux/fb.h > > +++ b/include/linux/fb.h > > @@ -15,6 +15,8 @@ > > #include <linux/slab.h> > > #include <asm/io.h> > > #include <linux/videomode.h> > > +#include <linux/of.h> > > +#include <linux/of_videomode.h> > > Guess what? =) > > To be honest, I don't know what the general opinion is about including > header files from header files. But I always leave them out if they are > not strictly needed. > Okay. Seems to fit with the rest of the file; > > struct vm_area_struct; > > struct fb_info; > > @@ -715,6 +717,11 @@ extern void fb_destroy_modedb(struct fb_videomode *modedb); > > extern int fb_find_mode_cvt(struct fb_videomode *mode, int margins, int rb); > > extern unsigned char *fb_ddc_read(struct i2c_adapter *adapter); > > > > +#if IS_ENABLED(CONFIG_OF_VIDEOMODE) > > +extern int of_get_fb_videomode(const struct device_node *np, > > + struct fb_videomode *fb, > > + unsigned int index); > > +#endif > > #if IS_ENABLED(CONFIG_VIDEOMODE) > > extern int fb_videomode_from_videomode(const struct videomode *vm, > > struct fb_videomode *fbmode); > > Do you really need these #ifs in the header files? They do make it look > a bit messy. If somebody uses the functions and CONFIG_VIDEOMODE is not > enabled, he'll get a linker error anyway. > Well, I don't remember at the moment who requested this, but it was not my idea to put them there. So, this is a matter of style I guess. But maybe I understood that wrong. 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 [flat|nested] 39+ messages in thread
* Re: [PATCH v12 4/6] fbmon: add of_videomode helpers 2012-11-21 16:24 ` Steffen Trumtrar @ 2012-11-21 16:47 ` Tomi Valkeinen 0 siblings, 0 replies; 39+ messages in thread From: Tomi Valkeinen @ 2012-11-21 16:47 UTC (permalink / raw) To: Steffen Trumtrar Cc: devicetree-discuss, Rob Herring, linux-fbdev, dri-devel, Laurent Pinchart, Thierry Reding, Guennady Liakhovetski, linux-media, Stephen Warren, kernel, Florian Tobias Schandinat, David Airlie [-- Attachment #1: Type: text/plain, Size: 1435 bytes --] On 2012-11-21 18:24, Steffen Trumtrar wrote: > On Wed, Nov 21, 2012 at 02:49:30PM +0200, Tomi Valkeinen wrote: >>> @@ -715,6 +717,11 @@ extern void fb_destroy_modedb(struct fb_videomode *modedb); >>> extern int fb_find_mode_cvt(struct fb_videomode *mode, int margins, int rb); >>> extern unsigned char *fb_ddc_read(struct i2c_adapter *adapter); >>> >>> +#if IS_ENABLED(CONFIG_OF_VIDEOMODE) >>> +extern int of_get_fb_videomode(const struct device_node *np, >>> + struct fb_videomode *fb, >>> + unsigned int index); >>> +#endif >>> #if IS_ENABLED(CONFIG_VIDEOMODE) >>> extern int fb_videomode_from_videomode(const struct videomode *vm, >>> struct fb_videomode *fbmode); >> >> Do you really need these #ifs in the header files? They do make it look >> a bit messy. If somebody uses the functions and CONFIG_VIDEOMODE is not >> enabled, he'll get a linker error anyway. >> > > Well, I don't remember at the moment who requested this, but it was not my > idea to put them there. So, this is a matter of style I guess. > But maybe I understood that wrong. Right, one reviewer says this way, and another says that way =). With the header files I've made I only use #ifs with #else, when I want to give a static inline empty/no-op implementation for the function in case the feature is not compiled into the kernel. As you said, matter of taste. Up to you. Tomi [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 897 bytes --] ^ permalink raw reply [flat|nested] 39+ messages in thread
* [PATCH v12 5/6] drm_modes: add videomode helpers 2012-11-20 15:54 [PATCH v12 0/6] of: add display helper Steffen Trumtrar ` (3 preceding siblings ...) 2012-11-20 15:54 ` [PATCH v12 4/6] fbmon: " Steffen Trumtrar @ 2012-11-20 15:54 ` Steffen Trumtrar 2012-11-21 12:50 ` Tomi Valkeinen 2012-11-20 16:13 ` [PATCH v12 0/6] of: add display helper Laurent Pinchart 5 siblings, 1 reply; 39+ messages in thread From: Steffen Trumtrar @ 2012-11-20 15:54 UTC (permalink / raw) To: devicetree-discuss Cc: Steffen Trumtrar, Rob Herring, linux-fbdev, dri-devel, Laurent Pinchart, Thierry Reding, Guennady Liakhovetski, linux-media, Tomi Valkeinen, Stephen Warren, kernel, Florian Tobias Schandinat, David Airlie Add conversion from videomode to drm_display_mode Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de> Acked-by: Thierry Reding <thierry.reding@avionic-design.de> Tested-by: Thierry Reding <thierry.reding@avionic-design.de> Tested-by: Philipp Zabel <p.zabel@pengutronix.de> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- drivers/gpu/drm/drm_modes.c | 37 +++++++++++++++++++++++++++++++++++++ include/drm/drmP.h | 6 ++++++ 2 files changed, 43 insertions(+) diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index 59450f3..0073b27 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -35,6 +35,7 @@ #include <linux/export.h> #include <drm/drmP.h> #include <drm/drm_crtc.h> +#include <linux/videomode.h> /** * drm_mode_debug_printmodeline - debug print a mode @@ -504,6 +505,42 @@ drm_gtf_mode(struct drm_device *dev, int hdisplay, int vdisplay, int vrefresh, } EXPORT_SYMBOL(drm_gtf_mode); +#if IS_ENABLED(CONFIG_VIDEOMODE) +int drm_display_mode_from_videomode(const struct videomode *vm, + struct drm_display_mode *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; + + dmode->flags = 0; + 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(drm_display_mode_from_videomode); +#endif + /** * drm_mode_set_name - set the name on a mode * @mode: name will be set in this mode diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 3fd8280..de2f6cf 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -56,6 +56,7 @@ #include <linux/cdev.h> #include <linux/mutex.h> #include <linux/slab.h> +#include <linux/videomode.h> #if defined(__alpha__) || defined(__powerpc__) #include <asm/pgtable.h> /* For pte_wrprotect */ #endif @@ -1454,6 +1455,11 @@ extern struct drm_display_mode * drm_mode_create_from_cmdline_mode(struct drm_device *dev, struct drm_cmdline_mode *cmd); +#if IS_ENABLED(CONFIG_VIDEOMODE) +extern int drm_display_mode_from_videomode(const struct videomode *vm, + struct drm_display_mode *dmode); +#endif + /* Modesetting support */ extern void drm_vblank_pre_modeset(struct drm_device *dev, int crtc); extern void drm_vblank_post_modeset(struct drm_device *dev, int crtc); -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 39+ messages in thread
* Re: [PATCH v12 5/6] drm_modes: add videomode helpers 2012-11-20 15:54 ` [PATCH v12 5/6] drm_modes: add videomode helpers Steffen Trumtrar @ 2012-11-21 12:50 ` Tomi Valkeinen 0 siblings, 0 replies; 39+ messages in thread From: Tomi Valkeinen @ 2012-11-21 12:50 UTC (permalink / raw) To: Steffen Trumtrar Cc: devicetree-discuss, Rob Herring, linux-fbdev, dri-devel, Laurent Pinchart, Thierry Reding, Guennady Liakhovetski, linux-media, Stephen Warren, kernel, Florian Tobias Schandinat, David Airlie [-- Attachment #1: Type: text/plain, Size: 1642 bytes --] On 2012-11-20 17:54, Steffen Trumtrar wrote: > Add conversion from videomode to drm_display_mode > > Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> > Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de> > Acked-by: Thierry Reding <thierry.reding@avionic-design.de> > Tested-by: Thierry Reding <thierry.reding@avionic-design.de> > Tested-by: Philipp Zabel <p.zabel@pengutronix.de> > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/gpu/drm/drm_modes.c | 37 +++++++++++++++++++++++++++++++++++++ > include/drm/drmP.h | 6 ++++++ > 2 files changed, 43 insertions(+) > > diff --git a/include/drm/drmP.h b/include/drm/drmP.h > index 3fd8280..de2f6cf 100644 > --- a/include/drm/drmP.h > +++ b/include/drm/drmP.h > @@ -56,6 +56,7 @@ > #include <linux/cdev.h> > #include <linux/mutex.h> > #include <linux/slab.h> > +#include <linux/videomode.h> > #if defined(__alpha__) || defined(__powerpc__) > #include <asm/pgtable.h> /* For pte_wrprotect */ > #endif > @@ -1454,6 +1455,11 @@ extern struct drm_display_mode * > drm_mode_create_from_cmdline_mode(struct drm_device *dev, > struct drm_cmdline_mode *cmd); > > +#if IS_ENABLED(CONFIG_VIDEOMODE) > +extern int drm_display_mode_from_videomode(const struct videomode *vm, > + struct drm_display_mode *dmode); > +#endif > + > /* Modesetting support */ > extern void drm_vblank_pre_modeset(struct drm_device *dev, int crtc); > extern void drm_vblank_post_modeset(struct drm_device *dev, int crtc); > And the same comments apply to this header file. Tomi [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 897 bytes --] ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v12 0/6] of: add display helper 2012-11-20 15:54 [PATCH v12 0/6] of: add display helper Steffen Trumtrar ` (4 preceding siblings ...) 2012-11-20 15:54 ` [PATCH v12 5/6] drm_modes: add videomode helpers Steffen Trumtrar @ 2012-11-20 16:13 ` Laurent Pinchart 2012-11-20 18:11 ` Robert Schwebel 2012-11-21 7:41 ` Steffen Trumtrar 5 siblings, 2 replies; 39+ messages in thread From: Laurent Pinchart @ 2012-11-20 16:13 UTC (permalink / raw) To: Steffen Trumtrar Cc: devicetree-discuss, Rob Herring, linux-fbdev, dri-devel, Thierry Reding, Guennady Liakhovetski, linux-media, Tomi Valkeinen, Stephen Warren, kernel, Florian Tobias Schandinat, David Airlie On Tuesday 20 November 2012 16:54:50 Steffen Trumtrar wrote: > Hi! > > Changes since v11: > - make pointers const where applicable > - add reviewed-by Laurent Pinchart Looks good to me. Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Through which tree do you plan to push this ? > Regards, > Steffen > > > Steffen Trumtrar (6): > video: add display_timing and videomode > video: add of helper for videomode > fbmon: add videomode helpers > fbmon: add of_videomode helpers > drm_modes: add videomode helpers > drm_modes: add of_videomode helpers > > .../devicetree/bindings/video/display-timings.txt | 107 ++++++++++ > drivers/gpu/drm/drm_modes.c | 70 +++++++ > drivers/video/Kconfig | 19 ++ > drivers/video/Makefile | 4 + > drivers/video/display_timing.c | 24 +++ > drivers/video/fbmon.c | 86 ++++++++ > drivers/video/of_display_timing.c | 216 +++++++++++++++++ > drivers/video/of_videomode.c | 48 +++++ > drivers/video/videomode.c | 46 +++++ > include/drm/drmP.h | 12 ++ > include/linux/display_timing.h | 70 +++++++ > include/linux/fb.h | 13 ++ > include/linux/of_display_timings.h | 20 ++ > include/linux/of_videomode.h | 18 ++ > include/linux/videomode.h | 40 ++++ > 15 files changed, 793 insertions(+) > create mode 100644 > Documentation/devicetree/bindings/video/display-timings.txt create mode > 100644 drivers/video/display_timing.c > create mode 100644 drivers/video/of_display_timing.c > create mode 100644 drivers/video/of_videomode.c > create mode 100644 drivers/video/videomode.c > create mode 100644 include/linux/display_timing.h > create mode 100644 include/linux/of_display_timings.h > create mode 100644 include/linux/of_videomode.h > create mode 100644 include/linux/videomode.h -- Regards, Laurent Pinchart ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v12 0/6] of: add display helper 2012-11-20 16:13 ` [PATCH v12 0/6] of: add display helper Laurent Pinchart @ 2012-11-20 18:11 ` Robert Schwebel 2012-11-20 19:35 ` Thierry Reding 2012-11-21 7:41 ` Steffen Trumtrar 1 sibling, 1 reply; 39+ messages in thread From: Robert Schwebel @ 2012-11-20 18:11 UTC (permalink / raw) To: Laurent Pinchart Cc: Steffen Trumtrar, devicetree-discuss, Rob Herring, linux-fbdev, dri-devel, Thierry Reding, Guennady Liakhovetski, linux-media, Tomi Valkeinen, Stephen Warren, kernel, Florian Tobias Schandinat, David Airlie On Tue, Nov 20, 2012 at 05:13:19PM +0100, Laurent Pinchart wrote: > On Tuesday 20 November 2012 16:54:50 Steffen Trumtrar wrote: > > Hi! > > > > Changes since v11: > > - make pointers const where applicable > > - add reviewed-by Laurent Pinchart > > Looks good to me. > > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > Through which tree do you plan to push this ? We have no idea yet, and none of the people on Cc: have volunteered so far... what do you think? rsc -- 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 [flat|nested] 39+ messages in thread
* Re: [PATCH v12 0/6] of: add display helper 2012-11-20 18:11 ` Robert Schwebel @ 2012-11-20 19:35 ` Thierry Reding 2012-11-21 8:28 ` Steffen Trumtrar 0 siblings, 1 reply; 39+ messages in thread From: Thierry Reding @ 2012-11-20 19:35 UTC (permalink / raw) To: Robert Schwebel Cc: Laurent Pinchart, Steffen Trumtrar, devicetree-discuss, Rob Herring, linux-fbdev, dri-devel, Guennady Liakhovetski, linux-media, Tomi Valkeinen, Stephen Warren, kernel, Florian Tobias Schandinat, David Airlie [-- Attachment #1: Type: text/plain, Size: 1128 bytes --] On Tue, Nov 20, 2012 at 07:11:29PM +0100, Robert Schwebel wrote: > On Tue, Nov 20, 2012 at 05:13:19PM +0100, Laurent Pinchart wrote: > > On Tuesday 20 November 2012 16:54:50 Steffen Trumtrar wrote: > > > Hi! > > > > > > Changes since v11: > > > - make pointers const where applicable > > > - add reviewed-by Laurent Pinchart > > > > Looks good to me. > > > > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > > > Through which tree do you plan to push this ? > > We have no idea yet, and none of the people on Cc: have volunteered > so far... what do you think? The customary approach would be to take the patches through separate trees, but I think this particular series is sufficiently interwoven to warrant taking them all through one tree. However the least that we should do is collect Acked-by's from the other tree maintainers. Given that most of the patches modify files in drivers/video, Florian's fbdev tree would be the most obvious candidate, right? If Florian agrees to take the patches, all we would need is David's Acked-by. How does that sound? Thierry [-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v12 0/6] of: add display helper 2012-11-20 19:35 ` Thierry Reding @ 2012-11-21 8:28 ` Steffen Trumtrar 2012-11-21 13:18 ` Laurent Pinchart 0 siblings, 1 reply; 39+ messages in thread From: Steffen Trumtrar @ 2012-11-21 8:28 UTC (permalink / raw) To: Thierry Reding Cc: Robert Schwebel, Laurent Pinchart, devicetree-discuss, Rob Herring, linux-fbdev, dri-devel, Guennady Liakhovetski, linux-media, Tomi Valkeinen, Stephen Warren, kernel, Florian Tobias Schandinat, David Airlie On Tue, Nov 20, 2012 at 08:35:31PM +0100, Thierry Reding wrote: > On Tue, Nov 20, 2012 at 07:11:29PM +0100, Robert Schwebel wrote: > > On Tue, Nov 20, 2012 at 05:13:19PM +0100, Laurent Pinchart wrote: > > > On Tuesday 20 November 2012 16:54:50 Steffen Trumtrar wrote: > > > > Hi! > > > > > > > > Changes since v11: > > > > - make pointers const where applicable > > > > - add reviewed-by Laurent Pinchart > > > > > > Looks good to me. > > > > > > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > > > > > Through which tree do you plan to push this ? > > > > We have no idea yet, and none of the people on Cc: have volunteered > > so far... what do you think? > > The customary approach would be to take the patches through separate > trees, but I think this particular series is sufficiently interwoven to > warrant taking them all through one tree. However the least that we > should do is collect Acked-by's from the other tree maintainers. > > Given that most of the patches modify files in drivers/video, Florian's > fbdev tree would be the most obvious candidate, right? If Florian agrees > to take the patches, all we would need is David's Acked-by. > > How does that sound? > > Thierry Hi! That is exactly the way I thought this could happen. 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 [flat|nested] 39+ messages in thread
* Re: [PATCH v12 0/6] of: add display helper 2012-11-21 8:28 ` Steffen Trumtrar @ 2012-11-21 13:18 ` Laurent Pinchart 0 siblings, 0 replies; 39+ messages in thread From: Laurent Pinchart @ 2012-11-21 13:18 UTC (permalink / raw) To: Steffen Trumtrar Cc: Thierry Reding, Robert Schwebel, devicetree-discuss, Rob Herring, linux-fbdev, dri-devel, Guennady Liakhovetski, linux-media, Tomi Valkeinen, Stephen Warren, kernel, Florian Tobias Schandinat, David Airlie On Wednesday 21 November 2012 09:28:22 Steffen Trumtrar wrote: > On Tue, Nov 20, 2012 at 08:35:31PM +0100, Thierry Reding wrote: > > On Tue, Nov 20, 2012 at 07:11:29PM +0100, Robert Schwebel wrote: > > > On Tue, Nov 20, 2012 at 05:13:19PM +0100, Laurent Pinchart wrote: > > > > On Tuesday 20 November 2012 16:54:50 Steffen Trumtrar wrote: > > > > > Hi! > > > > > > > > > > Changes since v11: > > > > > - make pointers const where applicable > > > > > - add reviewed-by Laurent Pinchart > > > > > > > > Looks good to me. > > > > > > > > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > > > > > > > Through which tree do you plan to push this ? > > > > > > We have no idea yet, and none of the people on Cc: have volunteered > > > so far... what do you think? > > > > The customary approach would be to take the patches through separate > > trees, but I think this particular series is sufficiently interwoven to > > warrant taking them all through one tree. However the least that we > > should do is collect Acked-by's from the other tree maintainers. > > > > Given that most of the patches modify files in drivers/video, Florian's > > fbdev tree would be the most obvious candidate, right? If Florian agrees > > to take the patches, all we would need is David's Acked-by. > > > > How does that sound? > > > > Thierry > > Hi! > > That is exactly the way I thought this could happen. Sounds good to me as well. -- Regards, Laurent Pinchart ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v12 0/6] of: add display helper 2012-11-20 16:13 ` [PATCH v12 0/6] of: add display helper Laurent Pinchart 2012-11-20 18:11 ` Robert Schwebel @ 2012-11-21 7:41 ` Steffen Trumtrar 1 sibling, 0 replies; 39+ messages in thread From: Steffen Trumtrar @ 2012-11-21 7:41 UTC (permalink / raw) To: Laurent Pinchart Cc: linux-fbdev-u79uwXL29TY76Z2rM5mHXA, Florian Tobias Schandinat, David Airlie, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Tomi Valkeinen, kernel-bIcnvbaLZ9MEGnE8C9+IrQ, Guennady Liakhovetski, linux-media-u79uwXL29TY76Z2rM5mHXA On Tue, Nov 20, 2012 at 05:13:19PM +0100, Laurent Pinchart wrote: > On Tuesday 20 November 2012 16:54:50 Steffen Trumtrar wrote: > > Hi! > > > > Changes since v11: > > - make pointers const where applicable > > - add reviewed-by Laurent Pinchart > > Looks good to me. > > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > Thanks. 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 [flat|nested] 39+ messages in thread
end of thread, other threads:[~2012-11-22 11:23 UTC | newest]
Thread overview: 39+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-20 15:54 [PATCH v12 0/6] of: add display helper Steffen Trumtrar
2012-11-20 15:54 ` [PATCH v12 1/6] video: add display_timing and videomode Steffen Trumtrar
[not found] ` <1353426896-6045-2-git-send-email-s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2012-11-21 11:37 ` Tomi Valkeinen
2012-11-21 16:11 ` Steffen Trumtrar
[not found] ` <20121121161103.GA12657-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2012-11-21 16:42 ` Tomi Valkeinen
2012-11-20 15:54 ` [PATCH v12 2/6] video: add of helper for videomode Steffen Trumtrar
[not found] ` <1353426896-6045-3-git-send-email-s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2012-11-21 10:12 ` Manjunathappa, Prakash
2012-11-21 11:48 ` Steffen Trumtrar
2012-11-21 11:52 ` Thierry Reding
2012-11-21 15:03 ` Rob Herring
[not found] ` <50ACED4A.5040806-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2012-11-21 15:13 ` Thierry Reding
2012-11-22 9:10 ` Steffen Trumtrar
2012-11-21 12:22 ` Tomi Valkeinen
[not found] ` <1353426896-6045-1-git-send-email-s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2012-11-20 15:54 ` [PATCH v12 3/6] fbmon: add videomode helpers Steffen Trumtrar
2012-11-21 10:09 ` Manjunathappa, Prakash
2012-11-21 11:21 ` Leela Krishna Amudala
2012-11-21 11:58 ` Steffen Trumtrar
2012-11-21 12:27 ` Tomi Valkeinen
[not found] ` <1353426896-6045-4-git-send-email-s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2012-11-21 22:02 ` Laurent Pinchart
2012-11-22 6:20 ` Sascha Hauer
[not found] ` <20121122062000.GW10369-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2012-11-22 8:50 ` Laurent Pinchart
2012-11-22 8:53 ` Sascha Hauer
[not found] ` <20121122085342.GB10369-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2012-11-22 9:07 ` Laurent Pinchart
2012-11-22 11:23 ` Steffen Trumtrar
2012-11-20 15:54 ` [PATCH v12 6/6] drm_modes: add of_videomode helpers Steffen Trumtrar
[not found] ` <1353426896-6045-7-git-send-email-s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2012-11-21 12:52 ` Tomi Valkeinen
2012-11-20 15:54 ` [PATCH v12 4/6] fbmon: " Steffen Trumtrar
[not found] ` <1353426896-6045-5-git-send-email-s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2012-11-21 12:49 ` Tomi Valkeinen
2012-11-21 13:08 ` Laurent Pinchart
2012-11-21 16:24 ` Steffen Trumtrar
2012-11-21 16:47 ` Tomi Valkeinen
2012-11-20 15:54 ` [PATCH v12 5/6] drm_modes: add videomode helpers Steffen Trumtrar
2012-11-21 12:50 ` Tomi Valkeinen
2012-11-20 16:13 ` [PATCH v12 0/6] of: add display helper Laurent Pinchart
2012-11-20 18:11 ` Robert Schwebel
2012-11-20 19:35 ` Thierry Reding
2012-11-21 8:28 ` Steffen Trumtrar
2012-11-21 13:18 ` Laurent Pinchart
2012-11-21 7:41 ` Steffen Trumtrar
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).