Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

Pull drm updates from Dave Airlie:
 "This is the main git pull for the drm,

  I pretty much froze major pulls at -rc5/6 time, and haven't had much
  fallout, so will probably continue doing that.

  Lots of changes all over, big internal header cleanup to make it clear
  drm features are legacy things and what are things that modern KMS
  drivers should be using.  Also big move to use the new generic fences
  in all the TTM drivers.

  core:
        atomic prep work,
        vblank rework changes, allows immediate vblank disables
        major header reworking and cleanups to better delinate legacy
        interfaces from what KMS drivers should be using.
        cursor planes locking fixes

  ttm:
        move to generic fences (affects all TTM drivers)
        ppc64 caching fixes

  radeon:
        userptr support,
        uvd for old asics,
        reset rework for fence changes
        better buffer placement changes,
        dpm feature enablement
        hdmi audio support fixes

  intel:
        Cherryview work,
        180 degree rotation,
        skylake prep work,
        execlist command submission
        full ppgtt prep work
        cursor improvements
        edid caching,
        vdd handling improvements

  nouveau:
        fence reworking
        kepler memory clock work
        gt21x clock work
        fan control improvements
        hdmi infoframe fixes
        DP audio

  ast:
        ppc64 fixes
        caching fix

  rcar:
        rcar-du DT support

  ipuv3:
        prep work for capture support

  msm:
        LVDS support for mdp4, new panel, gpu refactoring

  exynos:
        exynos3250 SoC support, drop bad mmap interface,
        mipi dsi changes, and component match support"

* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (640 commits)
  drm/mst: rework payload table allocation to conform better.
  drm/ast: Fix HW cursor image
  drm/radeon/kv: add uvd/vce info to dpm debugfs output
  drm/radeon/ci: add uvd/vce info to dpm debugfs output
  drm/radeon: export reservation_object from dmabuf to ttm
  drm/radeon: cope with foreign fences inside the reservation object
  drm/radeon: cope with foreign fences inside display
  drm/core: use helper to check driver features
  drm/radeon/cik: write gfx ucode version to ucode addr reg
  drm/radeon/si: print full CS when we hit a packet 0
  drm/radeon: remove unecessary includes
  drm/radeon/combios: declare legacy_connector_convert as static
  drm/radeon/atombios: declare connector convert tables as static
  drm/radeon: drop btc_get_max_clock_from_voltage_dependency_table
  drm/radeon/dpm: drop clk/voltage dependency filters for BTC
  drm/radeon/dpm: drop clk/voltage dependency filters for CI
  drm/radeon/dpm: drop clk/voltage dependency filters for SI
  drm/radeon/dpm: drop clk/voltage dependency filters for NI
  drm/radeon: disable audio when we disable hdmi (v2)
  drm/radeon: split audio enable between eg and r600 (v2)
  ...

2 files changed, 108 insertions, 27 deletions

diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
index 6be623b4a86f..79a34cbd29f5 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
@@ -84,6 +84,7 @@ static int modeset_init(struct drm_device *dev)
         if ((priv->num_encoders == 0) || (priv->num_connectors == 0)) {
                 /* oh nos! */
                 dev_err(dev->dev, "no encoders/connectors found\n");
+                drm_mode_config_cleanup(dev);
                 return -ENXIO;
         }
 
@@ -172,33 +173,37 @@ static int tilcdc_load(struct drm_device *dev, unsigned long flags)
         dev->dev_private = priv;
 
         priv->wq = alloc_ordered_workqueue("tilcdc", 0);
+        if (!priv->wq) {
+                ret = -ENOMEM;
+                goto fail_free_priv;
+        }
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!res) {
                 dev_err(dev->dev, "failed to get memory resource\n");
                 ret = -EINVAL;
-                goto fail;
+                goto fail_free_wq;
         }
 
         priv->mmio = ioremap_nocache(res->start, resource_size(res));
         if (!priv->mmio) {
                 dev_err(dev->dev, "failed to ioremap\n");
                 ret = -ENOMEM;
-                goto fail;
+                goto fail_free_wq;
         }
 
         priv->clk = clk_get(dev->dev, "fck");
         if (IS_ERR(priv->clk)) {
                 dev_err(dev->dev, "failed to get functional clock\n");
                 ret = -ENODEV;
-                goto fail;
+                goto fail_iounmap;
         }
 
         priv->disp_clk = clk_get(dev->dev, "dpll_disp_ck");
         if (IS_ERR(priv->clk)) {
                 dev_err(dev->dev, "failed to get display clock\n");
                 ret = -ENODEV;
-                goto fail;
+                goto fail_put_clk;
         }
 
 #ifdef CONFIG_CPU_FREQ
@@ -208,7 +213,7 @@ static int tilcdc_load(struct drm_device *dev, unsigned long flags)
                         CPUFREQ_TRANSITION_NOTIFIER);
         if (ret) {
                 dev_err(dev->dev, "failed to register cpufreq notifier\n");
-                goto fail;
+                goto fail_put_disp_clk;
         }
 #endif
 
