Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

videomode: videomode_from_timing work

We currently have videomode_from_timing(), which takes one
display_timing entry from display_timings.

To make it easier to use display_timing without display_timings, this
patch renames videomode_from_timing() to videomode_from_timings(), and
adds a new videomode_from_timing() which just converts a given
display_timing to videomode.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Steffen Trumtrar <s.trumtrar@pengutronix.de>

+31 -13
+1 -1
drivers/gpu/drm/tilcdc/tilcdc_panel.c
··· 173 173 struct drm_display_mode *mode = drm_mode_create(dev); 174 174 struct videomode vm; 175 175 176 - if (videomode_from_timing(timings, &vm, i)) 176 + if (videomode_from_timings(timings, &vm, i)) 177 177 break; 178 178 179 179 drm_display_mode_from_videomode(&vm, mode);
+1 -1
drivers/video/of_videomode.c
··· 43 43 if (index == OF_USE_NATIVE_MODE) 44 44 index = disp->native_mode; 45 45 46 - ret = videomode_from_timing(disp, vm, index); 46 + ret = videomode_from_timings(disp, vm, index); 47 47 if (ret) 48 48 return ret; 49 49
+16 -9
drivers/video/videomode.c
··· 11 11 #include <video/display_timing.h> 12 12 #include <video/videomode.h> 13 13 14 - int videomode_from_timing(const struct display_timings *disp, 15 - struct videomode *vm, unsigned int index) 14 + void videomode_from_timing(const struct display_timing *dt, 15 + struct videomode *vm) 16 16 { 17 - struct display_timing *dt; 18 - 19 - dt = display_timings_get(disp, index); 20 - if (!dt) 21 - return -EINVAL; 22 - 23 17 vm->pixelclock = dt->pixelclock.typ; 24 18 vm->hactive = dt->hactive.typ; 25 19 vm->hfront_porch = dt->hfront_porch.typ; ··· 26 32 vm->vsync_len = dt->vsync_len.typ; 27 33 28 34 vm->flags = dt->flags; 35 + } 36 + EXPORT_SYMBOL_GPL(videomode_from_timing); 37 + 38 + int videomode_from_timings(const struct display_timings *disp, 39 + struct videomode *vm, unsigned int index) 40 + { 41 + struct display_timing *dt; 42 + 43 + dt = display_timings_get(disp, index); 44 + if (!dt) 45 + return -EINVAL; 46 + 47 + videomode_from_timing(dt, vm); 29 48 30 49 return 0; 31 50 } 32 - EXPORT_SYMBOL_GPL(videomode_from_timing); 51 + EXPORT_SYMBOL_GPL(videomode_from_timings);
+13 -2
include/video/videomode.h
··· 34 34 35 35 /** 36 36 * videomode_from_timing - convert display timing to videomode 37 + * @dt: display_timing structure 38 + * @vm: return value 39 + * 40 + * DESCRIPTION: 41 + * This function converts a struct display_timing to a struct videomode. 42 + */ 43 + void videomode_from_timing(const struct display_timing *dt, 44 + struct videomode *vm); 45 + 46 + /** 47 + * videomode_from_timings - convert one display timings entry to videomode 37 48 * @disp: structure with all possible timing entries 38 49 * @vm: return value 39 50 * @index: index into the list of display timings in devicetree 40 51 * 41 52 * DESCRIPTION: 42 - * This function converts a struct display_timing to a struct videomode. 53 + * This function converts one struct display_timing entry to a struct videomode. 43 54 */ 44 - int videomode_from_timing(const struct display_timings *disp, 55 + int videomode_from_timings(const struct display_timings *disp, 45 56 struct videomode *vm, unsigned int index); 46 57 47 58 #endif