]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - android-sdk/kernel-video.git/commitdiff
omapdrm: hack: Assign managers/channel to outputs in a more trivial way
authorArchit Taneja <archit@ti.com>
Mon, 6 May 2013 08:38:33 +0000 (10:38 +0200)
committerArchit Taneja <archit@ti.com>
Thu, 30 May 2013 23:03:36 +0000 (04:33 +0530)
3.8 kernel doesn't have 'dispc_channel' field for omapdss outputs, do a simple
assignment of channels for outputs for now.

Signed-off-by: Archit Taneja <archit@ti.com>
drivers/gpu/drm/omapdrm/omap_drv.c

index f2413b299ffb1790f454d9931c6594a106ba3ff8..fa38267a46f05bd232c179f6c322c57d074f29c3 100644 (file)
@@ -172,7 +172,9 @@ static int omap_modeset_init(struct drm_device *dev)
                 * other possible channels to which the encoder can connect are
                 * not considered.
                 */
-               channel = dssdev->output->dispc_channel;
+               channel = dssdev->type == OMAP_DISPLAY_TYPE_HDMI ?
+                                               OMAP_DSS_CHANNEL_DIGIT :
+                                               OMAP_DSS_CHANNEL_LCD;
 
                /*
                 * if this channel hasn't already been taken by a previously