@@ -253,13 +258,13 @@ static int tilcdc_load(struct drm_device *dev, unsigned long flags)
         ret = modeset_init(dev);
         if (ret < 0) {
                 dev_err(dev->dev, "failed to initialize mode setting\n");
-                goto fail;
+                goto fail_cpufreq_unregister;
         }
 
         ret = drm_vblank_init(dev, 1);
         if (ret < 0) {
                 dev_err(dev->dev, "failed to initialize vblank\n");
-                goto fail;
+                goto fail_mode_config_cleanup;
         }
 
         pm_runtime_get_sync(dev->dev);
@@ -267,7 +272,7 @@ static int tilcdc_load(struct drm_device *dev, unsigned long flags)
         pm_runtime_put_sync(dev->dev);
         if (ret < 0) {
                 dev_err(dev->dev, "failed to install IRQ handler\n");
-                goto fail;
+                goto fail_vblank_cleanup;
         }
 
         platform_set_drvdata(pdev, dev);
@@ -283,13 +288,48 @@ static int tilcdc_load(struct drm_device *dev, unsigned long flags)
         priv->fbdev = drm_fbdev_cma_init(dev, bpp,
                         dev->mode_config.num_crtc,
                         dev->mode_config.num_connector);
+        if (IS_ERR(priv->fbdev)) {
+                ret = PTR_ERR(priv->fbdev);
+                goto fail_irq_uninstall;
+        }
 
         drm_kms_helper_poll_init(dev);
 
         return 0;
 
-fail:
-        tilcdc_unload(dev);
+fail_irq_uninstall:
+        pm_runtime_get_sync(dev->dev);
+        drm_irq_uninstall(dev);
+        pm_runtime_put_sync(dev->dev);
+
+fail_vblank_cleanup:
+        drm_vblank_cleanup(dev);
+
+fail_mode_config_cleanup:
+        drm_mode_config_cleanup(dev);
+
+fail_cpufreq_unregister:
+        pm_runtime_disable(dev->dev);
+#ifdef CONFIG_CPU_FREQ
+        cpufreq_unregister_notifier(&priv->freq_transition,
+                        CPUFREQ_TRANSITION_NOTIFIER);
+fail_put_disp_clk:
+        clk_put(priv->disp_clk);
+#endif
+
+fail_put_clk:
+        clk_put(priv->clk);
+
+fail_iounmap:
+        iounmap(priv->mmio);
+
+fail_free_wq:
+        flush_workqueue(priv->wq);
+        destroy_workqueue(priv->wq);
+
+fail_free_priv:
+        dev->dev_private = NULL;
+        kfree(priv);
         return ret;
 }
 
