summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArchit Taneja <archit@ti.com>2014-04-11 12:53:32 +0530
committerTomi Valkeinen <tomi.valkeinen@ti.com>2014-04-15 13:35:28 +0300
commit71b6667765c7019f3fd5ea5e0c02f65f7331f3e1 (patch)
treea33eef485fd8f72460ffa2d29d7f9cd5860f4d05
parentf2cff0f34ff2c51f703880a2b883ea0c9de4a5ac (diff)
downloadblackbird-op-linux-71b6667765c7019f3fd5ea5e0c02f65f7331f3e1.tar.gz
blackbird-op-linux-71b6667765c7019f3fd5ea5e0c02f65f7331f3e1.zip
drm/omap: Fix crash when using LCD3 overlay manager
The channel_names list didn't have a string populated for LCD3 manager, this results in a crash when the display's output is connected to LCD3. Add an entry for LCD3. Reported-by: Somnath Mukherjee <somnath@ti.com> Signed-off-by: Archit Taneja <archit@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
-rw-r--r--drivers/gpu/drm/omapdrm/omap_crtc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c
index b3a7529845b9..46f8e1e40e88 100644
--- a/drivers/gpu/drm/omapdrm/omap_crtc.c
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
@@ -654,6 +654,7 @@ static const char *channel_names[] = {
[OMAP_DSS_CHANNEL_LCD] = "lcd",
[OMAP_DSS_CHANNEL_DIGIT] = "tv",
[OMAP_DSS_CHANNEL_LCD2] = "lcd2",
+ [OMAP_DSS_CHANNEL_LCD3] = "lcd3",
};
void omap_crtc_pre_init(void)
OpenPOWER on IntegriCloud