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

drm/tinydrm: Remove tinydrm_shutdown() 



It's just a wrapper around drm_atomic_helper_shutdown() now.
Also store drm_device in the drvdata field, since that's what's used.

Signed-off-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190210131039.52664-7-noralf@tronnes.org
parent 96f2a9ae

drivers/gpu/drm/tinydrm/core/tinydrm-core.c

+0 −14
Original line number Diff line number Diff line
@@ -166,18 +166,4 @@ int devm_tinydrm_register(struct tinydrm_device *tdev) 
}

EXPORT_SYMBOL(devm_tinydrm_register);



/**

 * tinydrm_shutdown - Shutdown tinydrm

 * @tdev: tinydrm device

 *

 * This function makes sure that the display pipeline is disabled.

 * Used by drivers in their shutdown callback to turn off the display

 * on machine shutdown and reboot.

 */

void tinydrm_shutdown(struct tinydrm_device *tdev)

{

	drm_atomic_helper_shutdown(tdev->drm);

}

EXPORT_SYMBOL(tinydrm_shutdown);



MODULE_LICENSE("GPL");

drivers/gpu/drm/tinydrm/hx8357d.c

+3 −4
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/property.h>

#include <linux/spi/spi.h>



#include <drm/drm_atomic_helper.h>

#include <drm/drm_drv.h>

#include <drm/drm_gem_cma_helper.h>

#include <drm/drm_gem_framebuffer_helper.h>
@@ -243,16 +244,14 @@ static int hx8357d_probe(struct spi_device *spi) 
	if (ret)

		return ret;



	spi_set_drvdata(spi, mipi);

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



	return devm_tinydrm_register(&mipi->tinydrm);

}



static void hx8357d_shutdown(struct spi_device *spi)

{

	struct mipi_dbi *mipi = spi_get_drvdata(spi);



	tinydrm_shutdown(&mipi->tinydrm);

	drm_atomic_helper_shutdown(spi_get_drvdata(spi));

}



static struct spi_driver hx8357d_spi_driver = {

drivers/gpu/drm/tinydrm/ili9225.c

+3 −4
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/spi/spi.h>

#include <video/mipi_display.h>



#include <drm/drm_atomic_helper.h>

#include <drm/drm_damage_helper.h>

#include <drm/drm_drv.h>

#include <drm/drm_fb_cma_helper.h>
@@ -399,16 +400,14 @@ static int ili9225_probe(struct spi_device *spi) 
	if (ret)

		return ret;



	spi_set_drvdata(spi, mipi);

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



	return devm_tinydrm_register(&mipi->tinydrm);

}



static void ili9225_shutdown(struct spi_device *spi)

{

	struct mipi_dbi *mipi = spi_get_drvdata(spi);



	tinydrm_shutdown(&mipi->tinydrm);

	drm_atomic_helper_shutdown(spi_get_drvdata(spi));

}



static struct spi_driver ili9225_spi_driver = {

drivers/gpu/drm/tinydrm/ili9341.c

+3 −4
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/property.h>

#include <linux/spi/spi.h>



#include <drm/drm_atomic_helper.h>

#include <drm/drm_drv.h>

#include <drm/drm_gem_cma_helper.h>

#include <drm/drm_gem_framebuffer_helper.h>
@@ -205,16 +206,14 @@ static int ili9341_probe(struct spi_device *spi) 
	if (ret)

		return ret;



	spi_set_drvdata(spi, mipi);

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



	return devm_tinydrm_register(&mipi->tinydrm);

}



static void ili9341_shutdown(struct spi_device *spi)

{

	struct mipi_dbi *mipi = spi_get_drvdata(spi);



	tinydrm_shutdown(&mipi->tinydrm);

	drm_atomic_helper_shutdown(spi_get_drvdata(spi));

}



static struct spi_driver ili9341_spi_driver = {

drivers/gpu/drm/tinydrm/mi0283qt.c

+5 −10
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/regulator/consumer.h>

#include <linux/spi/spi.h>



#include <drm/drm_atomic_helper.h>

#include <drm/drm_drv.h>

#include <drm/drm_gem_cma_helper.h>

#include <drm/drm_gem_framebuffer_helper.h>
@@ -218,30 +219,24 @@ static int mi0283qt_probe(struct spi_device *spi) 
	if (ret)

		return ret;



	spi_set_drvdata(spi, mipi);

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



	return devm_tinydrm_register(&mipi->tinydrm);

}



static void mi0283qt_shutdown(struct spi_device *spi)

{

	struct mipi_dbi *mipi = spi_get_drvdata(spi);



	tinydrm_shutdown(&mipi->tinydrm);

	drm_atomic_helper_shutdown(spi_get_drvdata(spi));

}



static int __maybe_unused mi0283qt_pm_suspend(struct device *dev)

{

	struct mipi_dbi *mipi = dev_get_drvdata(dev);



	return drm_mode_config_helper_suspend(mipi->tinydrm.drm);

	return drm_mode_config_helper_suspend(dev_get_drvdata(dev));

}



static int __maybe_unused mi0283qt_pm_resume(struct device *dev)

{

	struct mipi_dbi *mipi = dev_get_drvdata(dev);



	drm_mode_config_helper_resume(mipi->tinydrm.drm);

	drm_mode_config_helper_resume(dev_get_drvdata(dev));



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE