Merge branch 'for-upstream/malidp-fixes' of git://linux-arm.org/linux-ld into drm-next

I have a couple of small patches for malidp to be applied in drm-next.
They have arisen from the decision to switch the writeback connectors to
always connected.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180723145302.GA28052@e110455-lin.cambridge.arm.com

2 files changed, 11 insertions, 1 deletions

diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c
index 5b7260557391..08b5bb219816 100644
--- a/drivers/gpu/drm/arm/malidp_drv.c
+++ b/drivers/gpu/drm/arm/malidp_drv.c
@@ -616,6 +616,7 @@ static int malidp_bind(struct device *dev)
         struct malidp_hw_device *hwdev;
         struct platform_device *pdev = to_platform_device(dev);
         struct of_device_id const *dev_id;
+        struct drm_encoder *encoder;
         /* number of lines for the R, G and B output */
         u8 output_width[MAX_OUTPUT_CHANNELS];
         int ret = 0, i;
@@ -737,6 +738,15 @@ static int malidp_bind(struct device *dev)
                 goto bind_fail;
         }
 
+        /* We expect to have a maximum of two encoders one for the actual
+         * display and a virtual one for the writeback connector
+         */
+        WARN_ON(drm->mode_config.num_encoder > 2);
+        list_for_each_entry(encoder, &drm->mode_config.encoder_list, head) {
+                encoder->possible_clones =
+                                (1 << drm->mode_config.num_encoder) -  1;
+        }
+
         ret = malidp_irq_init(pdev);
         if (ret < 0)
                 goto irq_init_fail;
diff --git a/drivers/gpu/drm/arm/malidp_mw.c b/drivers/gpu/drm/arm/malidp_mw.c
index cfd718e7e97c..ba6ae66387c9 100644
--- a/drivers/gpu/drm/arm/malidp_mw.c
+++ b/drivers/gpu/drm/arm/malidp_mw.c
@@ -73,7 +73,7 @@ static void malidp_mw_connector_reset(struct drm_connector *connector)
 static enum drm_connector_status
 malidp_mw_connector_detect(struct drm_connector *connector, bool force)
 {
-        return connector_status_disconnected;
+        return connector_status_connected;
 }
 
 static void malidp_mw_connector_destroy(struct drm_connector *connector)