Replace simple-display helpers with regular atomic helpers. Store the pipeline elements in struct ili9341_device and initialize them as part of probing the device. Use mipi-dbi's existing helpers and initializer macros where possible.
Effectively open-codes the modesetting code in the initializer helpers of mipi-dbi and simple-display. Ili9341 requires a custom helper for CRTC enablement, and non-freeing cleanup of the pipeline. Signed-off-by: Thomas Zimmermann <[email protected]> --- drivers/gpu/drm/tiny/ili9341.c | 136 +++++++++++++++++++++++++++++---- 1 file changed, 122 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/tiny/ili9341.c b/drivers/gpu/drm/tiny/ili9341.c index 972811564d6a..97a62c13416a 100644 --- a/drivers/gpu/drm/tiny/ili9341.c +++ b/drivers/gpu/drm/tiny/ili9341.c @@ -52,16 +52,48 @@ #define ILI9341_MADCTL_MX BIT(6) #define ILI9341_MADCTL_MY BIT(7) -static void yx240qv29_enable(struct drm_simple_display_pipe *pipe, - struct drm_crtc_state *crtc_state, - struct drm_plane_state *plane_state) +struct ili9341_device { + struct mipi_dbi_dev dbidev; + + struct drm_plane plane; + struct drm_crtc crtc; + struct drm_encoder encoder; + struct drm_connector connector; +}; + +static struct ili9341_device *to_ili9341_device(struct drm_device *dev) { - struct mipi_dbi_dev *dbidev = drm_to_mipi_dbi_dev(pipe->crtc.dev); + return container_of(drm_to_mipi_dbi_dev(dev), struct ili9341_device, dbidev); +} + +static const u32 ili9341_plane_formats[] = { + DRM_MIPI_DBI_PLANE_FORMATS, +}; + +static const u64 ili9341_plane_format_modifiers[] = { + DRM_MIPI_DBI_PLANE_FORMAT_MODIFIERS, +}; + +static const struct drm_plane_helper_funcs ili9341_plane_helper_funcs = { + DRM_MIPI_DBI_PLANE_HELPER_FUNCS, +}; + +static const struct drm_plane_funcs ili9341_plane_funcs = { + DRM_MIPI_DBI_PLANE_FUNCS, + .destroy = drm_plane_cleanup, +}; + +static void ili9341_crtc_helper_atomic_enable(struct drm_crtc *crtc, + struct drm_atomic_state *state) +{ + struct drm_device *drm = crtc->dev; + struct ili9341_device *ili9341 = to_ili9341_device(drm); + struct mipi_dbi_dev *dbidev = &ili9341->dbidev; struct mipi_dbi *dbi = &dbidev->dbi; u8 addr_mode; int ret, idx; - if (!drm_dev_enter(pipe->crtc.dev, &idx)) + if (!drm_dev_enter(drm, &idx)) return; DRM_DEBUG_KMS("\n"); @@ -139,8 +171,35 @@ static void yx240qv29_enable(struct drm_simple_display_pipe *pipe, drm_dev_exit(idx); } -static const struct drm_simple_display_pipe_funcs ili9341_pipe_funcs = { - DRM_MIPI_DBI_SIMPLE_DISPLAY_PIPE_FUNCS(yx240qv29_enable), +static const struct drm_crtc_helper_funcs ili9341_crtc_helper_funcs = { + DRM_MIPI_DBI_CRTC_HELPER_FUNCS, + .atomic_enable = ili9341_crtc_helper_atomic_enable, +}; + +static const struct drm_crtc_funcs ili9341_crtc_funcs = { + DRM_MIPI_DBI_CRTC_FUNCS, + .destroy = drm_crtc_cleanup, +}; + +static const struct drm_encoder_funcs ili9341_encoder_funcs = { + .destroy = drm_encoder_cleanup, +}; + +static const struct drm_connector_helper_funcs ili9341_connector_helper_funcs = { + DRM_MIPI_DBI_CONNECTOR_HELPER_FUNCS, +}; + +static const struct drm_connector_funcs ili9341_connector_funcs = { + DRM_MIPI_DBI_CONNECTOR_FUNCS, + .destroy = drm_connector_cleanup, +}; + +static const struct drm_mode_config_helper_funcs ili9341_mode_config_helper_funcs = { + DRM_MIPI_DBI_MODE_CONFIG_HELPER_FUNCS, +}; + +static const struct drm_mode_config_funcs ili9341_mode_config_funcs = { + DRM_MIPI_DBI_MODE_CONFIG_FUNCS, }; static const struct drm_display_mode yx240qv29_mode = { @@ -176,19 +235,22 @@ MODULE_DEVICE_TABLE(spi, ili9341_id); static int ili9341_probe(struct spi_device *spi) { struct device *dev = &spi->dev; + struct ili9341_device *ili9341; struct mipi_dbi_dev *dbidev; struct drm_device *drm; struct mipi_dbi *dbi; struct gpio_desc *dc; + struct drm_plane *plane; + struct drm_crtc *crtc; + struct drm_encoder *encoder; + struct drm_connector *connector; u32 rotation = 0; int ret; - dbidev = devm_drm_dev_alloc(dev, &ili9341_driver, - struct mipi_dbi_dev, drm); - if (IS_ERR(dbidev)) - return PTR_ERR(dbidev); - - dbi = &dbidev->dbi; + ili9341 = devm_drm_dev_alloc(dev, &ili9341_driver, struct ili9341_device, dbidev.drm); + if (IS_ERR(ili9341)) + return PTR_ERR(ili9341); + dbidev = &ili9341->dbidev; drm = &dbidev->drm; dbi->reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH); @@ -209,7 +271,53 @@ static int ili9341_probe(struct spi_device *spi) if (ret) return ret; - ret = mipi_dbi_dev_init(dbidev, &ili9341_pipe_funcs, &yx240qv29_mode, rotation); + ret = drm_mipi_dbi_dev_init(dbidev, &yx240qv29_mode, ili9341_plane_formats[0], + rotation, 0); + if (ret) + return ret; + + ret = drmm_mode_config_init(drm); + if (ret) + return ret; + + drm->mode_config.min_width = dbidev->mode.hdisplay; + drm->mode_config.max_width = dbidev->mode.hdisplay; + drm->mode_config.min_height = dbidev->mode.vdisplay; + drm->mode_config.max_height = dbidev->mode.vdisplay; + drm->mode_config.funcs = &ili9341_mode_config_funcs; + drm->mode_config.preferred_depth = 16; + drm->mode_config.helper_private = &ili9341_mode_config_helper_funcs; + + plane = &ili9341->plane; + ret = drm_universal_plane_init(drm, plane, 0, &ili9341_plane_funcs, + ili9341_plane_formats, ARRAY_SIZE(ili9341_plane_formats), + ili9341_plane_format_modifiers, + DRM_PLANE_TYPE_PRIMARY, NULL); + if (ret) + return ret; + drm_plane_helper_add(plane, &ili9341_plane_helper_funcs); + drm_plane_enable_fb_damage_clips(plane); + + crtc = &ili9341->crtc; + ret = drm_crtc_init_with_planes(drm, crtc, plane, NULL, &ili9341_crtc_funcs, NULL); + if (ret) + return ret; + drm_crtc_helper_add(crtc, &ili9341_crtc_helper_funcs); + + encoder = &ili9341->encoder; + ret = drm_encoder_init(drm, encoder, &ili9341_encoder_funcs, DRM_MODE_ENCODER_NONE, NULL); + if (ret) + return ret; + encoder->possible_crtcs = drm_crtc_mask(crtc); + + connector = &ili9341->connector; + ret = drm_connector_init(drm, connector, &ili9341_connector_funcs, + DRM_MODE_CONNECTOR_SPI); + if (ret) + return ret; + drm_connector_helper_add(&dbidev->connector, &ili9341_connector_helper_funcs); + + ret = drm_connector_attach_encoder(connector, encoder); if (ret) return ret; -- 2.52.0
