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

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

drm/tinydrm: Use drm_mode_config_helper_suspend/resume() 



Replace driver's code with the generic helpers that do the same thing.
Remove todo entry.

Signed-off-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Reviewed-by: default avatarStefan Agner <stefan@agner.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20171106191812.38927-6-noralf@tronnes.org
parent 194b8799

Documentation/gpu/todo.rst

+0 −5
Original line number Diff line number Diff line
@@ -404,11 +404,6 @@ those drivers as simple as possible, so lots of room for refactoring: 
  a drm_device wrong. Doesn't matter, since everyone else gets it wrong

  too :-)



- With the fbdev pointer in dev->mode_config we could also make

  suspend/resume helpers entirely generic, at least if we add a

  dev->mode_config.suspend_state. We could even provide a generic pm_ops

  structure with those.



- also rework the drm_framebuffer_funcs->dirty hook wire-up, see above.



Contact: Noralf Trønnes, Daniel Vetter

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

+0 −67
Original line number Diff line number Diff line
@@ -292,71 +292,4 @@ void tinydrm_shutdown(struct tinydrm_device *tdev) 
}

EXPORT_SYMBOL(tinydrm_shutdown);



/**

 * tinydrm_suspend - Suspend tinydrm

 * @tdev: tinydrm device

 *

 * Used in driver PM operations to suspend tinydrm.

 * Suspends fbdev and DRM.

 * Resume with tinydrm_resume().

 *

 * Returns:

 * Zero on success, negative error code on failure.

 */

int tinydrm_suspend(struct tinydrm_device *tdev)

{

	struct drm_atomic_state *state;



	if (tdev->suspend_state) {

		DRM_ERROR("Failed to suspend: state already set\n");

		return -EINVAL;

	}



	drm_fbdev_cma_set_suspend_unlocked(tdev->fbdev_cma, 1);

	state = drm_atomic_helper_suspend(tdev->drm);

	if (IS_ERR(state)) {

		drm_fbdev_cma_set_suspend_unlocked(tdev->fbdev_cma, 0);

		return PTR_ERR(state);

	}



	tdev->suspend_state = state;



	return 0;

}

EXPORT_SYMBOL(tinydrm_suspend);



/**

 * tinydrm_resume - Resume tinydrm

 * @tdev: tinydrm device

 *

 * Used in driver PM operations to resume tinydrm.

 * Suspend with tinydrm_suspend().

 *

 * Returns:

 * Zero on success, negative error code on failure.

 */

int tinydrm_resume(struct tinydrm_device *tdev)

{

	struct drm_atomic_state *state = tdev->suspend_state;

	int ret;



	if (!state) {

		DRM_ERROR("Failed to resume: state is not set\n");

		return -EINVAL;

	}



	tdev->suspend_state = NULL;



	ret = drm_atomic_helper_resume(tdev->drm, state);

	if (ret) {

		DRM_ERROR("Error resuming state: %d\n", ret);

		return ret;

	}



	drm_fbdev_cma_set_suspend_unlocked(tdev->fbdev_cma, 0);



	return 0;

}

EXPORT_SYMBOL(tinydrm_resume);



MODULE_LICENSE("GPL");

drivers/gpu/drm/tinydrm/mi0283qt.c

+5 −2
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 * (at your option) any later version.

 */



#include <drm/drm_modeset_helper.h>

#include <drm/tinydrm/ili9341.h>

#include <drm/tinydrm/mipi-dbi.h>

#include <drm/tinydrm/tinydrm-helpers.h>
@@ -231,7 +232,7 @@ static int __maybe_unused mi0283qt_pm_suspend(struct device *dev) 
	struct mipi_dbi *mipi = dev_get_drvdata(dev);

	int ret;



	ret = tinydrm_suspend(&mipi->tinydrm);

	ret = drm_mode_config_helper_suspend(mipi->tinydrm.drm);

	if (ret)

		return ret;
@@ -249,7 +250,9 @@ static int __maybe_unused mi0283qt_pm_resume(struct device *dev) 
	if (ret)

		return ret;



	return tinydrm_resume(&mipi->tinydrm);

	drm_mode_config_helper_resume(mipi->tinydrm.drm);



	return 0;

}



static const struct dev_pm_ops mi0283qt_pm_ops = {

include/drm/tinydrm/tinydrm.h

+0 −4
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
 * @pipe: Display pipe structure

 * @dirty_lock: Serializes framebuffer flushing

 * @fbdev_cma: CMA fbdev structure

 * @suspend_state: Atomic state when suspended

 * @fb_funcs: Framebuffer functions used when creating framebuffers

 */

struct tinydrm_device {
@@ -28,7 +27,6 @@ struct tinydrm_device { 
	struct drm_simple_display_pipe pipe;

	struct mutex dirty_lock;

	struct drm_fbdev_cma *fbdev_cma;

	struct drm_atomic_state *suspend_state;

	const struct drm_framebuffer_funcs *fb_funcs;

};
@@ -93,8 +91,6 @@ int devm_tinydrm_init(struct device *parent, struct tinydrm_device *tdev, 
		      struct drm_driver *driver);

int devm_tinydrm_register(struct tinydrm_device *tdev);

void tinydrm_shutdown(struct tinydrm_device *tdev);

int tinydrm_suspend(struct tinydrm_device *tdev);

int tinydrm_resume(struct tinydrm_device *tdev);



void tinydrm_display_pipe_update(struct drm_simple_display_pipe *pipe,

				 struct drm_plane_state *old_state);