@@ -502,6 +542,7 @@ static struct drm_driver tilcdc_driver = {
         .unload             = tilcdc_unload,
         .preclose           = tilcdc_preclose,
         .lastclose          = tilcdc_lastclose,
+        .set_busid          = drm_platform_set_busid,
         .irq_handler        = tilcdc_irq,
         .irq_preinstall     = tilcdc_irq_preinstall,
         .irq_postinstall    = tilcdc_irq_postinstall,
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_panel.c b/drivers/gpu/drm/tilcdc/tilcdc_panel.c
index 4c7aa1d8134f..7a0315855e90 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_panel.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_panel.c
@@ -18,6 +18,7 @@
 #include <linux/pinctrl/pinmux.h>
 #include <linux/pinctrl/consumer.h>
 #include <linux/backlight.h>
+#include <linux/gpio/consumer.h>
 #include <video/display_timing.h>
 #include <video/of_display_timing.h>
 #include <video/videomode.h>
@@ -29,6 +30,7 @@ struct panel_module {
         struct tilcdc_panel_info *info;
         struct display_timings *timings;
         struct backlight_device *backlight;
+        struct gpio_desc *enable_gpio;
 };
 #define to_panel_module(x) container_of(x, struct panel_module, base)
 
@@ -55,13 +57,17 @@ static void panel_encoder_dpms(struct drm_encoder *encoder, int mode)
 {
         struct panel_encoder *panel_encoder = to_panel_encoder(encoder);
         struct backlight_device *backlight = panel_encoder->mod->backlight;
+        struct gpio_desc *gpio = panel_encoder->mod->enable_gpio;
 
-        if (!backlight)
-                return;
+        if (backlight) {
+                backlight->props.power = mode == DRM_MODE_DPMS_ON ?
+                                         FB_BLANK_UNBLANK : FB_BLANK_POWERDOWN;
+                backlight_update_status(backlight);
+        }
 
-        backlight->props.power = mode == DRM_MODE_DPMS_ON
-                                     ? FB_BLANK_UNBLANK : FB_BLANK_POWERDOWN;
-        backlight_update_status(backlight);
+        if (gpio)
+                gpiod_set_value_cansleep(gpio,
+                                         mode == DRM_MODE_DPMS_ON ? 1 : 0);
 }
 
 static bool panel_encoder_mode_fixup(struct drm_encoder *encoder,
@@ -311,6 +317,7 @@ static struct tilcdc_panel_info *of_get_panel_info(struct device_node *np)
         info = kzalloc(sizeof(*info), GFP_KERNEL);
         if (!info) {
                 pr_err("%s: allocation failed\n", __func__);
+                of_node_put(info_np);
                 return NULL;
         }
 
@@ -331,22 +338,21 @@ static struct tilcdc_panel_info *of_get_panel_info(struct device_node *np)
         if (ret) {
                 pr_err("%s: error reading panel-info properties\n", __func__);
                 kfree(info);
+                of_node_put(info_np);
                 return NULL;
         }
+        of_node_put(info_np);
 
         return info;
 }
 
-static struct of_device_id panel_of_match[];
-
 static int panel_probe(struct platform_device *pdev)
 {
-        struct device_node *node = pdev->dev.of_node;
+        struct device_node *bl_node, *node = pdev->dev.of_node;
         struct panel_module *panel_mod;
         struct tilcdc_module *mod;
         struct pinctrl *pinctrl;
-        int ret = -EINVAL;
-
+        int ret;
 
         /* bail out early if no DT data: */
         if (!node) {
@@ -354,10 +360,40 @@ static int panel_probe(struct platform_device *pdev)
                 return -ENXIO;
         }
 
-        panel_mod = kzalloc(sizeof(*panel_mod), GFP_KERNEL);
+        panel_mod = devm_kzalloc(&pdev->dev, sizeof(*panel_mod), GFP_KERNEL);
         if (!panel_mod)
                 return -ENOMEM;
 
+        bl_node = of_parse_phandle(node, "backlight", 0);
+        if (bl_node) {
+                panel_mod->backlight = of_find_backlight_by_node(bl_node);
+                of_node_put(bl_node);
+
+                if (!panel_mod->backlight)
+                        return -EPROBE_DEFER;
+
+                dev_info(&pdev->dev, "found backlight\n");
+        }
+
+        panel_mod->enable_gpio = devm_gpiod_get(&pdev->dev, "enable");
+        if (IS_ERR(panel_mod->enable_gpio)) {
+                ret = PTR_ERR(panel_mod->enable_gpio);
+                if (ret != -ENOENT) {
+                        dev_err(&pdev->dev, "failed to request enable GPIO\n");
+                        goto fail_backlight;
+                }
+
+                /* Optional GPIO is not here, continue silently. */
+                panel_mod->enable_gpio = NULL;
+        } else {
+                ret = gpiod_direction_output(panel_mod->enable_gpio, 0);
+                if (ret < 0) {
+                        dev_err(&pdev->dev, "failed to setup GPIO\n");
+                        goto fail_backlight;
+                }
+                dev_info(&pdev->dev, "found enable GPIO\n");
+        }
+
         mod = &panel_mod->base;
         pdev->dev.platform_data = mod;
 
@@ -370,29 +406,30 @@ static int panel_probe(struct platform_device *pdev)
         panel_mod->timings = of_get_display_timings(node);
         if (!panel_mod->timings) {
                 dev_err(&pdev->dev, "could not get panel timings\n");
+                ret = -EINVAL;
                 goto fail_free;
         }
 
         panel_mod->info = of_get_panel_info(node);
         if (!panel_mod->info) {
                 dev_err(&pdev->dev, "could not get panel info\n");
+                ret = -EINVAL;
                 goto fail_timings;
         }
 
         mod->preferred_bpp = panel_mod->info->bpp;
 
-        panel_mod->backlight = of_find_backlight_by_node(node);
-        if (panel_mod->backlight)
-                dev_info(&pdev->dev, "found backlight\n");
-
         return 0;
 
 fail_timings:
         display_timings_release(panel_mod->timings);
 
 fail_free:
-        kfree(panel_mod);
         tilcdc_module_cleanup(mod);
+
+fail_backlight:
+        if (panel_mod->backlight)
+                put_device(&panel_mod->backlight->dev);
         return ret;
 }
 
@@ -400,12 +437,15 @@ static int panel_remove(struct platform_device *pdev)
 {
         struct tilcdc_module *mod = dev_get_platdata(&pdev->dev);
         struct panel_module *panel_mod = to_panel_module(mod);
+        struct backlight_device *backlight = panel_mod->backlight;
+
+        if (backlight)
+                put_device(&backlight->dev);
 
         display_timings_release(panel_mod->timings);
 
         tilcdc_module_cleanup(mod);
         kfree(panel_mod->info);
-        kfree(panel_mod);
 
         return 0;
 }