Allow function dss_dpi_select_source_dra7xx() to set the channel in the
dra7xx DSS_CONTROL register for any VOUT port, not just VOUT1 (port 0).

Signed-off-by: Primoz Fiser <primoz.fi...@norik.com>
---
 drivers/gpu/drm/omapdrm/dss/dss.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/dss.c 
b/drivers/gpu/drm/omapdrm/dss/dss.c
index 988888e164d7..f5a484ef0f48 100644
--- a/drivers/gpu/drm/omapdrm/dss/dss.c
+++ b/drivers/gpu/drm/omapdrm/dss/dss.c
@@ -796,7 +796,9 @@ static int dss_dpi_select_source_dra7xx(struct dss_device 
*dss, int port,
 {
        switch (port) {
        case 0:
-               return dss_dpi_select_source_omap5(dss, port, channel);
+               if (channel != OMAP_DSS_CHANNEL_LCD)
+                       return -EINVAL;
+               break;
        case 1:
                if (channel != OMAP_DSS_CHANNEL_LCD2)
                        return -EINVAL;
@@ -809,7 +811,7 @@ static int dss_dpi_select_source_dra7xx(struct dss_device 
*dss, int port,
                return -EINVAL;
        }
 
-       return 0;
+       return dss_dpi_select_source_omap5(dss, port, channel);
 }
 
 int dss_dpi_select_source(struct dss_device *dss, int port,
-- 
2.25.1

Reply via email to