Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3eba3922 authored by Noralf Trønnes's avatar Noralf Trønnes
Browse files

drm/tinydrm: Drop using tinydrm_device 



Use devm_drm_dev_init() and drop using tinydrm_device.

v2: devm_drm_dev_register() was dropped so add driver release callbacks.

Signed-off-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Acked-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190225144232.20761-6-noralf@tronnes.org
parent ec33f1d6

drivers/gpu/drm/tinydrm/hx8357d.c

+35 −5
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#include <drm/drm_atomic_helper.h>

#include <drm/drm_drv.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_gem_cma_helper.h>

#include <drm/drm_gem_framebuffer_helper.h>

#include <drm/drm_modeset_helper.h>
@@ -189,6 +190,7 @@ DEFINE_DRM_GEM_CMA_FOPS(hx8357d_fops); 
static struct drm_driver hx8357d_driver = {

	.driver_features	= DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_ATOMIC,

	.fops			= &hx8357d_fops,

	.release		= mipi_dbi_release,

	DRM_GEM_CMA_VMAP_DRIVER_OPS,

	.debugfs_init		= mipi_dbi_debugfs_init,

	.name			= "hx8357d",
@@ -213,15 +215,25 @@ MODULE_DEVICE_TABLE(spi, hx8357d_id); 
static int hx8357d_probe(struct spi_device *spi)

{

	struct device *dev = &spi->dev;

	struct drm_device *drm;

	struct mipi_dbi *mipi;

	struct gpio_desc *dc;

	u32 rotation = 0;

	int ret;



	mipi = devm_kzalloc(dev, sizeof(*mipi), GFP_KERNEL);

	mipi = kzalloc(sizeof(*mipi), GFP_KERNEL);

	if (!mipi)

		return -ENOMEM;



	drm = &mipi->drm;

	ret = devm_drm_dev_init(dev, drm, &hx8357d_driver);

	if (ret) {

		kfree(mipi);

		return ret;

	}



	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");
@@ -238,14 +250,31 @@ static int hx8357d_probe(struct spi_device *spi) 
	if (ret)

		return ret;



	ret = mipi_dbi_init(&spi->dev, mipi, &hx8357d_pipe_funcs,

			    &hx8357d_driver, &yx350hv15_mode, rotation);

	ret = mipi_dbi_init(mipi, &hx8357d_pipe_funcs, &yx350hv15_mode, rotation);

	if (ret)

		return ret;



	drm_mode_config_reset(drm);



	ret = drm_dev_register(drm, 0);

	if (ret)

		return ret;



	spi_set_drvdata(spi, mipi->tinydrm.drm);

	spi_set_drvdata(spi, drm);



	drm_fbdev_generic_setup(drm, 32);



	return 0;

}



static int hx8357d_remove(struct spi_device *spi)

{

	struct drm_device *drm = spi_get_drvdata(spi);



	drm_dev_unplug(drm);

	drm_atomic_helper_shutdown(drm);



	return devm_tinydrm_register(&mipi->tinydrm);

	return 0;

}



static void hx8357d_shutdown(struct spi_device *spi)
@@ -260,6 +289,7 @@ static struct spi_driver hx8357d_spi_driver = { 
	},

	.id_table = hx8357d_id,

	.probe = hx8357d_probe,

	.remove = hx8357d_remove,

	.shutdown = hx8357d_shutdown,

};

module_spi_driver(hx8357d_spi_driver);

drivers/gpu/drm/tinydrm/ili9225.c

+35 −5
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <drm/drm_damage_helper.h>

#include <drm/drm_drv.h>

#include <drm/drm_fb_cma_helper.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_fourcc.h>

#include <drm/drm_gem_cma_helper.h>

