drm/rockchip: mipi: move mode_set/commit to enable ops

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / rockchip / rockchip_drm_drv.c

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
index ce0b385a5f611750cf69be51dc06484b2ba74ec1..cbd133eb25aa171ae531d054da95f19d0eebd6b2 100644 (file)
--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
@@ -492,6 +492,8 @@ static int update_state(struct drm_device *drm_dev,
                                                         conn_state);
                if (ret)
                        return ret;
+               if (encoder_helper_funcs->mode_set)
+                       encoder_helper_funcs->mode_set(encoder, mode, mode);
                priv->crtc_funcs[pipe]->loader_protect(crtc, true);
        }
 
@@ -772,6 +774,23 @@ static void rockchip_iommu_cleanup(struct drm_device *drm_dev)
 }
 
 #ifdef CONFIG_DEBUG_FS
+static int rockchip_drm_mm_dump(struct seq_file *s, void *data)
+{
+       struct drm_info_node *node = s->private;
+       struct drm_minor *minor = node->minor;
+       struct drm_device *drm_dev = minor->dev;
+       struct rockchip_drm_private *priv = drm_dev->dev_private;
+       int ret;
+
+       mutex_lock(&priv->mm_lock);
+
+       ret = drm_mm_dump_table(s, &priv->mm);
+
+       mutex_unlock(&priv->mm_lock);
+
+       return ret;
+}
+
 static int rockchip_drm_summary_show(struct seq_file *s, void *data)
 {
        struct drm_info_node *node = s->private;
@@ -793,6 +812,7 @@ static int rockchip_drm_summary_show(struct seq_file *s, void *data)
 
 static struct drm_info_list rockchip_debugfs_files[] = {
        { "summary", rockchip_drm_summary_show, 0, NULL },
+       { "mm_dump", rockchip_drm_mm_dump, 0, NULL },
 };
 
 static int rockchip_drm_debugfs_init(struct drm_minor *minor)
@@ -829,6 +849,10 @@ static int rockchip_drm_bind(struct device *dev)
        if (!drm_dev)
                return -ENOMEM;
 
+       ret = drm_dev_set_unique(drm_dev, "%s", dev_name(dev));
+       if (ret)
+               goto err_free;
+
        dev_set_drvdata(dev, drm_dev);
 
        private = devm_kzalloc(drm_dev->dev, sizeof(*private), GFP_KERNEL);