Commit 53bdebf7 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/mipi-dbi: Move drm_mode_config_init into mipi library 



7/7 drivers agree that's the right choice, let's do this.

This avoids duplicating the same old error checking code over all 7
drivers, which is the motivation here.

Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Reviewed-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Tested-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Eric Anholt <eric@anholt.net>
Cc: David Lechner <david@lechnology.com>
Cc: Kamlesh Gurudasani <kamlesh.gurudasani@gmail.com>
Cc: "Noralf Trønnes" <noralf@tronnes.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200323144950.3018436-48-daniel.vetter@ffwll.ch
parent be9f2b03

drivers/gpu/drm/drm_mipi_dbi.c

+4 −0
Original line number Diff line number Diff line
@@ -511,6 +511,10 @@ int mipi_dbi_dev_init_with_formats(struct mipi_dbi_dev *dbidev, 
	if (!dbidev->dbi.command)

		return -EINVAL;



	ret = drm_mode_config_init(drm);

	if (ret)

		return ret;



	dbidev->tx_buf = devm_kmalloc(drm->dev, tx_buf_size, GFP_KERNEL);

	if (!dbidev->tx_buf)

		return -ENOMEM;

drivers/gpu/drm/tiny/hx8357d.c

+0 −2
Original line number Diff line number Diff line
@@ -239,8 +239,6 @@ static int hx8357d_probe(struct spi_device *spi) 
	}

	drmm_add_final_kfree(drm, dbidev);



	drm_mode_config_init(drm);



	dc = devm_gpiod_get(dev, "dc", GPIOD_OUT_LOW);

	if (IS_ERR(dc)) {

		DRM_DEV_ERROR(dev, "Failed to get gpio 'dc'\n");

drivers/gpu/drm/tiny/ili9225.c

+0 −2
Original line number Diff line number Diff line
@@ -390,8 +390,6 @@ static int ili9225_probe(struct spi_device *spi) 
	}

	drmm_add_final_kfree(drm, dbidev);



	drm_mode_config_init(drm);



	dbi->reset = devm_gpiod_get(dev, "reset", GPIOD_OUT_HIGH);

	if (IS_ERR(dbi->reset)) {

		DRM_DEV_ERROR(dev, "Failed to get gpio 'reset'\n");

drivers/gpu/drm/tiny/ili9341.c

+0 −2
Original line number Diff line number Diff line
@@ -197,8 +197,6 @@ static int ili9341_probe(struct spi_device *spi) 
	}

	drmm_add_final_kfree(drm, dbidev);



	drm_mode_config_init(drm);



	dbi->reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH);

	if (IS_ERR(dbi->reset)) {

		DRM_DEV_ERROR(dev, "Failed to get gpio 'reset'\n");

drivers/gpu/drm/tiny/ili9486.c

+0 −2
Original line number Diff line number Diff line
@@ -211,8 +211,6 @@ static int ili9486_probe(struct spi_device *spi) 
	}

	drmm_add_final_kfree(drm, dbidev);



	drm_mode_config_init(drm);



	dbi->reset = devm_gpiod_get(dev, "reset", GPIOD_OUT_HIGH);

	if (IS_ERR(dbi->reset)) {

		DRM_DEV_ERROR(dev, "Failed to get gpio 'reset'\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE