diff options
| author | Philipp Zabel <p.zabel@pengutronix.de> | 2014-12-11 12:32:45 -0500 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2015-04-02 13:04:13 -0400 |
| commit | a5d3e625148073587955bb0c49dbbba231b3234a (patch) | |
| tree | 3d3290b9ff80396f62c1074da7d7851e5c46b540 | |
| parent | 2938931f3732a4ec70c299e221ec8dea01dfd796 (diff) | |
drm/panel: simple: Add display timing support
The simple panel driver's ->get_modes() implementation calculates the
display mode list from the typical timings and the ->get_timings()
implementation returns the timings to the connected encoder for mode
validation and fixup.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
[treding@nvidia.com: select VIDEOMODE_HELPERS]
Signed-off-by: Thierry Reding <treding@nvidia.com>
| -rw-r--r-- | drivers/gpu/drm/panel/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/panel/panel-simple.c | 42 |
2 files changed, 43 insertions, 0 deletions
diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig index d84583776d50..6d64c7bb908b 100644 --- a/drivers/gpu/drm/panel/Kconfig +++ b/drivers/gpu/drm/panel/Kconfig | |||
| @@ -11,6 +11,7 @@ config DRM_PANEL_SIMPLE | |||
| 11 | tristate "support for simple panels" | 11 | tristate "support for simple panels" |
| 12 | depends on OF | 12 | depends on OF |
| 13 | depends on BACKLIGHT_CLASS_DEVICE | 13 | depends on BACKLIGHT_CLASS_DEVICE |
| 14 | select VIDEOMODE_HELPERS | ||
| 14 | help | 15 | help |
| 15 | DRM panel driver for dumb panels that need at most a regulator and | 16 | DRM panel driver for dumb panels that need at most a regulator and |
| 16 | a GPIO to be powered up. Optionally a backlight can be attached so | 17 | a GPIO to be powered up. Optionally a backlight can be attached so |
diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c index d9491bc8f9a4..be2c4c85ea83 100644 --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c | |||
| @@ -33,9 +33,14 @@ | |||
| 33 | #include <drm/drm_mipi_dsi.h> | 33 | #include <drm/drm_mipi_dsi.h> |
| 34 | #include <drm/drm_panel.h> | 34 | #include <drm/drm_panel.h> |
| 35 | 35 | ||
| 36 | #include <video/display_timing.h> | ||
| 37 | #include <video/videomode.h> | ||
| 38 | |||
| 36 | struct panel_desc { | 39 | struct panel_desc { |
| 37 | const struct drm_display_mode *modes; | 40 | const struct drm_display_mode *modes; |
| 38 | unsigned int num_modes; | 41 | unsigned int num_modes; |
| 42 | const struct display_timing *timings; | ||
| 43 | unsigned int num_timings; | ||
| 39 | 44 | ||
| 40 | unsigned int bpc; | 45 | unsigned int bpc; |
| 41 | 46 | ||
| @@ -94,6 +99,25 @@ static int panel_simple_get_fixed_modes(struct panel_simple *panel) | |||
| 94 | if (!panel->desc) | 99 | if (!panel->desc) |
| 95 | return 0; | 100 | return 0; |
| 96 | 101 | ||
| 102 | for (i = 0; i < panel->desc->num_timings; i++) { | ||
| 103 | const struct display_timing *dt = &panel->desc->timings[i]; | ||
| 104 | struct videomode vm; | ||
| 105 | |||
| 106 | videomode_from_timing(dt, &vm); | ||
| 107 | mode = drm_mode_create(drm); | ||
| 108 | if (!mode) { | ||
| 109 | dev_err(drm->dev, "failed to add mode %ux%u\n", | ||
| 110 | dt->hactive.typ, dt->vactive.typ); | ||
| 111 | continue; | ||
| 112 | } | ||
| 113 | |||
| 114 | drm_display_mode_from_videomode(&vm, mode); | ||
| 115 | drm_mode_set_name(mode); | ||
| 116 | |||
| 117 | drm_mode_probed_add(connector, mode); | ||
| 118 | num++; | ||
| 119 | } | ||
| 120 | |||
| 97 | for (i = 0; i < panel->desc->num_modes; i++) { | 121 | for (i = 0; i < panel->desc->num_modes; i++) { |
| 98 | const struct drm_display_mode *m = &panel->desc->modes[i]; | 122 | const struct drm_display_mode *m = &panel->desc->modes[i]; |
| 99 | 123 | ||
| @@ -226,12 +250,30 @@ static int panel_simple_get_modes(struct drm_panel *panel) | |||
| 226 | return num; | 250 | return num; |
| 227 | } | 251 | } |
| 228 | 252 | ||
| 253 | static int panel_simple_get_timings(struct drm_panel *panel, | ||
| 254 | unsigned int num_timings, | ||
| 255 | struct display_timing *timings) | ||
| 256 | { | ||
| 257 | struct panel_simple *p = to_panel_simple(panel); | ||
| 258 | unsigned int i; | ||
| 259 | |||
| 260 | if (p->desc->num_timings < num_timings) | ||
| 261 | num_timings = p->desc->num_timings; | ||
| 262 | |||
| 263 | if (timings) | ||
| 264 | for (i = 0; i < num_timings; i++) | ||
| 265 | timings[i] = p->desc->timings[i]; | ||
| 266 | |||
| 267 | return p->desc->num_timings; | ||
| 268 | } | ||
| 269 | |||
| 229 | static const struct drm_panel_funcs panel_simple_funcs = { | 270 | static const struct drm_panel_funcs panel_simple_funcs = { |
| 230 | .disable = panel_simple_disable, | 271 | .disable = panel_simple_disable, |
| 231 | .unprepare = panel_simple_unprepare, | 272 | .unprepare = panel_simple_unprepare, |
| 232 | .prepare = panel_simple_prepare, | 273 | .prepare = panel_simple_prepare, |
| 233 | .enable = panel_simple_enable, | 274 | .enable = panel_simple_enable, |
| 234 | .get_modes = panel_simple_get_modes, | 275 | .get_modes = panel_simple_get_modes, |
| 276 | .get_timings = panel_simple_get_timings, | ||
| 235 | }; | 277 | }; |
| 236 | 278 | ||
| 237 | static int panel_simple_probe(struct device *dev, const struct panel_desc *desc) | 279 | static int panel_simple_probe(struct device *dev, const struct panel_desc *desc) |
