Merge branch 'mediatek-drm-fixes-5.2' of https://github.com/ckhu-mediatek/linux.git-tags into drm-fixes

CK writes:

This include unbind error fix, clock control flow refinement, and PRIME
mmap with page offset.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
From: CK Hu <ck.hu@mediatek.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1560325868.3259.6.camel@mtksdaap41

4 files changed, 26 insertions, 31 deletions

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
index f426dfdfb418..a9007210dda1 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
@@ -90,10 +90,6 @@ static void mtk_drm_finish_page_flip(struct mtk_drm_crtc *mtk_crtc)
 static void mtk_drm_crtc_destroy(struct drm_crtc *crtc)
 {
         struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
-        int i;
-
-        for (i = 0; i < mtk_crtc->ddp_comp_nr; i++)
-                clk_unprepare(mtk_crtc->ddp_comp[i]->clk);
 
         mtk_disp_mutex_put(mtk_crtc->mutex);
 
@@ -186,7 +182,7 @@ static int mtk_crtc_ddp_clk_enable(struct mtk_drm_crtc *mtk_crtc)
 
         DRM_DEBUG_DRIVER("%s\n", __func__);
         for (i = 0; i < mtk_crtc->ddp_comp_nr; i++) {
-                ret = clk_enable(mtk_crtc->ddp_comp[i]->clk);
+                ret = clk_prepare_enable(mtk_crtc->ddp_comp[i]->clk);
                 if (ret) {
                         DRM_ERROR("Failed to enable clock %d: %d\n", i, ret);
                         goto err;
@@ -196,7 +192,7 @@ static int mtk_crtc_ddp_clk_enable(struct mtk_drm_crtc *mtk_crtc)
         return 0;
 err:
         while (--i >= 0)
-                clk_disable(mtk_crtc->ddp_comp[i]->clk);
+                clk_disable_unprepare(mtk_crtc->ddp_comp[i]->clk);
         return ret;
 }
 
@@ -206,7 +202,7 @@ static void mtk_crtc_ddp_clk_disable(struct mtk_drm_crtc *mtk_crtc)
 
         DRM_DEBUG_DRIVER("%s\n", __func__);
         for (i = 0; i < mtk_crtc->ddp_comp_nr; i++)
-                clk_disable(mtk_crtc->ddp_comp[i]->clk);
+                clk_disable_unprepare(mtk_crtc->ddp_comp[i]->clk);
 }
 
 static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc *mtk_crtc)
@@ -577,15 +573,7 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
                 if (!comp) {
                         dev_err(dev, "Component %pOF not initialized\n", node);
                         ret = -ENODEV;
-                        goto unprepare;
-                }
-
-                ret = clk_prepare(comp->clk);
-                if (ret) {
-                        dev_err(dev,
-                                "Failed to prepare clock for component %pOF: %d\n",
-                                node, ret);
-                        goto unprepare;
+                        return ret;
                 }
 
                 mtk_crtc->ddp_comp[i] = comp;
@@ -603,23 +591,17 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
                 ret = mtk_plane_init(drm_dev, &mtk_crtc->planes[zpos],
                                      BIT(pipe), type);
                 if (ret)
-                        goto unprepare;
+                        return ret;
         }
 
         ret = mtk_drm_crtc_init(drm_dev, mtk_crtc, &mtk_crtc->planes[0],
                                 mtk_crtc->layer_nr > 1 ? &mtk_crtc->planes[1] :
                                 NULL, pipe);
         if (ret < 0)
-                goto unprepare;
+                return ret;
         drm_mode_crtc_set_gamma_size(&mtk_crtc->base, MTK_LUT_SIZE);
         drm_crtc_enable_color_mgmt(&mtk_crtc->base, 0, false, MTK_LUT_SIZE);
         priv->num_pipes++;
 
         return 0;
