Merge tag 'drm-misc-next-2017-05-16' of git://anongit.freedesktop.org/git/drm-misc into drm-next

UAPI Changes:
- Return -ENODEV instead of -ENXIO when creating cma fb w/o valid gem (Daniel)
- Add aspect ratio and custom scaling propertis to connector state (Maarten)

Cross-subsystem Changes:
- None

Core Changes:
- Add Laurent as bridge reviewer and Andrzej as bridge maintainer (Archit)
- Maintain new STM driver through -misc (Yannick)
- Misc doc improvements (as is tradition) (Daniel)
- Add driver-private objects to atomic state (Dhinakaran)
- Deprecate preclose hook in modern drivers (use postclose) (Daniel)
- Add hwmode to vblank struct. This fixes mode access in irq context and reduced
  a bunch of boilerplate (Daniel)

Driver Changes:
- vc4: Add out-fence support to vc4 V3D rendering (Eric)
- stm: Add stm32f429 display hw and am-480272h3tmqw-t01h panel support (Yannick)
- vc4: Remove 256MB cma limit from vc4 (Eric)
- dw-hdmi: Disable audio when inactive, instead of always enabled (Romain)
- zte: Add support for VGA to the ZTE driver (Shawn)
- i915: Track DP MST bandwidth and check it in atomic_check (Dhinakaran)
- vgem: Enable gem dmabuf import iface to facilitate ion testing (Laura)
- vc4: Add support for Cygnus (new dt compat string + couple bug fixes) (Eric)
- pl111: Add driver for pl111 CLCD display controller (Eric/Tom)
- vgem: Subclass drm_device instead of standalone platform device (Chris)

Cc: Archit Taneja <architt@codeaurora.org>
Cc: Eric Anholt <eric@anholt.net>
Cc: Yannick Fertre <yannick.fertre@st.com>
Cc: Romain Perier <romain.perier@collabora.com>
Cc: Navare, Manasi D <manasi.d.navare@intel.com>
Cc: Shawn Guo <shawn.guo@linaro.org>
Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Cc: Laura Abbott <labbott@redhat.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Tom Cooksey <tom.cooksey@arm.com>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>

* tag 'drm-misc-next-2017-05-16' of git://anongit.freedesktop.org/git/drm-misc: (72 commits)
  drm: add missing declaration to drm_blend.h
  drm/dp: Wait up all outstanding tx waiters
  drm/dp: Read the tx msg state once after checking for an event
  drm/prime: Forward declare struct device
  drm/vblank: Lock down vblank->hwmode more
  drm/vblank: drop the mode argument from drm_calc_vbltimestamp_from_scanoutpos
  drm/vblank: Add FIXME comments about moving the vblank ts hooks
  drm/vblank: Switch to bool in_vblank_irq in get_vblank_timestamp
  drm/vblank: Switch drm_driver->get_vblank_timestamp to return a bool
  drm/vgem: Convert to a struct drm_device subclass
  gpu: drm: gma500: remove dead code
  drm/sti: Adjust two checks for null pointers in sti_hqvdp_probe()
  drm/sti: Fix typos in a comment line
  drm/sti: Fix a typo in a comment line
  drm/sti: Replace 17 seq_puts() calls by seq_putc()
  drm/sti: Reduce function calls for sequence output at five places
  drm/sti: use seq_puts to display a string
  drm: Nerf the preclose callback for modern drivers
  drm/exynos: Merge pre/postclose hooks
  drm/tegra: switch to postclose
  ...

1 files changed, 221 insertions, 0 deletions

