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

Commit 2108e8e7 authored by Samantha Tran's avatar Samantha Tran Committed by Gerrit - the friendly Code Review server
Browse files

Revert "drm/msm: Add pm_suspend/resume callbacks to msm_kms" 



This reverts commit 036bfeb3.

This reversion is happening as a result of disabling the
disp/dpu directory as it will not be used in 4.19 downstream
display driver and these changes are made in a common layer
which affects the downstream driver functionalities. Separate
patches are submitted to revert the upstream driver and
introduce the downstream version of the display driver.

Change-Id: Ia73dec565f1def7eeb36077c3eb140cd1f1393eb
Signed-off-by: default avatarSamantha Tran <samtran@codeaurora.org>
parent 7f83b5ff

drivers/gpu/drm/msm/msm_drv.c

+0 −10
Original line number Original line Diff line number Diff line
@@ -960,11 +960,6 @@ static int msm_pm_suspend(struct device *dev) 
{

{

	struct drm_device *ddev = dev_get_drvdata(dev);

	struct drm_device *ddev = dev_get_drvdata(dev);

	struct msm_drm_private *priv = ddev->dev_private;

	struct msm_drm_private *priv = ddev->dev_private;

	struct msm_kms *kms = priv->kms;



	/* TODO: Use atomic helper suspend/resume */

	if (kms && kms->funcs && kms->funcs->pm_suspend)

		return kms->funcs->pm_suspend(dev);





	drm_kms_helper_poll_disable(ddev);

	drm_kms_helper_poll_disable(ddev);
@@ -981,11 +976,6 @@ static int msm_pm_resume(struct device *dev) 
{

{

	struct drm_device *ddev = dev_get_drvdata(dev);

	struct drm_device *ddev = dev_get_drvdata(dev);

	struct msm_drm_private *priv = ddev->dev_private;

	struct msm_drm_private *priv = ddev->dev_private;

	struct msm_kms *kms = priv->kms;



	/* TODO: Use atomic helper suspend/resume */

	if (kms && kms->funcs && kms->funcs->pm_resume)

		return kms->funcs->pm_resume(dev);





	drm_atomic_helper_resume(ddev, priv->pm_state);

	drm_atomic_helper_resume(ddev, priv->pm_state);

	drm_kms_helper_poll_enable(ddev);

	drm_kms_helper_poll_enable(ddev);

drivers/gpu/drm/msm/msm_kms.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -61,9 +61,6 @@ struct msm_kms_funcs { 
	void (*set_encoder_mode)(struct msm_kms *kms,

	void (*set_encoder_mode)(struct msm_kms *kms,

				 struct drm_encoder *encoder,

				 struct drm_encoder *encoder,

				 bool cmd_mode);

				 bool cmd_mode);

	/* pm suspend/resume hooks */

	int (*pm_suspend)(struct device *dev);

	int (*pm_resume)(struct device *dev);

	/* cleanup: */

	/* cleanup: */

	void (*destroy)(struct msm_kms *kms);

	void (*destroy)(struct msm_kms *kms);

#ifdef CONFIG_DEBUG_FS

#ifdef CONFIG_DEBUG_FS