On Wed, Nov 14, 2012 at 12:43:20PM +0100, 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
drivers/video/fbmon.c | 38 ++++++++++++++++++++++++++++++++++++++ include/linux/fb.h | 5 +++++ 2 files changed, 43 insertions(+)
diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c index cef6557..cccef17 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,43 @@ 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(struct videomode *vm, struct fb_videomode *fbmode) +{
- fbmode->xres = vm->hactive;
- fbmode->left_margin = vm->hback_porch;
- fbmode->right_margin = vm->hfront_porch;
- fbmode->hsync_len = vm->hsync_len;
- fbmode->yres = vm->vactive;
- fbmode->upper_margin = vm->vback_porch;
- fbmode->lower_margin = vm->vfront_porch;
- fbmode->vsync_len = vm->vsync_len;
- fbmode->pixclock = KHZ2PICOS(vm->pixelclock / 1000);
- 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->refresh = (vm->pixelclock*1000) / (vm->hactive * vm->vactive);
CodingStyle that you should have spaces around '*'. Also I'm not sure if that formula is correct. Shouldn't the blanking intervals be counted as well? So:
unsigned int htotal = vm->hactive + vm->hfront_porch + vm->hback_porch + vm->hsync_len; unsigned int vtotal = vm->vactive + vm->vfront_porch + vm->vback_porch + vm->vsync_len;
fbmode->refresh = (vm->pixelclock * 1000) / (htotal * vtotal);
?
- fbmode->flag = 0;
- return 0;
+} +EXPORT_SYMBOL_GPL(fb_videomode_from_videomode); +#endif
Gratuitous blank line.
#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..6a3a675 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,10 @@ 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(struct videomode *vm,
struct fb_videomode *fbmode);+#endif /* drivers/video/modedb.c */
These in turn could use an extra blank line.
Thierry