-
-unprepare:
-        while (--i >= 0)
-                clk_unprepare(mtk_crtc->ddp_comp[i]->clk);
-
-        return ret;
 }
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
index 7fcb7407096f..95fdbd0fbcac 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
@@ -303,6 +303,7 @@ err_config_cleanup:
 static void mtk_drm_kms_deinit(struct drm_device *drm)
 {
         drm_kms_helper_poll_fini(drm);
+        drm_atomic_helper_shutdown(drm);
 
         component_unbind_all(drm->dev, drm);
         drm_mode_config_cleanup(drm);
@@ -389,7 +390,9 @@ static void mtk_drm_unbind(struct device *dev)
         struct mtk_drm_private *private = dev_get_drvdata(dev);
 
         drm_dev_unregister(private->drm);
+        mtk_drm_kms_deinit(private->drm);
         drm_dev_put(private->drm);
+        private->num_pipes = 0;
         private->drm = NULL;
 }
 
@@ -560,13 +563,8 @@ err_node:
 static int mtk_drm_remove(struct platform_device *pdev)
 {
         struct mtk_drm_private *private = platform_get_drvdata(pdev);
-        struct drm_device *drm = private->drm;
         int i;
 
-        drm_dev_unregister(drm);
-        mtk_drm_kms_deinit(drm);
-        drm_dev_put(drm);
-
         component_master_del(&pdev->dev, &mtk_drm_ops);
         pm_runtime_disable(&pdev->dev);
         of_node_put(private->mutex_node);
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.c b/drivers/gpu/drm/mediatek/mtk_drm_gem.c
index 3eefb22206c7..0d69698f8173 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_gem.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_gem.c
@@ -136,7 +136,6 @@ static int mtk_drm_gem_object_mmap(struct drm_gem_object *obj,
          * VM_PFNMAP flag that was set by drm_gem_mmap_obj()/drm_gem_mmap().
          */
         vma->vm_flags &= ~VM_PFNMAP;
-        vma->vm_pgoff = 0;
 
         ret = dma_mmap_attrs(priv->dma_dev, vma, mtk_gem->cookie,
                              mtk_gem->dma_addr, obj->size, mtk_gem->dma_attrs);
@@ -168,6 +167,12 @@ int mtk_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma)
 
         obj = vma->vm_private_data;
 
+        /*
+         * Set vm_pgoff (used as a fake buffer offset by DRM) to 0 and map the
+         * whole buffer from the start.
+         */
+        vma->vm_pgoff = 0;
+
         return mtk_drm_gem_object_mmap(obj, vma);
 }
 
diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c
index 4a0b9150a7bb..b91c4616644a 100644
--- a/drivers/gpu/drm/mediatek/mtk_dsi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
@@ -622,6 +622,15 @@ static void mtk_dsi_poweroff(struct mtk_dsi *dsi)
         if (--dsi->refcount != 0)
                 return;
 
+        /*
+         * mtk_dsi_stop() and mtk_dsi_start() is asymmetric, since
+         * mtk_dsi_stop() should be called after mtk_drm_crtc_atomic_disable(),
+         * which needs irq for vblank, and mtk_dsi_stop() will disable irq.
+         * mtk_dsi_start() needs to be called in mtk_output_dsi_enable(),
+         * after dsi is fully set.
+         */
+        mtk_dsi_stop(dsi);
+
         if (!mtk_dsi_switch_to_cmd_mode(dsi, VM_DONE_INT_FLAG, 500)) {
                 if (dsi->panel) {
                         if (drm_panel_unprepare(dsi->panel)) {
@@ -688,7 +697,6 @@ static void mtk_output_dsi_disable(struct mtk_dsi *dsi)
                 }
         }
 
-        mtk_dsi_stop(dsi);
         mtk_dsi_poweroff(dsi);
 
         dsi->enabled = false;
@@ -836,6 +844,8 @@ static void mtk_dsi_destroy_conn_enc(struct mtk_dsi *dsi)
         /* Skip connector cleanup if creation was delegated to the bridge */
         if (dsi->conn.dev)
                 drm_connector_cleanup(&dsi->conn);
+        if (dsi->panel)
+                drm_panel_detach(dsi->panel);
 }
 
 static void mtk_dsi_ddp_start(struct mtk_ddp_comp *comp)