#include <drm/drm_gem_framebuffer_helper.h>
@@ -339,6 +340,7 @@ static struct drm_driver ili9225_driver = { 
	.driver_features	= DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME |

				  DRIVER_ATOMIC,

	.fops			= &ili9225_fops,

	.release		= mipi_dbi_release,

	DRM_GEM_CMA_VMAP_DRIVER_OPS,

	.name			= "ili9225",

	.desc			= "Ilitek ILI9225",
@@ -362,15 +364,25 @@ MODULE_DEVICE_TABLE(spi, ili9225_id); 
static int ili9225_probe(struct spi_device *spi)

{

	struct device *dev = &spi->dev;

	struct drm_device *drm;

	struct mipi_dbi *mipi;

	struct gpio_desc *rs;

	u32 rotation = 0;

	int ret;



	mipi = devm_kzalloc(dev, sizeof(*mipi), GFP_KERNEL);

	mipi = kzalloc(sizeof(*mipi), GFP_KERNEL);

	if (!mipi)

		return -ENOMEM;



	drm = &mipi->drm;

	ret = devm_drm_dev_init(dev, drm, &ili9225_driver);

	if (ret) {

		kfree(mipi);

		return ret;

	}



	drm_mode_config_init(drm);



	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");
@@ -392,14 +404,31 @@ static int ili9225_probe(struct spi_device *spi) 
	/* override the command function set in  mipi_dbi_spi_init() */

	mipi->command = ili9225_dbi_command;



	ret = mipi_dbi_init(&spi->dev, mipi, &ili9225_pipe_funcs,

			    &ili9225_driver, &ili9225_mode, rotation);

	ret = mipi_dbi_init(mipi, &ili9225_pipe_funcs, &ili9225_mode, rotation);

	if (ret)

		return ret;



	spi_set_drvdata(spi, mipi->tinydrm.drm);

	drm_mode_config_reset(drm);



	ret = drm_dev_register(drm, 0);

	if (ret)

		return ret;



	spi_set_drvdata(spi, drm);



	drm_fbdev_generic_setup(drm, 32);



	return 0;

}



static int ili9225_remove(struct spi_device *spi)

{

	struct drm_device *drm = spi_get_drvdata(spi);



	drm_dev_unplug(drm);

	drm_atomic_helper_shutdown(drm);



	return devm_tinydrm_register(&mipi->tinydrm);

	return 0;

}



static void ili9225_shutdown(struct spi_device *spi)
@@ -415,6 +444,7 @@ static struct spi_driver ili9225_spi_driver = { 
	},

	.id_table = ili9225_id,

	.probe = ili9225_probe,

	.remove = ili9225_remove,

	.shutdown = ili9225_shutdown,

};

module_spi_driver(ili9225_spi_driver);

drivers/gpu/drm/tinydrm/ili9341.c

+35 −5
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


#include <drm/drm_atomic_helper.h>

#include <drm/drm_drv.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_gem_cma_helper.h>

#include <drm/drm_gem_framebuffer_helper.h>

#include <drm/drm_modeset_helper.h>
@@ -145,6 +146,7 @@ DEFINE_DRM_GEM_CMA_FOPS(ili9341_fops); 
static struct drm_driver ili9341_driver = {

	.driver_features	= DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_ATOMIC,

	.fops			= &ili9341_fops,

	.release		= mipi_dbi_release,

	DRM_GEM_CMA_VMAP_DRIVER_OPS,

	.debugfs_init		= mipi_dbi_debugfs_init,

