Merge arlied/drm-next into drm-misc-next
authorGustavo Padovan <gustavo.padovan@collabora.com>
Mon, 4 Dec 2017 18:04:45 +0000 (16:04 -0200)
committerGustavo Padovan <gustavo.padovan@collabora.com>
Mon, 4 Dec 2017 18:04:45 +0000 (16:04 -0200)
We need to pull 66660d4cf21b (drm: add connector info/property for
non-desktop displays [v2]) into drm-misc-next to continue the development
of the display rotation series.

Effectively this also pulls 4.15-r2 into drm-misc-next.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
22 files changed:
Documentation/devicetree/bindings/display/ilitek,ili9225.txt [new file with mode: 0644]
Documentation/devicetree/bindings/vendor-prefixes.txt
Documentation/gpu/todo.rst
MAINTAINERS
drivers/gpu/drm/arm/malidp_drv.c
drivers/gpu/drm/arm/malidp_drv.h
drivers/gpu/drm/drm_modeset_helper.c
drivers/gpu/drm/drm_prime.c
drivers/gpu/drm/drm_probe_helper.c
drivers/gpu/drm/sun4i/sun4i_drv.c
drivers/gpu/drm/sun4i/sun4i_tcon.c
drivers/gpu/drm/sun4i/sun4i_tcon.h
drivers/gpu/drm/tinydrm/Kconfig
drivers/gpu/drm/tinydrm/Makefile
drivers/gpu/drm/tinydrm/core/tinydrm-core.c
drivers/gpu/drm/tinydrm/ili9225.c [new file with mode: 0644]
drivers/gpu/drm/tinydrm/mi0283qt.c
drivers/gpu/drm/tinydrm/mipi-dbi.c
include/drm/drm_mode_config.h
include/drm/drm_modeset_helper.h
include/drm/tinydrm/mipi-dbi.h
include/drm/tinydrm/tinydrm.h

diff --git a/Documentation/devicetree/bindings/display/ilitek,ili9225.txt b/Documentation/devicetree/bindings/display/ilitek,ili9225.txt
new file mode 100644 (file)
index 0000000..21607a5
--- /dev/null
@@ -0,0 +1,25 @@
+Ilitek ILI9225 display panels
+
+This binding is for display panels using an Ilitek ILI9225 controller in SPI
+mode.
+
+Required properties:
+- compatible:  "ilitek,ili9225-2.2in-176x220"
+- rs-gpios:    Register select signal
+- reset-gpios: Reset pin
+
+The node for this driver must be a child node of a SPI controller, hence
+all mandatory properties described in ../spi/spi-bus.txt must be specified.
+
+Optional properties:
+- rotation:    panel rotation in degrees counter clockwise (0,90,180,270)
+
+Example:
+       display@0{
+               compatible = "ilitek,ili9225-2.2in-176x220";
+               reg = <0>;
+               spi-max-frequency = <12000000>;
+               rs-gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
+               reset-gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
+               rotation = <270>;
+       };
index 0994bdd82cd37ce0abf9882745fd174764524ac5..41cb1ff0715072a132f54b6b33421032c59e5399 100644 (file)
@@ -154,6 +154,7 @@ i2se        I2SE GmbH
 ibm    International Business Machines (IBM)
 idt    Integrated Device Technologies, Inc.
 ifi    Ingenieurburo Fur Ic-Technologie (I/F/I)
+ilitek ILI Technology Corporation (ILITEK)
 img    Imagination Technologies Ltd.
 infineon Infineon Technologies
 inforce        Inforce Computing
index 01eaa40dafc9be452dd232855458f0bf1fdbfde0..af614746d9c53d67eacdef9b3ea36932294208c7 100644 (file)
@@ -185,6 +185,15 @@ are better.
 
 Contact: Sean Paul, Maintainer of the driver you plan to convert
 
+Convert drivers to use simple modeset suspend/resume
+----------------------------------------------------
+
+Most drivers (except i915 and nouveau) that use
+drm_atomic_helper_suspend/resume() can probably be converted to use
+drm_mode_config_helper_suspend/resume().
+
+Contact: Maintainer of the driver you plan to convert
+
 Core refactorings
 =================
 
@@ -404,11 +413,6 @@ those drivers as simple as possible, so lots of room for refactoring:
   a drm_device wrong. Doesn't matter, since everyone else gets it wrong
   too :-)
 
-- With the fbdev pointer in dev->mode_config we could also make
-  suspend/resume helpers entirely generic, at least if we add a
-  dev->mode_config.suspend_state. We could even provide a generic pm_ops
-  structure with those.
-
 - also rework the drm_framebuffer_funcs->dirty hook wire-up, see above.
 
 Contact: Noralf Trønnes, Daniel Vetter
index 069ba63190b2cb9393405dcd1ea47d93be9146b7..8110df7acfeab0632270ddeb033c114b10526e91 100644 (file)
@@ -4461,6 +4461,12 @@ T:       git git://anongit.freedesktop.org/drm/drm-misc
 S:     Maintained
 F:     drivers/gpu/drm/tve200/
 
+DRM DRIVER FOR ILITEK ILI9225 PANELS
+M:     David Lechner <david@lechnology.com>
+S:     Maintained
+F:     drivers/gpu/drm/tinydrm/ili9225.c
+F:     Documentation/devicetree/bindings/display/ili9225.txt
+
 DRM DRIVER FOR INTEL I810 VIDEO CARDS
 S:     Orphan / Obsolete
 F:     drivers/gpu/drm/i810/
index 91f2b0191368c942ddb936ad6e736e560342fe99..e080e31a8513a0b74c5b9150be2fa0f293df7d49 100644 (file)
@@ -27,6 +27,7 @@
 #include <drm/drm_fb_cma_helper.h>
 #include <drm/drm_gem_cma_helper.h>
 #include <drm/drm_gem_framebuffer_helper.h>
+#include <drm/drm_modeset_helper.h>
 #include <drm/drm_of.h>
 
 #include "malidp_drv.h"
@@ -745,34 +746,15 @@ static int malidp_platform_remove(struct platform_device *pdev)
 static int __maybe_unused malidp_pm_suspend(struct device *dev)
 {
        struct drm_device *drm = dev_get_drvdata(dev);
-       struct malidp_drm *malidp = drm->dev_private;
-
-       drm_kms_helper_poll_disable(drm);
-       console_lock();
-       drm_fbdev_cma_set_suspend(malidp->fbdev, 1);
-       console_unlock();
-       malidp->pm_state = drm_atomic_helper_suspend(drm);
-       if (IS_ERR(malidp->pm_state)) {
-               console_lock();
-               drm_fbdev_cma_set_suspend(malidp->fbdev, 0);
-               console_unlock();
-               drm_kms_helper_poll_enable(drm);
-               return PTR_ERR(malidp->pm_state);
-       }
 
-       return 0;
+       return drm_mode_config_helper_suspend(drm);
 }
 
 static int __maybe_unused malidp_pm_resume(struct device *dev)
 {
        struct drm_device *drm = dev_get_drvdata(dev);
-       struct malidp_drm *malidp = drm->dev_private;
 
-       drm_atomic_helper_resume(drm, malidp->pm_state);
-       console_lock();
-       drm_fbdev_cma_set_suspend(malidp->fbdev, 0);
-       console_unlock();
-       drm_kms_helper_poll_enable(drm);
+       drm_mode_config_helper_resume(drm);
 
        return 0;
 }
index 2e2033140efc0be4f4557ae3f05c6dafa0a67cf5..70ed6aeccf052192c50c3b9f48f3c135d112e786 100644 (file)
@@ -24,7 +24,6 @@ struct malidp_drm {
        struct drm_crtc crtc;
        wait_queue_head_t wq;
        atomic_t config_valid;
-       struct drm_atomic_state *pm_state;
        u32 core_id;
 };
 
index 9cb1eede0b4d9444a40e9b575b0e0184f4d2c9a5..f1c24ab0ef09f6ca4c45d08c6c4552f11126516b 100644 (file)
@@ -20,6 +20,9 @@
  * OF THIS SOFTWARE.
  */
 
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_fb_helper.h>
 #include <drm/drm_modeset_helper.h>
 #include <drm/drm_plane_helper.h>
 
@@ -156,3 +159,76 @@ int drm_crtc_init(struct drm_device *dev, struct drm_crtc *crtc,
                                         NULL);
 }
 EXPORT_SYMBOL(drm_crtc_init);
