drm/tilcdc: Remove unnecessary tilcdc_crtc_disable() from tilcdc_unload()

[platform/kernel/linux-rpi.git] / drivers / gpu / drm / tilcdc / tilcdc_drv.c

diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
index f7c3ca8..1981ae9 100644 (file)
--- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
@@ -184,12 +184,9 @@ static int cpufreq_transition(struct notifier_block *nb,
 {
        struct tilcdc_drm_private *priv = container_of(nb,
                        struct tilcdc_drm_private, freq_transition);
-       if (val == CPUFREQ_POSTCHANGE) {
-               if (priv->lcd_fck_rate != clk_get_rate(priv->clk)) {
-                       priv->lcd_fck_rate = clk_get_rate(priv->clk);
-                       tilcdc_crtc_update_clk(priv->crtc);
-               }
-       }
+
+       if (val == CPUFREQ_POSTCHANGE)
+               tilcdc_crtc_update_clk(priv->crtc);
 
        return 0;
 }
@@ -203,8 +200,6 @@ static int tilcdc_unload(struct drm_device *dev)
 {
        struct tilcdc_drm_private *priv = dev->dev_private;
 
-       tilcdc_crtc_disable(priv->crtc);
-
        tilcdc_remove_external_encoders(dev);
 
        drm_fbdev_cma_fini(priv->fbdev);
@@ -240,7 +235,6 @@ static int tilcdc_load(struct drm_device *dev, unsigned long flags)
        struct platform_device *pdev = dev->platformdev;
        struct device_node *node = pdev->dev.of_node;
        struct tilcdc_drm_private *priv;
-       struct tilcdc_module *mod;
        struct resource *res;
        u32 bpp = 0;
        int ret;
@@ -284,7 +278,6 @@ static int tilcdc_load(struct drm_device *dev, unsigned long flags)
        }
 
 #ifdef CONFIG_CPU_FREQ
-       priv->lcd_fck_rate = clk_get_rate(priv->clk);
        priv->freq_transition.notifier_call = cpufreq_transition;
        ret = cpufreq_register_notifier(&priv->freq_transition,
                        CPUFREQ_TRANSITION_NOTIFIER);
@@ -336,6 +329,7 @@ static int tilcdc_load(struct drm_device *dev, unsigned long flags)
                DBG("Revision 1 LCDC supports only RGB565 format");
                priv->pixelformats = tilcdc_rev1_formats;
                priv->num_pixelformats = ARRAY_SIZE(tilcdc_rev1_formats);
+               bpp = 16;
        } else {
                const char *str = "\0";
 
@@ -345,17 +339,20 @@ static int tilcdc_load(struct drm_device *dev, unsigned long flags)
                        priv->pixelformats = tilcdc_crossed_formats;
                        priv->num_pixelformats =
                                ARRAY_SIZE(tilcdc_crossed_formats);
+                       bpp = 32; /* Choose bpp with RGB support for fbdef */
                } else if (0 == strcmp(str, "straight")) {
                        DBG("Configured for straight blue and red wires");
                        priv->pixelformats = tilcdc_straight_formats;
                        priv->num_pixelformats =
                                ARRAY_SIZE(tilcdc_straight_formats);
+                       bpp = 16; /* Choose bpp with RGB support for fbdef */
                } else {
                        DBG("Blue and red wiring '%s' unknown, use legacy mode",
                            str);
                        priv->pixelformats = tilcdc_legacy_formats;
                        priv->num_pixelformats =
                                ARRAY_SIZE(tilcdc_legacy_formats);
+                       bpp = 16; /* This is just a guess */
                }
        }
 
@@ -372,7 +369,7 @@ static int tilcdc_load(struct drm_device *dev, unsigned long flags)
                if (ret < 0)
                        goto fail_mode_config_cleanup;
 
-               ret = tilcdc_add_external_encoders(dev, &bpp);
+               ret = tilcdc_add_external_encoders(dev);
                if (ret < 0)
                        goto fail_component_cleanup;
        }
@@ -395,13 +392,6 @@ static int tilcdc_load(struct drm_device *dev, unsigned long flags)
                goto fail_vblank_cleanup;
        }
 
-       list_for_each_entry(mod, &module_list, list) {
-               DBG("%s: preferred_bpp: %d", mod->name, mod->preferred_bpp);
-               bpp = mod->preferred_bpp;
-               if (bpp > 0)
-                       break;
-       }
-
        drm_mode_config_reset(dev);
 
        priv->fbdev = drm_fbdev_cma_init(dev, bpp,