	.name			= "ili9341",
@@ -169,15 +171,25 @@ MODULE_DEVICE_TABLE(spi, ili9341_id); 
static int ili9341_probe(struct spi_device *spi)

{

	struct device *dev = &spi->dev;

	struct drm_device *drm;

	struct mipi_dbi *mipi;

	struct gpio_desc *dc;

	u32 rotation = 0;

	int ret;



	mipi = devm_kzalloc(dev, sizeof(*mipi), GFP_KERNEL);

	mipi = kzalloc(sizeof(*mipi), GFP_KERNEL);

	if (!mipi)

		return -ENOMEM;



	drm = &mipi->drm;

	ret = devm_drm_dev_init(dev, drm, &ili9341_driver);

	if (ret) {

		kfree(mipi);

		return ret;

	}



	drm_mode_config_init(drm);



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

	if (IS_ERR(mipi->reset)) {

		DRM_DEV_ERROR(dev, "Failed to get gpio 'reset'\n");
@@ -200,14 +212,31 @@ static int ili9341_probe(struct spi_device *spi) 
	if (ret)

		return ret;



	ret = mipi_dbi_init(&spi->dev, mipi, &ili9341_pipe_funcs,

			    &ili9341_driver, &yx240qv29_mode, rotation);

	ret = mipi_dbi_init(mipi, &ili9341_pipe_funcs, &yx240qv29_mode, rotation);

	if (ret)

		return ret;



	drm_mode_config_reset(drm);



	ret = drm_dev_register(drm, 0);

	if (ret)

		return ret;



	spi_set_drvdata(spi, mipi->tinydrm.drm);

	spi_set_drvdata(spi, drm);



	drm_fbdev_generic_setup(drm, 32);



	return 0;

}



static int ili9341_remove(struct spi_device *spi)

{

	struct drm_device *drm = spi_get_drvdata(spi);



	drm_dev_unplug(drm);

	drm_atomic_helper_shutdown(drm);



	return devm_tinydrm_register(&mipi->tinydrm);

	return 0;

}



static void ili9341_shutdown(struct spi_device *spi)
@@ -222,6 +251,7 @@ static struct spi_driver ili9341_spi_driver = { 
	},

	.id_table = ili9341_id,

	.probe = ili9341_probe,

	.remove = ili9341_remove,

	.shutdown = ili9341_shutdown,

};

module_spi_driver(ili9341_spi_driver);

drivers/gpu/drm/tinydrm/mi0283qt.c

+35 −5
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


#include <drm/drm_atomic_helper.h>

#include <drm/drm_drv.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_gem_cma_helper.h>

#include <drm/drm_gem_framebuffer_helper.h>

#include <drm/drm_modeset_helper.h>
@@ -154,6 +155,7 @@ static struct drm_driver mi0283qt_driver = { 
	.driver_features	= DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME |

				  DRIVER_ATOMIC,

	.fops			= &mi0283qt_fops,

	.release		= mipi_dbi_release,

	DRM_GEM_CMA_VMAP_DRIVER_OPS,

	.debugfs_init		= mipi_dbi_debugfs_init,

	.name			= "mi0283qt",
@@ -178,15 +180,25 @@ MODULE_DEVICE_TABLE(spi, mi0283qt_id); 
static int mi0283qt_probe(struct spi_device *spi)

{

	struct device *dev = &spi->dev;

	struct drm_device *drm;

	struct mipi_dbi *mipi;

	struct gpio_desc *dc;

	u32 rotation = 0;

	int ret;



	mipi = devm_kzalloc(dev, sizeof(*mipi), GFP_KERNEL);

	mipi = kzalloc(sizeof(*mipi), GFP_KERNEL);

	if (!mipi)

		return -ENOMEM;



	drm = &mipi->drm;

	ret = devm_drm_dev_init(dev, drm, &mi0283qt_driver);

	if (ret) {

		kfree(mipi);

		return ret;

	}



	drm_mode_config_init(drm);



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

	if (IS_ERR(mipi->reset)) {

		DRM_DEV_ERROR(dev, "Failed to get gpio 'reset'\n");
@@ -213,14 +225,31 @@ static int mi0283qt_probe(struct spi_device *spi) 
	if (ret)

		return ret;



	ret = mipi_dbi_init(&spi->dev, mipi, &mi0283qt_pipe_funcs,

			    &mi0283qt_driver, &mi0283qt_mode, rotation);

	ret = mipi_dbi_init(mipi, &mi0283qt_pipe_funcs, &mi0283qt_mode, rotation);

	if (ret)

		return ret;



	drm_mode_config_reset(drm);



	ret = drm_dev_register(drm, 0);

	if (ret)

		return ret;



	spi_set_drvdata(spi, mipi->tinydrm.drm);

	spi_set_drvdata(spi, drm);



	return devm_tinydrm_register(&mipi->tinydrm);

	drm_fbdev_generic_setup(drm, 32);



	return 0;

}



static int mi0283qt_remove(struct spi_device *spi)

{

	struct drm_device *drm = spi_get_drvdata(spi);



	drm_dev_unplug(drm);

	drm_atomic_helper_shutdown(drm);



	return 0;

}



static void mi0283qt_shutdown(struct spi_device *spi)
@@ -253,6 +282,7 @@ static struct spi_driver mi0283qt_spi_driver = { 
	},

	.id_table = mi0283qt_id,

	.probe = mi0283qt_probe,

	.remove = mi0283qt_remove,

	.shutdown = mi0283qt_shutdown,

};

module_spi_driver(mi0283qt_spi_driver);

drivers/gpu/drm/tinydrm/mipi-dbi.c

+42 −25
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ EXPORT_SYMBOL(mipi_dbi_enable_flush); 


static void mipi_dbi_blank(struct mipi_dbi *mipi)

{

	struct drm_device *drm = mipi->tinydrm.drm;

	struct drm_device *drm = &mipi->drm;

	u16 height = drm->mode_config.min_height;

	u16 width = drm->mode_config.min_width;

	size_t len = width * height * 2;
@@ -357,6 +357,12 @@ void mipi_dbi_pipe_disable(struct drm_simple_display_pipe *pipe) 
}

EXPORT_SYMBOL(mipi_dbi_pipe_disable);



static const struct drm_mode_config_funcs mipi_dbi_mode_config_funcs = {

	.fb_create = drm_gem_fb_create_with_dirty,

	.atomic_check = drm_atomic_helper_check,

	.atomic_commit = drm_atomic_helper_commit,

};



static const uint32_t mipi_dbi_formats[] = {

	DRM_FORMAT_RGB565,

	DRM_FORMAT_XRGB8888,
@@ -364,31 +370,27 @@ static const uint32_t mipi_dbi_formats[] = { 


/**

 * mipi_dbi_init - MIPI DBI initialization

 * @dev: Parent device

 * @mipi: &mipi_dbi structure to initialize

 * @pipe_funcs: Display pipe functions

 * @driver: DRM driver

 * @funcs: Display pipe functions

 * @mode: Display mode

 * @rotation: Initial rotation in degrees Counter Clock Wise

 *

 * This function initializes a &mipi_dbi structure and it's underlying

 * @tinydrm_device. It also sets up the display pipeline.

 * This function sets up a &drm_simple_display_pipe with a &drm_connector that

 * has one fixed &drm_display_mode which is rotated according to @rotation.

 * This mode is used to set the mode config min/max width/height properties.

 * Additionally &mipi_dbi.tx_buf is allocated.

 *

 * Supported formats: Native RGB565 and emulated XRGB8888.

 *

 * Objects created by this function will be automatically freed on driver

 * detach (devres).

 *

 * Returns:

 * Zero on success, negative error code on failure.

 */

int mipi_dbi_init(struct device *dev, struct mipi_dbi *mipi,

		  const struct drm_simple_display_pipe_funcs *pipe_funcs,

		  struct drm_driver *driver,

int mipi_dbi_init(struct mipi_dbi *mipi,

		  const struct drm_simple_display_pipe_funcs *funcs,

		  const struct drm_display_mode *mode, unsigned int rotation)

{

	size_t bufsize = mode->vdisplay * mode->hdisplay * sizeof(u16);

	struct tinydrm_device *tdev = &mipi->tinydrm;

	struct drm_device *drm = &mipi->drm;

	int ret;



	if (!mipi->command)
@@ -396,16 +398,12 @@ int mipi_dbi_init(struct device *dev, struct mipi_dbi *mipi, 


	mutex_init(&mipi->cmdlock);



	mipi->tx_buf = devm_kmalloc(dev, bufsize, GFP_KERNEL);

	mipi->tx_buf = devm_kmalloc(drm->dev, bufsize, GFP_KERNEL);

	if (!mipi->tx_buf)

		return -ENOMEM;



	ret = devm_tinydrm_init(dev, tdev, driver);

	if (ret)

		return ret;



	/* TODO: Maybe add DRM_MODE_CONNECTOR_SPI */

	ret = tinydrm_display_pipe_init(tdev->drm, &tdev->pipe, pipe_funcs,

	ret = tinydrm_display_pipe_init(drm, &mipi->pipe, funcs,

					DRM_MODE_CONNECTOR_VIRTUAL,

					mipi_dbi_formats,

					ARRAY_SIZE(mipi_dbi_formats), mode,
@@ -413,20 +411,39 @@ int mipi_dbi_init(struct device *dev, struct mipi_dbi *mipi, 
	if (ret)

		return ret;



	drm_plane_enable_fb_damage_clips(&tdev->pipe.plane);

	drm_plane_enable_fb_damage_clips(&mipi->pipe.plane);



	tdev->drm->mode_config.preferred_depth = 16;

	drm->mode_config.funcs = &mipi_dbi_mode_config_funcs;

	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);

		      drm->mode_config.preferred_depth, rotation);



	return 0;

}

EXPORT_SYMBOL(mipi_dbi_init);



/**

 * mipi_dbi_release - DRM driver release helper

 * @drm: DRM device

 *

 * This function finalizes and frees &mipi_dbi.

 *

 * Drivers can use this as their &drm_driver->release callback.

 */

void mipi_dbi_release(struct drm_device *drm)

{

	struct mipi_dbi *dbi = drm_to_mipi_dbi(drm);



	DRM_DEBUG_DRIVER("\n");



	drm_mode_config_cleanup(drm);

	drm_dev_fini(drm);

	kfree(dbi);

}

EXPORT_SYMBOL(mipi_dbi_release);



/**

 * mipi_dbi_hw_reset - Hardware reset of controller

 * @mipi: MIPI DBI structure
@@ -479,7 +496,7 @@ EXPORT_SYMBOL(mipi_dbi_display_is_on); 


static int mipi_dbi_poweron_reset_conditional(struct mipi_dbi *mipi, bool cond)

{

	struct device *dev = mipi->tinydrm.drm->dev;

	struct device *dev = mipi->drm.dev;

	int ret;



	if (mipi->regulator) {