Skip to content

Commit

Permalink
drm/tinydrm: Use DRM_MODE_CONNECTOR_SPI
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Noralf Trønnes committed Jul 23, 2019
1 parent fc06bf1 commit e665215
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions drivers/gpu/drm/tinydrm/mipi-dbi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/tinydrm/repaper.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/tinydrm/st7586.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit e665215

Please sign in to comment.