drm/tinydrm: Use DRM_MODE_CONNECTOR_SPI

tinydrm drivers announce DRM_MODE_CONNECTOR_VIRTUAL for its SPI drivers.
Use the new SPI connector type instead.

X server will now list the connector as Unknown instead of Virtual:

X.Org X Server 1.19.2
Release Date: 2017-03-02
<...>
[ 53523.905] (II) modeset(0): Output Unknown19-1 has no monitor section
[ 53523.908] (II) modeset(0): EDID for output Unknown19-1
[ 53523.910] (II) modeset(0): Printing probed modes for output Unknown19-1
[ 53523.911] (II) modeset(0): Modeline "320x240"x0.0    0.00  320 320 320 320  240 240 240 240 (0.0 kHz eP)
[ 53523.911] (II) modeset(0): Output Unknown19-1 connected
[ 53523.912] (II) modeset(0): Using exact sizes for initial modes
[ 53523.912] (II) modeset(0): Output Unknown19-1 using initial mode 320x240 +0+0

I won't chase down and fix userspace, but the new connector type will
trickle out to userspace eventually.

v2: Split patch in core and driver changes, expand commit message (Daniel)

Cc: David Lechner <david@lechnology.com>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: David Lechner <david@lechnology.com>
Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190719155916.62465-3-noralf@tronnes.org

diff --git a/drivers/gpu/drm/tinydrm/mipi-dbi.c b/drivers/gpu/drm/tinydrm/mipi-dbi.c
index ca9da654fc6f4c6e319665625bbfad08c442b5e0..791a0b43beefd3b3e5213ba836b49776a6df5c24 100644 (file)
--- a/drivers/gpu/drm/tinydrm/mipi-dbi.c
+++ b/drivers/gpu/drm/tinydrm/mipi-dbi.c
@@ -445,9 +445,8 @@ int mipi_dbi_init(struct mipi_dbi *mipi,
        if (!mipi->tx_buf)
                return -ENOMEM;
 
-       /* TODO: Maybe add DRM_MODE_CONNECTOR_SPI */
        ret = tinydrm_display_pipe_init(drm, &mipi->pipe, funcs,
-                                       DRM_MODE_CONNECTOR_VIRTUAL,
+                                       DRM_MODE_CONNECTOR_SPI,
                                        mipi_dbi_formats,
                                        ARRAY_SIZE(mipi_dbi_formats), mode,
                                        rotation);

diff --git a/drivers/gpu/drm/tinydrm/repaper.c b/drivers/gpu/drm/tinydrm/repaper.c
index 85acfccefcdb7703ec8c4e5a6d26c02b68a52bab..40afa66107e59f817594409d5870ae6dec06e797 100644 (file)
--- a/drivers/gpu/drm/tinydrm/repaper.c
+++ b/drivers/gpu/drm/tinydrm/repaper.c
@@ -1110,7 +1110,7 @@ static int repaper_probe(struct spi_device *spi)
                return -ENOMEM;
 
        ret = tinydrm_display_pipe_init(drm, &epd->pipe, &repaper_pipe_funcs,
-                                       DRM_MODE_CONNECTOR_VIRTUAL,
+                                       DRM_MODE_CONNECTOR_SPI,
                                        repaper_formats,
                                        ARRAY_SIZE(repaper_formats), mode, 0);
        if (ret)

diff --git a/drivers/gpu/drm/tinydrm/st7586.c b/drivers/gpu/drm/tinydrm/st7586.c
index 204face7b3113ff9565985761a0b08f311fc846f..7ae39004aa888a967217a7f15653bd5dca1a5500 100644 (file)
--- a/drivers/gpu/drm/tinydrm/st7586.c
+++ b/drivers/gpu/drm/tinydrm/st7586.c
@@ -384,7 +384,7 @@ static int st7586_probe(struct spi_device *spi)
        mipi->swap_bytes = true;
 
        ret = tinydrm_display_pipe_init(drm, &mipi->pipe, &st7586_pipe_funcs,
-                                       DRM_MODE_CONNECTOR_VIRTUAL,
+                                       DRM_MODE_CONNECTOR_SPI,
                                        st7586_formats, ARRAY_SIZE(st7586_formats),
                                        &st7586_mode, rotation);
        if (ret)