diff options
author | Steffen Trumtrar <s.trumtrar@pengutronix.de> | 2012-12-17 08:20:17 -0500 |
---|---|---|
committer | Steffen Trumtrar <s.trumtrar@pengutronix.de> | 2013-01-24 03:03:04 -0500 |
commit | 8714c0cecfc28f7ce73a520be4831f09743c4fd7 (patch) | |
tree | e0115b23586ce857c0a1257a7a26d638bf2aa3b3 /drivers/video | |
parent | ea4f3111ef0daffa1d11fded6f375227febca458 (diff) |
video: add display_timing and videomode
Add display_timing structure and the according helper functions. This allows
the description of a display via its supported timing parameters.
Also, add helper functions to convert from display timings to a generic videomode
structure.
The struct display_timing specifies all needed parameters to describe the signal
properties of a display in one mode. This includes
- ranges for signals that may have min-, max- and typical values
- single integers for signals that can be on, off or are ignored
- booleans for signals that are either on or off
As a display may support multiple modes like this, a struct display_timings is
added, that holds all given struct display_timing pointers and declares the
native mode of the display.
Although a display may state that a signal can be in a range, it is driven with
fixed values that indicate a videomode. Therefore graphic drivers don't need all
the information of struct display_timing, but would generate a videomode from
the given set of supported signal timings and work with that.
The video subsystems all define their own structs that describe a mode and work
with that (e.g. fb_videomode or drm_display_mode). To slowly replace all those
various structures and allow code reuse across those subsystems, add struct
videomode as a generic description.
This patch only includes the most basic fields in struct videomode. All missing
fields that are needed to have a really generic video mode description can be
added at a later stage.
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>
Tested-by: Afzal Mohammed <Afzal@ti.com>
Tested-by: Rob Clark <robclark@gmail.com>
Tested-by: Leela Krishna Amudala <leelakrishna.a@gmail.com>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/Kconfig | 6 | ||||
-rw-r--r-- | drivers/video/Makefile | 2 | ||||
-rw-r--r-- | drivers/video/display_timing.c | 24 | ||||
-rw-r--r-- | drivers/video/videomode.c | 39 |
4 files changed, 71 insertions, 0 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index e7068c508800..09a8f0d8a3d4 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
@@ -33,6 +33,12 @@ config VIDEO_OUTPUT_CONTROL | |||
33 | This framework adds support for low-level control of the video | 33 | This framework adds support for low-level control of the video |
34 | output switch. | 34 | output switch. |
35 | 35 | ||
36 | config DISPLAY_TIMING | ||
37 | bool | ||
38 | |||
39 | config VIDEOMODE | ||
40 | bool | ||
41 | |||
36 | menuconfig FB | 42 | menuconfig FB |
37 | tristate "Support for frame buffer devices" | 43 | tristate "Support for frame buffer devices" |
38 | ---help--- | 44 | ---help--- |
diff --git a/drivers/video/Makefile b/drivers/video/Makefile index 768a137a1bac..e0dd8202365f 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile | |||
@@ -168,3 +168,5 @@ obj-$(CONFIG_FB_VIRTUAL) += vfb.o | |||
168 | 168 | ||
169 | #video output switch sysfs driver | 169 | #video output switch sysfs driver |
170 | obj-$(CONFIG_VIDEO_OUTPUT_CONTROL) += output.o | 170 | obj-$(CONFIG_VIDEO_OUTPUT_CONTROL) += output.o |
171 | obj-$(CONFIG_DISPLAY_TIMING) += display_timing.o | ||
172 | obj-$(CONFIG_VIDEOMODE) += videomode.o | ||
diff --git a/drivers/video/display_timing.c b/drivers/video/display_timing.c new file mode 100644 index 000000000000..5e1822cef571 --- /dev/null +++ b/drivers/video/display_timing.c | |||
@@ -0,0 +1,24 @@ | |||
1 | /* | ||
2 | * generic display timing functions | ||
3 | * | ||
4 | * Copyright (c) 2012 Steffen Trumtrar <s.trumtrar@pengutronix.de>, Pengutronix | ||
5 | * | ||
6 | * This file is released under the GPLv2 | ||
7 | */ | ||
8 | |||
9 | #include <linux/export.h> | ||
10 | #include <linux/slab.h> | ||
11 | #include <video/display_timing.h> | ||
12 | |||
13 | void display_timings_release(struct display_timings *disp) | ||
14 | { | ||
15 | if (disp->timings) { | ||
16 | unsigned int i; | ||
17 | |||
18 | for (i = 0; i < disp->num_timings; i++) | ||
19 | kfree(disp->timings[i]); | ||
20 | kfree(disp->timings); | ||
21 | } | ||
22 | kfree(disp); | ||
23 | } | ||
24 | EXPORT_SYMBOL_GPL(display_timings_release); | ||
diff --git a/drivers/video/videomode.c b/drivers/video/videomode.c new file mode 100644 index 000000000000..21c47a202afa --- /dev/null +++ b/drivers/video/videomode.c | |||
@@ -0,0 +1,39 @@ | |||
1 | /* | ||
2 | * generic display timing functions | ||
3 | * | ||
4 | * Copyright (c) 2012 Steffen Trumtrar <s.trumtrar@pengutronix.de>, Pengutronix | ||
5 | * | ||
6 | * This file is released under the GPLv2 | ||
7 | */ | ||
8 | |||
9 | #include <linux/errno.h> | ||
10 | #include <linux/export.h> | ||
11 | #include <video/display_timing.h> | ||
12 | #include <video/videomode.h> | ||
13 | |||
14 | int videomode_from_timing(const struct display_timings *disp, | ||
15 | struct videomode *vm, unsigned int index) | ||
16 | { | ||
17 | struct display_timing *dt; | ||
18 | |||
19 | dt = display_timings_get(disp, index); | ||
20 | if (!dt) | ||
21 | return -EINVAL; | ||
22 | |||
23 | vm->pixelclock = display_timing_get_value(&dt->pixelclock, TE_TYP); | ||
24 | vm->hactive = display_timing_get_value(&dt->hactive, TE_TYP); | ||
25 | vm->hfront_porch = display_timing_get_value(&dt->hfront_porch, TE_TYP); | ||
26 | vm->hback_porch = display_timing_get_value(&dt->hback_porch, TE_TYP); | ||
27 | vm->hsync_len = display_timing_get_value(&dt->hsync_len, TE_TYP); | ||
28 | |||
29 | vm->vactive = display_timing_get_value(&dt->vactive, TE_TYP); | ||
30 | vm->vfront_porch = display_timing_get_value(&dt->vfront_porch, TE_TYP); | ||
31 | vm->vback_porch = display_timing_get_value(&dt->vback_porch, TE_TYP); | ||
32 | vm->vsync_len = display_timing_get_value(&dt->vsync_len, TE_TYP); | ||
33 | |||
34 | vm->dmt_flags = dt->dmt_flags; | ||
35 | vm->data_flags = dt->data_flags; | ||
36 | |||
37 | return 0; | ||
38 | } | ||
39 | EXPORT_SYMBOL_GPL(videomode_from_timing); | ||