diff --git a/drivers/gpu/drm/stm/drv.c b/drivers/gpu/drm/stm/drv.c
new file mode 100644
index 000000000000..83ab48f1fd00
--- /dev/null
+++ b/drivers/gpu/drm/stm/drv.c
@@ -0,0 +1,221 @@
+/*
+ * Copyright (C) STMicroelectronics SA 2017
+ *
+ * Authors: Philippe Cornu <philippe.cornu@st.com>
+ *          Yannick Fertre <yannick.fertre@st.com>
+ *          Fabien Dessenne <fabien.dessenne@st.com>
+ *          Mickael Reulier <mickael.reulier@st.com>
+ *
+ * License terms:  GNU General Public License (GPL), version 2
+ */
+
+#include <linux/component.h>
+#include <linux/of_platform.h>
+
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_gem_cma_helper.h>
+
+#include "ltdc.h"
+
+#define DRIVER_NAME             "stm"
+#define DRIVER_DESC             "STMicroelectronics SoC DRM"
+#define DRIVER_DATE             "20170330"
+#define DRIVER_MAJOR            1
+#define DRIVER_MINOR            0
+#define DRIVER_PATCH_LEVEL      0
+
+#define STM_MAX_FB_WIDTH        2048
+#define STM_MAX_FB_HEIGHT       2048 /* same as width to handle orientation */
+
+static void drv_output_poll_changed(struct drm_device *ddev)
+{
+        struct ltdc_device *ldev = ddev->dev_private;
+
+        drm_fbdev_cma_hotplug_event(ldev->fbdev);
+}
+
+static const struct drm_mode_config_funcs drv_mode_config_funcs = {
+        .fb_create = drm_fb_cma_create,
+        .output_poll_changed = drv_output_poll_changed,
+        .atomic_check = drm_atomic_helper_check,
+        .atomic_commit = drm_atomic_helper_commit,
+};
+
+static void drv_lastclose(struct drm_device *ddev)
+{
+        struct ltdc_device *ldev = ddev->dev_private;
+
+        DRM_DEBUG("%s\n", __func__);
+
+        drm_fbdev_cma_restore_mode(ldev->fbdev);
+}
+
+DEFINE_DRM_GEM_CMA_FOPS(drv_driver_fops);
+
+static struct drm_driver drv_driver = {
+        .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME |
+                           DRIVER_ATOMIC,
+        .lastclose = drv_lastclose,
+        .name = DRIVER_NAME,
+        .desc = DRIVER_DESC,
+        .date = DRIVER_DATE,
+        .major = DRIVER_MAJOR,
+        .minor = DRIVER_MINOR,
+        .patchlevel = DRIVER_PATCH_LEVEL,
+        .fops = &drv_driver_fops,
+        .dumb_create = drm_gem_cma_dumb_create,
+        .dumb_map_offset = drm_gem_cma_dumb_map_offset,
+        .dumb_destroy = drm_gem_dumb_destroy,
+        .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
+        .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
+        .gem_free_object_unlocked = drm_gem_cma_free_object,
+        .gem_vm_ops = &drm_gem_cma_vm_ops,
+        .gem_prime_export = drm_gem_prime_export,
+        .gem_prime_import = drm_gem_prime_import,
+        .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table,
+        .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table,
+        .gem_prime_vmap = drm_gem_cma_prime_vmap,
+        .gem_prime_vunmap = drm_gem_cma_prime_vunmap,
+        .gem_prime_mmap = drm_gem_cma_prime_mmap,
+        .enable_vblank = ltdc_crtc_enable_vblank,
+        .disable_vblank = ltdc_crtc_disable_vblank,
+};
+
+static int drv_load(struct drm_device *ddev)
+{
+        struct platform_device *pdev = to_platform_device(ddev->dev);
+        struct drm_fbdev_cma *fbdev;
+        struct ltdc_device *ldev;
+        int ret;
+
+        DRM_DEBUG("%s\n", __func__);
+
+        ldev = devm_kzalloc(ddev->dev, sizeof(*ldev), GFP_KERNEL);
+        if (!ldev)
+                return -ENOMEM;
+
+        ddev->dev_private = (void *)ldev;
+
+        drm_mode_config_init(ddev);
+
+        /*
+         * set max width and height as default value.
+         * this value would be used to check framebuffer size limitation
+         * at drm_mode_addfb().
+         */
+        ddev->mode_config.min_width = 0;
+        ddev->mode_config.min_height = 0;
+        ddev->mode_config.max_width = STM_MAX_FB_WIDTH;
+        ddev->mode_config.max_height = STM_MAX_FB_HEIGHT;
+        ddev->mode_config.funcs = &drv_mode_config_funcs;
+
+        ret = ltdc_load(ddev);
+        if (ret)
+                goto err;
+
+        drm_mode_config_reset(ddev);
+        drm_kms_helper_poll_init(ddev);
+
+        if (ddev->mode_config.num_connector) {
+                ldev = ddev->dev_private;
+                fbdev = drm_fbdev_cma_init(ddev, 16,
+                                           ddev->mode_config.num_connector);
+                if (IS_ERR(fbdev)) {
+                        DRM_DEBUG("Warning: fails to create fbdev\n");
+                        fbdev = NULL;
+                }
+                ldev->fbdev = fbdev;
+        }
+
+        platform_set_drvdata(pdev, ddev);
+
+        return 0;
+err:
+        drm_mode_config_cleanup(ddev);
+        return ret;
+}
+
+static void drv_unload(struct drm_device *ddev)
+{
+        struct ltdc_device *ldev = ddev->dev_private;
+
+        DRM_DEBUG("%s\n", __func__);
+
+        if (ldev->fbdev) {
+                drm_fbdev_cma_fini(ldev->fbdev);
+                ldev->fbdev = NULL;
+        }
+        drm_kms_helper_poll_fini(ddev);
+        ltdc_unload(ddev);
+        drm_mode_config_cleanup(ddev);
+}
+
+static int stm_drm_platform_probe(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct drm_device *ddev;
+        int ret;
+
+        DRM_DEBUG("%s\n", __func__);
+
+        dma_set_coherent_mask(dev, DMA_BIT_MASK(32));
+
+        ddev = drm_dev_alloc(&drv_driver, dev);
+        if (IS_ERR(ddev))
+                return PTR_ERR(ddev);
+
+        ret = drv_load(ddev);
+        if (ret)
+                goto err_unref;
+
+        ret = drm_dev_register(ddev, 0);
+        if (ret)
+                goto err_unref;
+
+        return 0;
+
+err_unref:
+        drm_dev_unref(ddev);
+
+        return ret;
+}
+
+static int stm_drm_platform_remove(struct platform_device *pdev)
+{
+        struct drm_device *ddev = platform_get_drvdata(pdev);
+
+        DRM_DEBUG("%s\n", __func__);
+
+        drm_dev_unregister(ddev);
+        drv_unload(ddev);
+        drm_dev_unref(ddev);
+
+        return 0;
+}
+
+static const struct of_device_id drv_dt_ids[] = {
+        { .compatible = "st,stm32-ltdc"},
+        { /* end node */ },
+};
+MODULE_DEVICE_TABLE(of, drv_dt_ids);
+
+static struct platform_driver stm_drm_platform_driver = {
+        .probe = stm_drm_platform_probe,
+        .remove = stm_drm_platform_remove,
+        .driver = {
+                .name = DRIVER_NAME,
+                .of_match_table = drv_dt_ids,
+        },
+};
+
+module_platform_driver(stm_drm_platform_driver);
+
+MODULE_AUTHOR("Philippe Cornu <philippe.cornu@st.com>");
+MODULE_AUTHOR("Yannick Fertre <yannick.fertre@st.com>");
+MODULE_AUTHOR("Fabien Dessenne <fabien.dessenne@st.com>");
+MODULE_AUTHOR("Mickael Reulier <mickael.reulier@st.com>");
+MODULE_DESCRIPTION("STMicroelectronics ST DRM LTDC driver");
+MODULE_LICENSE("GPL v2");