diff mbox

[PATCHv13,4/7] fbmon: add videomode helpers

Message ID 1353600015-6974-5-git-send-email-s.trumtrar@pengutronix.de (mailing list archive)
State New, archived
Headers show

Commit Message

Steffen Trumtrar Nov. 22, 2012, 4 p.m. UTC 
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>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
---
 drivers/video/fbmon.c |   44 ++++++++++++++++++++++++++++++++++++++++++++
 include/linux/fb.h    |    6 ++++++
 2 files changed, 50 insertions(+)

Comments

Laurent Pinchart Nov. 22, 2012, 6:31 p.m. UTC | #1 
Hi Steffen,

On Thursday 22 November 2012 17:00:12 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>
> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> ---
>  drivers/video/fbmon.c |   44 ++++++++++++++++++++++++++++++++++++++++++++
>  include/linux/fb.h    |    6 ++++++
>  2 files changed, 50 insertions(+)
> 
> diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c
> index cef6557..a6a564d 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,49 @@ 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);

This results in a division by 0 if vm->pixelclock is equal to zero. As the 
information is missing from many board files, what would you think about the 
following ?

	fbmode->pixclock = vm->pixelclock ? KHZ2PICOS(vm->pixelclock / 1000) : 0;

> +
> +	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;
> +	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 / (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..4404ec2 100644
> --- a/include/linux/fb.h
> +++ b/include/linux/fb.h
> @@ -19,6 +19,7 @@ struct vm_area_struct;
>  struct fb_info;
>  struct device;
>  struct file;
> +struct videomode;
> 
>  /* Definitions below are used in the parsed monitor specs */
>  #define FB_DPMS_ACTIVE_OFF	1
> @@ -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,
Steffen Trumtrar Nov. 22, 2012, 11:09 p.m. UTC | #2 
On Thu, Nov 22, 2012 at 07:31:39PM +0100, Laurent Pinchart wrote:
> Hi Steffen,
> 
> On Thursday 22 November 2012 17:00:12 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>
> > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> > ---
> >  drivers/video/fbmon.c |   44 ++++++++++++++++++++++++++++++++++++++++++++
> >  include/linux/fb.h    |    6 ++++++
> >  2 files changed, 50 insertions(+)
> > 
> > diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c
> > index cef6557..a6a564d 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,49 @@ 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);
> 
> This results in a division by 0 if vm->pixelclock is equal to zero. As the 
> information is missing from many board files, what would you think about the 
> following ?
> 
> 	fbmode->pixclock = vm->pixelclock ? KHZ2PICOS(vm->pixelclock / 1000) : 0;
> 

Grrr...you are right. I will fix that...

> > +	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 / (htotal * vtotal);
> > +

...and obviously this, too.

Regards,
Steffen
Laurent Pinchart Nov. 22, 2012, 11:52 p.m. UTC | #3 
On Friday 23 November 2012 00:09:49 Steffen Trumtrar wrote:
> On Thu, Nov 22, 2012 at 07:31:39PM +0100, Laurent Pinchart wrote:
> > On Thursday 22 November 2012 17:00:12 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>
> > > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > > Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> > > ---
> > > 
> > >  drivers/video/fbmon.c |   44 ++++++++++++++++++++++++++++++++++++++++++
> > >  include/linux/fb.h    |    6 ++++++
> > >  2 files changed, 50 insertions(+)
> > > 
> > > diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c
> > > index cef6557..a6a564d 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,49 @@ 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);
> > 
> > This results in a division by 0 if vm->pixelclock is equal to zero. As the
> > information is missing from many board files, what would you think about
> > the following ?
> > 
> > 	fbmode->pixclock = vm->pixelclock ? KHZ2PICOS(vm->pixelclock / 1000) : 0;
> 
> Grrr...you are right. I will fix that...

Thank you.

> > > +	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 / (htotal * vtotal);
> > > +
> 
> ...and obviously this, too.

That one is less of an issue in my opinion. A mode with a zero htotal or 
vtotal is clearly invalid, while we have modes with no pixel clock value.
Steffen Trumtrar Nov. 23, 2012, 8:03 a.m. UTC | #4 
On Fri, Nov 23, 2012 at 12:52:08AM +0100, Laurent Pinchart wrote:
> On Friday 23 November 2012 00:09:49 Steffen Trumtrar wrote:
> > On Thu, Nov 22, 2012 at 07:31:39PM +0100, Laurent Pinchart wrote:
> > > On Thursday 22 November 2012 17:00:12 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>
> > > > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > > > Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> > > > ---
> > > > 
> > > >  drivers/video/fbmon.c |   44 ++++++++++++++++++++++++++++++++++++++++++
> > > >  include/linux/fb.h    |    6 ++++++
> > > >  2 files changed, 50 insertions(+)
> > > > 
> > > > diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c
> > > > index cef6557..a6a564d 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,49 @@ 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);
> > > 
> > > This results in a division by 0 if vm->pixelclock is equal to zero. As the
> > > information is missing from many board files, what would you think about
> > > the following ?
> > > 
> > > 	fbmode->pixclock = vm->pixelclock ? KHZ2PICOS(vm->pixelclock / 1000) : 0;
> > 
> > Grrr...you are right. I will fix that...
> 
> Thank you.
> 

I have to thank you for bulletproofing my code o/\o

> > > > +	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 / (htotal * vtotal);
> > > > +
> > 
> > ...and obviously this, too.
> 
> That one is less of an issue in my opinion. A mode with a zero htotal or 
> vtotal is clearly invalid, while we have modes with no pixel clock value.
> 

Yes, you I are right. But while I'm on it, might as well prevent an error.

Regards,
Steffen
diff mbox

Patch

diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c
index cef6557..a6a564d 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,49 @@  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;
+	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 / (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..4404ec2 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -19,6 +19,7 @@  struct vm_area_struct;
 struct fb_info;
 struct device;
 struct file;
+struct videomode;
 
 /* Definitions below are used in the parsed monitor specs */
 #define FB_DPMS_ACTIVE_OFF	1
@@ -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,