Commit d069ef29 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Rob Clark
Browse files

drm/msm: rename msm_pm_prepare/complete to note the KMS nature 



Rename the msm_pm_prepare() and msm_pm_complete() to
msm_kms_pm_prepare() and msm_kms_pm_complete() consequently.

Reviewed-by: default avatarRob Clark <robdclark@gmail.com>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/561646/


Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent 7414b35d

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c

+2 −2
Original line number Diff line number Diff line
@@ -1344,8 +1344,8 @@ static const struct dev_pm_ops dpu_pm_ops = { 
	SET_RUNTIME_PM_OPS(dpu_runtime_suspend, dpu_runtime_resume, NULL)

	SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,

				pm_runtime_force_resume)

	.prepare = msm_pm_prepare,

	.complete = msm_pm_complete,

	.prepare = msm_kms_pm_prepare,

	.complete = msm_kms_pm_complete,

};



static const struct of_device_id dpu_dt_match[] = {

drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c

+2 −2
Original line number Diff line number Diff line
@@ -501,8 +501,8 @@ static int mdp4_kms_init(struct drm_device *dev) 
}



static const struct dev_pm_ops mdp4_pm_ops = {

	.prepare = msm_pm_prepare,

	.complete = msm_pm_complete,

	.prepare = msm_kms_pm_prepare,

	.complete = msm_kms_pm_complete,

};



static int mdp4_probe(struct platform_device *pdev)

drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c

+2 −2
Original line number Diff line number Diff line
@@ -961,8 +961,8 @@ static __maybe_unused int mdp5_runtime_resume(struct device *dev) 


static const struct dev_pm_ops mdp5_pm_ops = {

	SET_RUNTIME_PM_OPS(mdp5_runtime_suspend, mdp5_runtime_resume, NULL)

	.prepare = msm_pm_prepare,

	.complete = msm_pm_complete,

	.prepare = msm_kms_pm_prepare,

	.complete = msm_kms_pm_complete,

};



static const struct of_device_id mdp5_dt_match[] = {

drivers/gpu/drm/msm/msm_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -1098,7 +1098,7 @@ static const struct drm_driver msm_driver = { 
	.patchlevel         = MSM_VERSION_PATCHLEVEL,

};



int msm_pm_prepare(struct device *dev)

int msm_kms_pm_prepare(struct device *dev)

{

	struct msm_drm_private *priv = dev_get_drvdata(dev);

	struct drm_device *ddev = priv ? priv->dev : NULL;
@@ -1109,7 +1109,7 @@ int msm_pm_prepare(struct device *dev) 
	return drm_mode_config_helper_suspend(ddev);

}



void msm_pm_complete(struct device *dev)

void msm_kms_pm_complete(struct device *dev)

{

	struct msm_drm_private *priv = dev_get_drvdata(dev);

	struct drm_device *ddev = priv ? priv->dev : NULL;

drivers/gpu/drm/msm/msm_drv.h

+2 −2
Original line number Diff line number Diff line
@@ -563,8 +563,8 @@ static inline unsigned long timeout_to_jiffies(const ktime_t *timeout) 


extern const struct component_master_ops msm_drm_ops;



int msm_pm_prepare(struct device *dev);

void msm_pm_complete(struct device *dev);

int msm_kms_pm_prepare(struct device *dev);

void msm_kms_pm_complete(struct device *dev);



int msm_drv_probe(struct device *dev,

	int (*kms_init)(struct drm_device *dev),