+
+/**
+ * drm_mode_config_helper_suspend - Modeset suspend helper
+ * @dev: DRM device
+ *
+ * This helper function takes care of suspending the modeset side. It disables
+ * output polling if initialized, suspends fbdev if used and finally calls
+ * drm_atomic_helper_suspend().
+ * If suspending fails, fbdev and polling is re-enabled.
+ *
+ * Returns:
+ * Zero on success, negative error code on error.
+ *
+ * See also:
+ * drm_kms_helper_poll_disable() and drm_fb_helper_set_suspend_unlocked().
+ */
+int drm_mode_config_helper_suspend(struct drm_device *dev)
+{
+       struct drm_atomic_state *state;
+
+       if (!dev)
+               return 0;
+
+       drm_kms_helper_poll_disable(dev);
+       drm_fb_helper_set_suspend_unlocked(dev->fb_helper, 1);
+       state = drm_atomic_helper_suspend(dev);
+       if (IS_ERR(state)) {
+               drm_fb_helper_set_suspend_unlocked(dev->fb_helper, 0);
+               drm_kms_helper_poll_enable(dev);
+               return PTR_ERR(state);
+       }
+
+       dev->mode_config.suspend_state = state;
+
+       return 0;
+}
+EXPORT_SYMBOL(drm_mode_config_helper_suspend);
+
+/**
+ * drm_mode_config_helper_resume - Modeset resume helper
+ * @dev: DRM device
+ *
+ * This helper function takes care of resuming the modeset side. It calls
+ * drm_atomic_helper_resume(), resumes fbdev if used and enables output polling
+ * if initiaized.
+ *
+ * Returns:
+ * Zero on success, negative error code on error.
+ *
+ * See also:
+ * drm_fb_helper_set_suspend_unlocked() and drm_kms_helper_poll_enable().
+ */
+int drm_mode_config_helper_resume(struct drm_device *dev)
+{
+       int ret;
+
+       if (!dev)
+               return 0;
+
+       if (WARN_ON(!dev->mode_config.suspend_state))
+               return -EINVAL;
+
+       ret = drm_atomic_helper_resume(dev, dev->mode_config.suspend_state);
+       if (ret)
+               DRM_ERROR("Failed to resume (%d)\n", ret);
+       dev->mode_config.suspend_state = NULL;
+
+       drm_fb_helper_set_suspend_unlocked(dev->fb_helper, 0);
+       drm_kms_helper_poll_enable(dev);
+
+       return ret;
+}
+EXPORT_SYMBOL(drm_mode_config_helper_resume);
index 8de93a226c244aa0d7fff7a77c889864c7f3a205..9a17725b0f7a121b613224bda8963e42520a007b 100644 (file)
@@ -218,8 +218,9 @@ static void drm_gem_map_detach(struct dma_buf *dma_buf,
        sgt = prime_attach->sgt;
        if (sgt) {
                if (prime_attach->dir != DMA_NONE)
-                       dma_unmap_sg(attach->dev, sgt->sgl, sgt->nents,
-                                       prime_attach->dir);
+                       dma_unmap_sg_attrs(attach->dev, sgt->sgl, sgt->nents,
+                                          prime_attach->dir,
+                                          DMA_ATTR_SKIP_CPU_SYNC);
                sg_free_table(sgt);
        }
 
@@ -277,7 +278,8 @@ static struct sg_table *drm_gem_map_dma_buf(struct dma_buf_attachment *attach,
        sgt = obj->dev->driver->gem_prime_get_sg_table(obj);
 
        if (!IS_ERR(sgt)) {
-               if (!dma_map_sg(attach->dev, sgt->sgl, sgt->nents, dir)) {
+               if (!dma_map_sg_attrs(attach->dev, sgt->sgl, sgt->nents, dir,
+                                     DMA_ATTR_SKIP_CPU_SYNC)) {
                        sg_free_table(sgt);
                        kfree(sgt);
                        sgt = ERR_PTR(-ENOMEM);
index 6dc2dde5b67202d43ad17438c8feb84eda010f41..555fbe54d6e224e2b58a7d263353efac2d7e0104 100644 (file)
@@ -216,8 +216,7 @@ enum drm_mode_status drm_connector_mode_valid(struct drm_connector *connector,
  * suspend/resume.
  *
  * Drivers can call this helper from their device resume implementation. It is
- * an error to call this when the output polling support has not yet been set
- * up.
+ * not an error to call this even when output polling isn't enabled.
  *
  * Note that calls to enable and disable polling must be strictly ordered, which
  * is automatically the case when they're only call from suspend/resume
index 75c76cdd82bc6e15fcae27aa33fe165f420c381b..49215d91c853892ef25a4a66a8c7aaba8efc0ff1 100644 (file)
@@ -187,13 +187,7 @@ static bool sun4i_drv_node_is_frontend(struct device_node *node)
 
 static bool sun4i_drv_node_is_tcon(struct device_node *node)
 {
-       return of_device_is_compatible(node, "allwinner,sun4i-a10-tcon") ||
-               of_device_is_compatible(node, "allwinner,sun5i-a13-tcon") ||
-               of_device_is_compatible(node, "allwinner,sun6i-a31-tcon") ||
-               of_device_is_compatible(node, "allwinner,sun6i-a31s-tcon") ||
-               of_device_is_compatible(node, "allwinner,sun7i-a20-tcon") ||
-               of_device_is_compatible(node, "allwinner,sun8i-a33-tcon") ||
-               of_device_is_compatible(node, "allwinner,sun8i-v3s-tcon");
+       return !!of_match_node(sun4i_tcon_of_table, node);
 }
 
 static int compare_of(struct device *dev, void *data)
index e122f5b2a395583cc14302a9bc4166fbba671071..a1ed462c24307b8b79eea334efdab6a5a17027a2 100644 (file)
@@ -900,7 +900,8 @@ static const struct sun4i_tcon_quirks sun8i_v3s_quirks = {
        /* nothing is supported */
 };
 
-static const struct of_device_id sun4i_tcon_of_table[] = {
+/* sun4i_drv uses this list to check if a device node is a TCON */
+const struct of_device_id sun4i_tcon_of_table[] = {
        { .compatible = "allwinner,sun4i-a10-tcon", .data = &sun4i_a10_quirks },
        { .compatible = "allwinner,sun5i-a13-tcon", .data = &sun5i_a13_quirks },
        { .compatible = "allwinner,sun6i-a31-tcon", .data = &sun6i_a31_quirks },
@@ -911,6 +912,7 @@ static const struct of_device_id sun4i_tcon_of_table[] = {
        { }
 };
 MODULE_DEVICE_TABLE(of, sun4i_tcon_of_table);
+EXPORT_SYMBOL(sun4i_tcon_of_table);
 
 static struct platform_driver sun4i_tcon_platform_driver = {
        .probe          = sun4i_tcon_probe,
index f61bf6d83b4a04f45e8d8c2be4f6b4615bd1e8e0..839266a3850590badb9cdfbb375c9d02ec03a24d 100644 (file)
@@ -197,4 +197,6 @@ void sun4i_tcon_mode_set(struct sun4i_tcon *tcon,
 void sun4i_tcon_set_status(struct sun4i_tcon *crtc,
                           const struct drm_encoder *encoder, bool enable);
 
+extern const struct of_device_id sun4i_tcon_of_table[];
+
 #endif /* __SUN4I_TCON_H__ */
index 2e790e7dced5dc08dea014d58095deba555c715c..90c5bd5ef81b210bf2bce0a970b82cbc5cea672b 100644 (file)
@@ -12,6 +12,16 @@ menuconfig DRM_TINYDRM
 config TINYDRM_MIPI_DBI
        tristate
 
+config TINYDRM_ILI9225
+       tristate "DRM support for ILI9225 display panels"
+       depends on DRM_TINYDRM && SPI
+       select TINYDRM_MIPI_DBI
+       help
+         DRM driver for the following Ilitek ILI9225 panels:
+         * No-name 2.2" color screen module
+
+         If M is selected the module will be called ili9225.
+
 config TINYDRM_MI0283QT
        tristate "DRM support for MI0283QT"
        depends on DRM_TINYDRM && SPI
index 0c184bd1bb59598d61a2f0529e4998c7e38bd68a..8aeee532474f51e8bb53351ca1efd049530cad65 100644 (file)
@@ -4,6 +4,7 @@ obj-$(CONFIG_DRM_TINYDRM)               += core/
 obj-$(CONFIG_TINYDRM_MIPI_DBI)         += mipi-dbi.o
 
 # Displays
+obj-$(CONFIG_TINYDRM_ILI9225)          += ili9225.o
 obj-$(CONFIG_TINYDRM_MI0283QT)         += mi0283qt.o
 obj-$(CONFIG_TINYDRM_REPAPER)          += repaper.o
 obj-$(CONFIG_TINYDRM_ST7586)           += st7586.o
index 1a8a57cad4312eb5e6e248085387af07dac8ced4..bd7b82824a34c004247db1e7af91effe7bbcac7f 100644 (file)
@@ -292,71 +292,4 @@ void tinydrm_shutdown(struct tinydrm_device *tdev)
 }
 EXPORT_SYMBOL(tinydrm_shutdown);
 
-/**
- * tinydrm_suspend - Suspend tinydrm
- * @tdev: tinydrm device
- *
- * Used in driver PM operations to suspend tinydrm.
- * Suspends fbdev and DRM.
- * Resume with tinydrm_resume().
- *
- * Returns:
- * Zero on success, negative error code on failure.
- */
-int tinydrm_suspend(struct tinydrm_device *tdev)
-{
-       struct drm_atomic_state *state;
-
-       if (tdev->suspend_state) {
-               DRM_ERROR("Failed to suspend: state already set\n");
-               return -EINVAL;
-       }
-
-       drm_fbdev_cma_set_suspend_unlocked(tdev->fbdev_cma, 1);
-       state = drm_atomic_helper_suspend(tdev->drm);
-       if (IS_ERR(state)) {
-               drm_fbdev_cma_set_suspend_unlocked(tdev->fbdev_cma, 0);
-               return PTR_ERR(state);
-       }
-
-       tdev->suspend_state = state;
-
-       return 0;
-}
-EXPORT_SYMBOL(tinydrm_suspend);
-
-/**
- * tinydrm_resume - Resume tinydrm
- * @tdev: tinydrm device
- *
- * Used in driver PM operations to resume tinydrm.
- * Suspend with tinydrm_suspend().
- *
- * Returns:
- * Zero on success, negative error code on failure.
- */
-int tinydrm_resume(struct tinydrm_device *tdev)
-{
-       struct drm_atomic_state *state = tdev->suspend_state;
-       int ret;
-
-       if (!state) {
-               DRM_ERROR("Failed to resume: state is not set\n");
-               return -EINVAL;
-       }
-
-       tdev->suspend_state = NULL;
-
-       ret = drm_atomic_helper_resume(tdev->drm, state);
-       if (ret) {
-               DRM_ERROR("Error resuming state: %d\n", ret);
-               return ret;
-       }
-
-       drm_fbdev_cma_set_suspend_unlocked(tdev->fbdev_cma, 0);
-
-       return 0;
-}
-EXPORT_SYMBOL(tinydrm_resume);
-
 MODULE_LICENSE("GPL");
diff --git a/drivers/gpu/drm/tinydrm/ili9225.c b/drivers/gpu/drm/tinydrm/ili9225.c
new file mode 100644 (file)
index 0000000..3b766a2
--- /dev/null
@@ -0,0 +1,468 @@
+/*
+ * DRM driver for Ilitek ILI9225 panels
+ *
+ * Copyright 2017 David Lechner <david@lechnology.com>
+ *
+ * Some code copied from mipi-dbi.c
+ * Copyright 2016 Noralf Trønnes
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <linux/delay.h>
+#include <linux/dma-buf.h>
+#include <linux/gpio/consumer.h>
+#include <linux/module.h>
+#include <linux/property.h>
+#include <linux/spi/spi.h>
+#include <video/mipi_display.h>
+
+#include <drm/drm_gem_framebuffer_helper.h>
+#include <drm/tinydrm/mipi-dbi.h>
+#include <drm/tinydrm/tinydrm-helpers.h>
+
+#define ILI9225_DRIVER_READ_CODE       0x00
+#define ILI9225_DRIVER_OUTPUT_CONTROL  0x01
+#define ILI9225_LCD_AC_DRIVING_CONTROL 0x02
+#define ILI9225_ENTRY_MODE             0x03
+#define ILI9225_DISPLAY_CONTROL_1      0x07
+#define ILI9225_BLANK_PERIOD_CONTROL_1 0x08
+#define ILI9225_FRAME_CYCLE_CONTROL    0x0b
+#define ILI9225_INTERFACE_CONTROL      0x0c
+#define ILI9225_OSCILLATION_CONTROL    0x0f
+#define ILI9225_POWER_CONTROL_1                0x10
+#define ILI9225_POWER_CONTROL_2                0x11
+#define ILI9225_POWER_CONTROL_3                0x12
+#define ILI9225_POWER_CONTROL_4                0x13
+#define ILI9225_POWER_CONTROL_5                0x14
+#define ILI9225_VCI_RECYCLING          0x15
+#define ILI9225_RAM_ADDRESS_SET_1      0x20
+#define ILI9225_RAM_ADDRESS_SET_2      0x21
+#define ILI9225_WRITE_DATA_TO_GRAM     0x22
+#define ILI9225_SOFTWARE_RESET         0x28
+#define ILI9225_GATE_SCAN_CONTROL      0x30
+#define ILI9225_VERTICAL_SCROLL_1      0x31
+#define ILI9225_VERTICAL_SCROLL_2      0x32
+#define ILI9225_VERTICAL_SCROLL_3      0x33
+#define ILI9225_PARTIAL_DRIVING_POS_1  0x34
+#define ILI9225_PARTIAL_DRIVING_POS_2  0x35
+#define ILI9225_HORIZ_WINDOW_ADDR_1    0x36
+#define ILI9225_HORIZ_WINDOW_ADDR_2    0x37
+#define ILI9225_VERT_WINDOW_ADDR_1     0x38
+#define ILI9225_VERT_WINDOW_ADDR_2     0x39
+#define ILI9225_GAMMA_CONTROL_1                0x50
+#define ILI9225_GAMMA_CONTROL_2                0x51
+#define ILI9225_GAMMA_CONTROL_3                0x52
+#define ILI9225_GAMMA_CONTROL_4                0x53
+#define ILI9225_GAMMA_CONTROL_5                0x54
+#define ILI9225_GAMMA_CONTROL_6                0x55
+#define ILI9225_GAMMA_CONTROL_7                0x56
+#define ILI9225_GAMMA_CONTROL_8                0x57
+#define ILI9225_GAMMA_CONTROL_9                0x58
+#define ILI9225_GAMMA_CONTROL_10       0x59
+
+static inline int ili9225_command(struct mipi_dbi *mipi, u8 cmd, u16 data)
+{
+       u8 par[2] = { data >> 8, data & 0xff };
+
+       return mipi_dbi_command_buf(mipi, cmd, par, 2);
+}
+
+static int ili9225_fb_dirty(struct drm_framebuffer *fb,
+                           struct drm_file *file_priv, unsigned int flags,
+                           unsigned int color, struct drm_clip_rect *clips,
+                           unsigned int num_clips)
+{
+       struct drm_gem_cma_object *cma_obj = drm_fb_cma_get_gem_obj(fb, 0);
+       struct tinydrm_device *tdev = fb->dev->dev_private;
+       struct mipi_dbi *mipi = mipi_dbi_from_tinydrm(tdev);
+       bool swap = mipi->swap_bytes;
+       struct drm_clip_rect clip;
+       u16 x_start, y_start;
+       u16 x1, x2, y1, y2;
+       int ret = 0;
+       bool full;
+       void *tr;
+
+       mutex_lock(&tdev->dirty_lock);
+
+       if (!mipi->enabled)
+               goto out_unlock;
+
+       /* fbdev can flush even when we're not interested */
+       if (tdev->pipe.plane.fb != fb)
+               goto out_unlock;
+
+       full = tinydrm_merge_clips(&clip, clips, num_clips, flags,
+                                  fb->width, fb->height);
+
+       DRM_DEBUG("Flushing [FB:%d] x1=%u, x2=%u, y1=%u, y2=%u\n", fb->base.id,
+                 clip.x1, clip.x2, clip.y1, clip.y2);
+
+       if (!mipi->dc || !full || swap ||
+           fb->format->format == DRM_FORMAT_XRGB8888) {
+               tr = mipi->tx_buf;
+               ret = mipi_dbi_buf_copy(mipi->tx_buf, fb, &clip, swap);
+               if (ret)
+                       goto out_unlock;
+       } else {
+               tr = cma_obj->vaddr;
+       }
+
+       switch (mipi->rotation) {
+       default:
+               x1 = clip.x1;
+               x2 = clip.x2 - 1;
+               y1 = clip.y1;
+               y2 = clip.y2 - 1;
+               x_start = x1;
+               y_start = y1;
+               break;
+       case 90:
+               x1 = clip.y1;
+               x2 = clip.y2 - 1;
+               y1 = fb->width - clip.x2;
+               y2 = fb->width - clip.x1 - 1;
+               x_start = x1;
+               y_start = y2;
+               break;
+       case 180:
+               x1 = fb->width - clip.x2;
+               x2 = fb->width - clip.x1 - 1;
+               y1 = fb->height - clip.y2;
+               y2 = fb->height - clip.y1 - 1;
+               x_start = x2;
+               y_start = y2;
+               break;
+       case 270:
+               x1 = fb->height - clip.y2;
+               x2 = fb->height - clip.y1 - 1;
+               y1 = clip.x1;
+               y2 = clip.x2 - 1;
+               x_start = x2;
+               y_start = y1;
+               break;
+       }
+
+       ili9225_command(mipi, ILI9225_HORIZ_WINDOW_ADDR_1, x2);
+       ili9225_command(mipi, ILI9225_HORIZ_WINDOW_ADDR_2, x1);
+       ili9225_command(mipi, ILI9225_VERT_WINDOW_ADDR_1, y2);
+       ili9225_command(mipi, ILI9225_VERT_WINDOW_ADDR_2, y1);
+
+       ili9225_command(mipi, ILI9225_RAM_ADDRESS_SET_1, x_start);
+       ili9225_command(mipi, ILI9225_RAM_ADDRESS_SET_2, y_start);
+
+       ret = mipi_dbi_command_buf(mipi, ILI9225_WRITE_DATA_TO_GRAM, tr,
+                               (clip.x2 - clip.x1) * (clip.y2 - clip.y1) * 2);
+
+out_unlock:
+       mutex_unlock(&tdev->dirty_lock);
+
+       if (ret)
+               dev_err_once(fb->dev->dev, "Failed to update display %d\n",
+                            ret);
+
+       return ret;
+}
+
+static const struct drm_framebuffer_funcs ili9225_fb_funcs = {
+       .destroy        = drm_gem_fb_destroy,
+       .create_handle  = drm_gem_fb_create_handle,
+       .dirty          = ili9225_fb_dirty,
+};
+
+static void ili9225_pipe_enable(struct drm_simple_display_pipe *pipe,
+                               struct drm_crtc_state *crtc_state)
+{
+       struct tinydrm_device *tdev = pipe_to_tinydrm(pipe);
+       struct mipi_dbi *mipi = mipi_dbi_from_tinydrm(tdev);
+       struct drm_framebuffer *fb = pipe->plane.fb;
+       struct device *dev = tdev->drm->dev;
+       int ret;
+       u8 am_id;
+
+       DRM_DEBUG_KMS("\n");
+
+       mipi_dbi_hw_reset(mipi);
+
+       /*
+        * There don't seem to be two example init sequences that match, so
+        * using the one from the popular Arduino library for this display.
+        * https://github.com/Nkawu/TFT_22_ILI9225/blob/master/src/TFT_22_ILI9225.cpp
+        */
+
+       ret = ili9225_command(mipi, ILI9225_POWER_CONTROL_1, 0x0000);
+       if (ret) {
+               DRM_DEV_ERROR(dev, "Error sending command %d\n", ret);
+               return;
+       }
+       ili9225_command(mipi, ILI9225_POWER_CONTROL_2, 0x0000);
+       ili9225_command(mipi, ILI9225_POWER_CONTROL_3, 0x0000);
+       ili9225_command(mipi, ILI9225_POWER_CONTROL_4, 0x0000);
+       ili9225_command(mipi, ILI9225_POWER_CONTROL_5, 0x0000);
+
+       msleep(40);
+
+       ili9225_command(mipi, ILI9225_POWER_CONTROL_2, 0x0018);
+       ili9225_command(mipi, ILI9225_POWER_CONTROL_3, 0x6121);
+       ili9225_command(mipi, ILI9225_POWER_CONTROL_4, 0x006f);
+       ili9225_command(mipi, ILI9225_POWER_CONTROL_5, 0x495f);
+       ili9225_command(mipi, ILI9225_POWER_CONTROL_1, 0x0800);
+
+       msleep(10);
+
+       ili9225_command(mipi, ILI9225_POWER_CONTROL_2, 0x103b);
+
+       msleep(50);
+
+       switch (mipi->rotation) {
+       default:
+               am_id = 0x30;
+               break;
+       case 90:
+               am_id = 0x18;
+               break;
+       case 180:
+               am_id = 0x00;
+               break;
+       case 270:
+               am_id = 0x28;
+               break;
+       }
+       ili9225_command(mipi, ILI9225_DRIVER_OUTPUT_CONTROL, 0x011c);
+       ili9225_command(mipi, ILI9225_LCD_AC_DRIVING_CONTROL, 0x0100);
+       ili9225_command(mipi, ILI9225_ENTRY_MODE, 0x1000 | am_id);
+       ili9225_command(mipi, ILI9225_DISPLAY_CONTROL_1, 0x0000);
+       ili9225_command(mipi, ILI9225_BLANK_PERIOD_CONTROL_1, 0x0808);
+       ili9225_command(mipi, ILI9225_FRAME_CYCLE_CONTROL, 0x1100);
+       ili9225_command(mipi, ILI9225_INTERFACE_CONTROL, 0x0000);
+       ili9225_command(mipi, ILI9225_OSCILLATION_CONTROL, 0x0d01);
+       ili9225_command(mipi, ILI9225_VCI_RECYCLING, 0x0020);
+       ili9225_command(mipi, ILI9225_RAM_ADDRESS_SET_1, 0x0000);
+       ili9225_command(mipi, ILI9225_RAM_ADDRESS_SET_2, 0x0000);
+
+       ili9225_command(mipi, ILI9225_GATE_SCAN_CONTROL, 0x0000);
+       ili9225_command(mipi, ILI9225_VERTICAL_SCROLL_1, 0x00db);
+       ili9225_command(mipi, ILI9225_VERTICAL_SCROLL_2, 0x0000);
+       ili9225_command(mipi, ILI9225_VERTICAL_SCROLL_3, 0x0000);
+       ili9225_command(mipi, ILI9225_PARTIAL_DRIVING_POS_1, 0x00db);
+       ili9225_command(mipi, ILI9225_PARTIAL_DRIVING_POS_2, 0x0000);
+
+       ili9225_command(mipi, ILI9225_GAMMA_CONTROL_1, 0x0000);
+       ili9225_command(mipi, ILI9225_GAMMA_CONTROL_2, 0x0808);
+       ili9225_command(mipi, ILI9225_GAMMA_CONTROL_3, 0x080a);
+       ili9225_command(mipi, ILI9225_GAMMA_CONTROL_4, 0x000a);
+       ili9225_command(mipi, ILI9225_GAMMA_CONTROL_5, 0x0a08);
+       ili9225_command(mipi, ILI9225_GAMMA_CONTROL_6, 0x0808);
+       ili9225_command(mipi, ILI9225_GAMMA_CONTROL_7, 0x0000);
+       ili9225_command(mipi, ILI9225_GAMMA_CONTROL_8, 0x0a00);
+       ili9225_command(mipi, ILI9225_GAMMA_CONTROL_9, 0x0710);
+       ili9225_command(mipi, ILI9225_GAMMA_CONTROL_10, 0x0710);
+
+       ili9225_command(mipi, ILI9225_DISPLAY_CONTROL_1, 0x0012);
+
+       msleep(50);
+
+       ili9225_command(mipi, ILI9225_DISPLAY_CONTROL_1, 0x1017);
+
+       mipi->enabled = true;
+
+       if (fb)
+               fb->funcs->dirty(fb, NULL, 0, 0, NULL, 0);
+}
+
+static void ili9225_pipe_disable(struct drm_simple_display_pipe *pipe)
+{
+       struct tinydrm_device *tdev = pipe_to_tinydrm(pipe);
+       struct mipi_dbi *mipi = mipi_dbi_from_tinydrm(tdev);
+
+       DRM_DEBUG_KMS("\n");
+
+       if (!mipi->enabled)
+               return;
+
+       ili9225_command(mipi, ILI9225_DISPLAY_CONTROL_1, 0x0000);
+       msleep(50);
+       ili9225_command(mipi, ILI9225_POWER_CONTROL_2, 0x0007);
+       msleep(50);
+       ili9225_command(mipi, ILI9225_POWER_CONTROL_1, 0x0a02);
+
+       mipi->enabled = false;
+}
+
+static int ili9225_dbi_command(struct mipi_dbi *mipi, u8 cmd, u8 *par,
+                              size_t num)
+{
+       struct spi_device *spi = mipi->spi;
+       unsigned int bpw = 8;
+       u32 speed_hz;
+       int ret;
+
+       gpiod_set_value_cansleep(mipi->dc, 0);
+       speed_hz = mipi_dbi_spi_cmd_max_speed(spi, 1);
+       ret = tinydrm_spi_transfer(spi, speed_hz, NULL, 8, &cmd, 1);
+       if (ret || !num)
+               return ret;
+
+       if (cmd == ILI9225_WRITE_DATA_TO_GRAM && !mipi->swap_bytes)
+               bpw = 16;
+
+       gpiod_set_value_cansleep(mipi->dc, 1);
+       speed_hz = mipi_dbi_spi_cmd_max_speed(spi, num);
+
+       return tinydrm_spi_transfer(spi, speed_hz, NULL, bpw, par, num);
+}
+
+static const u32 ili9225_formats[] = {
+       DRM_FORMAT_RGB565,
+       DRM_FORMAT_XRGB8888,
+};
+
+static int ili9225_init(struct device *dev, struct mipi_dbi *mipi,
+                       const struct drm_simple_display_pipe_funcs *pipe_funcs,
+                       struct drm_driver *driver,
+                       const struct drm_display_mode *mode,
+                       unsigned int rotation)
+{
+       size_t bufsize = mode->vdisplay * mode->hdisplay * sizeof(u16);
+       struct tinydrm_device *tdev = &mipi->tinydrm;
+       int ret;
+
+       if (!mipi->command)
+               return -EINVAL;
+
+       mutex_init(&mipi->cmdlock);
+
+       mipi->tx_buf = devm_kmalloc(dev, bufsize, GFP_KERNEL);
+       if (!mipi->tx_buf)
+               return -ENOMEM;
+
+       ret = devm_tinydrm_init(dev, tdev, &ili9225_fb_funcs, driver);
+       if (ret)
+               return ret;
+
+       ret = tinydrm_display_pipe_init(tdev, pipe_funcs,
+                                       DRM_MODE_CONNECTOR_VIRTUAL,
+                                       ili9225_formats,
+                                       ARRAY_SIZE(ili9225_formats), mode,
+                                       rotation);
+       if (ret)
+               return ret;
+
+       tdev->drm->mode_config.preferred_depth = 16;
+       mipi->rotation = rotation;
+
+       drm_mode_config_reset(tdev->drm);
+
+       DRM_DEBUG_KMS("preferred_depth=%u, rotation = %u\n",
+                     tdev->drm->mode_config.preferred_depth, rotation);
+
+       return 0;
+}
+
+static const struct drm_simple_display_pipe_funcs ili9225_pipe_funcs = {
+       .enable         = ili9225_pipe_enable,
+       .disable        = ili9225_pipe_disable,
+       .update         = tinydrm_display_pipe_update,
+       .prepare_fb     = tinydrm_display_pipe_prepare_fb,
+};
+
+static const struct drm_display_mode ili9225_mode = {
+       TINYDRM_MODE(176, 220, 35, 44),
+};
+
+DEFINE_DRM_GEM_CMA_FOPS(ili9225_fops);
+
+static struct drm_driver ili9225_driver = {
+       .driver_features        = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME |
+                                 DRIVER_ATOMIC,
+       .fops                   = &ili9225_fops,
+       TINYDRM_GEM_DRIVER_OPS,
+       .lastclose              = tinydrm_lastclose,
+       .name                   = "ili9225",
+       .desc                   = "Ilitek ILI9225",
+       .date                   = "20171106",
+       .major                  = 1,
+       .minor                  = 0,
+};
+
+static const struct of_device_id ili9225_of_match[] = {
+       { .compatible = "ilitek,ili9225-2.2in-176x220" },
+       {},
+};
+MODULE_DEVICE_TABLE(of, ili9225_of_match);
+
+static const struct spi_device_id ili9225_id[] = {
+       { "ili9225-2.2in-176x220", 0 },
+       { },
+};
+MODULE_DEVICE_TABLE(spi, ili9225_id);
+
+static int ili9225_probe(struct spi_device *spi)
+{
+       struct device *dev = &spi->dev;
+       struct mipi_dbi *mipi;
+       struct gpio_desc *rs;
+       u32 rotation = 0;
+       int ret;
+
+       mipi = devm_kzalloc(dev, sizeof(*mipi), GFP_KERNEL);
+       if (!mipi)
+               return -ENOMEM;
+
+       mipi->reset = devm_gpiod_get(dev, "reset", GPIOD_OUT_HIGH);
+       if (IS_ERR(mipi->reset)) {
+               DRM_DEV_ERROR(dev, "Failed to get gpio 'reset'\n");
+               return PTR_ERR(mipi->reset);
+       }
+
+       rs = devm_gpiod_get(dev, "rs", GPIOD_OUT_LOW);
+       if (IS_ERR(rs)) {
+               DRM_DEV_ERROR(dev, "Failed to get gpio 'rs'\n");
+               return PTR_ERR(rs);
+       }
+
+       device_property_read_u32(dev, "rotation", &rotation);
+
+       ret = mipi_dbi_spi_init(spi, mipi, rs);
+       if (ret)
+               return ret;
+
+       /* override the command function set in  mipi_dbi_spi_init() */
+       mipi->command = ili9225_dbi_command;
+
+       ret = ili9225_init(&spi->dev, mipi, &ili9225_pipe_funcs,
+                          &ili9225_driver, &ili9225_mode, rotation);
+       if (ret)
+               return ret;
+
+       spi_set_drvdata(spi, mipi);
+
+       return devm_tinydrm_register(&mipi->tinydrm);
+}
+
+static void ili9225_shutdown(struct spi_device *spi)
+{
+       struct mipi_dbi *mipi = spi_get_drvdata(spi);
+
+       tinydrm_shutdown(&mipi->tinydrm);
+}
+
+static struct spi_driver ili9225_spi_driver = {
+       .driver = {
+               .name = "ili9225",
+               .owner = THIS_MODULE,
+               .of_match_table = ili9225_of_match,
+       },
+       .id_table = ili9225_id,
+       .probe = ili9225_probe,
+       .shutdown = ili9225_shutdown,
+};
+module_spi_driver(ili9225_spi_driver);
+
+MODULE_DESCRIPTION("Ilitek ILI9225 DRM driver");
+MODULE_AUTHOR("David Lechner <david@lechnology.com>");
+MODULE_LICENSE("GPL");
index 6a83b309325439d99c2514f441018a0806928851..70ae4f76f45512cea9b1f5f509bff9917c27b3ea 100644 (file)
@@ -9,6 +9,7 @@
  * (at your option) any later version.
  */
 
+#include <drm/drm_modeset_helper.h>
 #include <drm/tinydrm/ili9341.h>
 #include <drm/tinydrm/mipi-dbi.h>
 #include <drm/tinydrm/tinydrm-helpers.h>
@@ -231,7 +232,7 @@ static int __maybe_unused mi0283qt_pm_suspend(struct device *dev)
        struct mipi_dbi *mipi = dev_get_drvdata(dev);
        int ret;
 
-       ret = tinydrm_suspend(&mipi->tinydrm);
+       ret = drm_mode_config_helper_suspend(mipi->tinydrm.drm);
        if (ret)
                return ret;
 
@@ -249,7 +250,9 @@ static int __maybe_unused mi0283qt_pm_resume(struct device *dev)
        if (ret)
                return ret;
 
-       return tinydrm_resume(&mipi->tinydrm);
+       drm_mode_config_helper_resume(mipi->tinydrm.drm);
+
+       return 0;
 }
 
 static const struct dev_pm_ops mi0283qt_pm_ops = {
index 347f9b226f26764dac1d6739c961700dfbffce4b..aa6b6ce568912601a1318868f782816d9d74c6da 100644 (file)
@@ -154,8 +154,18 @@ int mipi_dbi_command_buf(struct mipi_dbi *mipi, u8 cmd, u8 *data, size_t len)
 }
 EXPORT_SYMBOL(mipi_dbi_command_buf);
 
-static int mipi_dbi_buf_copy(void *dst, struct drm_framebuffer *fb,
-                               struct drm_clip_rect *clip, bool swap)
+/**
+ * mipi_dbi_buf_copy - Copy a framebuffer, transforming it if necessary
+ * @dst: The destination buffer
+ * @fb: The source framebuffer
+ * @clip: Clipping rectangle of the area to be copied
+ * @swap: When true, swap MSB/LSB of 16-bit values
+ *
+ * Returns:
+ * Zero on success, negative error code on failure.
+ */
+int mipi_dbi_buf_copy(void *dst, struct drm_framebuffer *fb,
+                     struct drm_clip_rect *clip, bool swap)
 {
        struct drm_gem_cma_object *cma_obj = drm_fb_cma_get_gem_obj(fb, 0);
        struct dma_buf_attachment *import_attach = cma_obj->base.import_attach;
@@ -192,6 +202,7 @@ static int mipi_dbi_buf_copy(void *dst, struct drm_framebuffer *fb,
                                             DMA_FROM_DEVICE);
        return ret;
 }
+EXPORT_SYMBOL(mipi_dbi_buf_copy);
 
 static int mipi_dbi_fb_dirty(struct drm_framebuffer *fb,
                             struct drm_file *file_priv,
@@ -444,18 +455,23 @@ EXPORT_SYMBOL(mipi_dbi_display_is_on);
 
 #if IS_ENABLED(CONFIG_SPI)
 
-/*
+/**
+ * mipi_dbi_spi_cmd_max_speed - get the maximum SPI bus speed
+ * @spi: SPI device
+ * @len: The transfer buffer length.
+ *
  * Many controllers have a max speed of 10MHz, but can be pushed way beyond
  * that. Increase reliability by running pixel data at max speed and the rest
  * at 10MHz, preventing transfer glitches from messing up the init settings.
  */
-static u32 mipi_dbi_spi_cmd_max_speed(struct spi_device *spi, size_t len)
+u32 mipi_dbi_spi_cmd_max_speed(struct spi_device *spi, size_t len)
 {
        if (len > 64)
                return 0; /* use default */
 
        return min_t(u32, 10000000, spi->max_speed_hz);
 }
+EXPORT_SYMBOL(mipi_dbi_spi_cmd_max_speed);
 
 /*
  * MIPI DBI Type C Option 1
index 5306ebd537b2f388d494f5675b8e3942febe118c..f7ef0023d68b531375ccc9d83239ee88c6709168 100644 (file)
@@ -760,6 +760,15 @@ struct drm_mode_config {
        /* cursor size */
        uint32_t cursor_width, cursor_height;
 
+       /**
+        * @suspend_state:
+        *
+        * Atomic state when suspended.
+        * Set by drm_mode_config_helper_suspend() and cleared by
+        * drm_mode_config_helper_resume().
+        */
+       struct drm_atomic_state *suspend_state;
+
        const struct drm_mode_config_helper_funcs *helper_private;
 };
 
index cb0ec92e11e60fbdfb942761ccb7dc2063f1dc73..efa337f031299166c7ce37d7e82b4ec854adfb2b 100644 (file)
@@ -34,4 +34,7 @@ void drm_helper_mode_fill_fb_struct(struct drm_device *dev,
 int drm_crtc_init(struct drm_device *dev, struct drm_crtc *crtc,
                  const struct drm_crtc_funcs *funcs);
 
+int drm_mode_config_helper_suspend(struct drm_device *dev);
+int drm_mode_config_helper_resume(struct drm_device *dev);
+
 #endif
index 83346ddb9dba5bcd0101b0e7a86fadab6a699f62..5d0e82b36eaf1cf8aa39b4ab76f40f5783b740e8 100644 (file)
@@ -72,10 +72,12 @@ void mipi_dbi_pipe_enable(struct drm_simple_display_pipe *pipe,
 void mipi_dbi_pipe_disable(struct drm_simple_display_pipe *pipe);
 void mipi_dbi_hw_reset(struct mipi_dbi *mipi);
 bool mipi_dbi_display_is_on(struct mipi_dbi *mipi);
+u32 mipi_dbi_spi_cmd_max_speed(struct spi_device *spi, size_t len);
 
 int mipi_dbi_command_read(struct mipi_dbi *mipi, u8 cmd, u8 *val);
 int mipi_dbi_command_buf(struct mipi_dbi *mipi, u8 cmd, u8 *data, size_t len);
-
+int mipi_dbi_buf_copy(void *dst, struct drm_framebuffer *fb,
+                     struct drm_clip_rect *clip, bool swap);
 /**
  * mipi_dbi_command - MIPI DCS command with optional parameter(s)
  * @mipi: MIPI structure
index 423828922e5ab637d0395b261c319ed986b7ed5b..03cd9d72308c1423844cad2a4c92e21c5547ef7d 100644 (file)
@@ -20,7 +20,6 @@
  * @pipe: Display pipe structure
  * @dirty_lock: Serializes framebuffer flushing
  * @fbdev_cma: CMA fbdev structure
- * @suspend_state: Atomic state when suspended
  * @fb_funcs: Framebuffer functions used when creating framebuffers
  */
 struct tinydrm_device {
@@ -28,7 +27,6 @@ struct tinydrm_device {
        struct drm_simple_display_pipe pipe;
        struct mutex dirty_lock;
        struct drm_fbdev_cma *fbdev_cma;
-       struct drm_atomic_state *suspend_state;
        const struct drm_framebuffer_funcs *fb_funcs;
 };
 
@@ -93,8 +91,6 @@ int devm_tinydrm_init(struct device *parent, struct tinydrm_device *tdev,
                      struct drm_driver *driver);
 int devm_tinydrm_register(struct tinydrm_device *tdev);
 void tinydrm_shutdown(struct tinydrm_device *tdev);
-int tinydrm_suspend(struct tinydrm_device *tdev);
-int tinydrm_resume(struct tinydrm_device *tdev);
 
 void tinydrm_display_pipe_update(struct drm_simple_display_pipe *pipe,
                                 struct drm_plane_state *old_state);