Skip to content

Commit d069ef2

Browse files
lumagrobclark
authored andcommitted
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: Rob Clark <robdclark@gmail.com> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Patchwork: https://patchwork.freedesktop.org/patch/561646/ Signed-off-by: Rob Clark <robdclark@chromium.org>
1 parent 7414b35 commit d069ef2

5 files changed

Lines changed: 10 additions & 10 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1344,8 +1344,8 @@ static const struct dev_pm_ops dpu_pm_ops = {
13441344
SET_RUNTIME_PM_OPS(dpu_runtime_suspend, dpu_runtime_resume, NULL)
13451345
SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
13461346
pm_runtime_force_resume)
1347-
.prepare = msm_pm_prepare,
1348-
.complete = msm_pm_complete,
1347+
.prepare = msm_kms_pm_prepare,
1348+
.complete = msm_kms_pm_complete,
13491349
};
13501350

13511351
static const struct of_device_id dpu_dt_match[] = {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -501,8 +501,8 @@ static int mdp4_kms_init(struct drm_device *dev)
501501
}
502502

503503
static const struct dev_pm_ops mdp4_pm_ops = {
504-
.prepare = msm_pm_prepare,
505-
.complete = msm_pm_complete,
504+
.prepare = msm_kms_pm_prepare,
505+
.complete = msm_kms_pm_complete,
506506
};
507507

508508
static int mdp4_probe(struct platform_device *pdev)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -961,8 +961,8 @@ static __maybe_unused int mdp5_runtime_resume(struct device *dev)
961961

962962
static const struct dev_pm_ops mdp5_pm_ops = {
963963
SET_RUNTIME_PM_OPS(mdp5_runtime_suspend, mdp5_runtime_resume, NULL)
964-
.prepare = msm_pm_prepare,
965-
.complete = msm_pm_complete,
964+
.prepare = msm_kms_pm_prepare,
965+
.complete = msm_kms_pm_complete,
966966
};
967967

968968
static const struct of_device_id mdp5_dt_match[] = {

drivers/gpu/drm/msm/msm_drv.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,7 +1098,7 @@ static const struct drm_driver msm_driver = {
10981098
.patchlevel = MSM_VERSION_PATCHLEVEL,
10991099
};
11001100

1101-
int msm_pm_prepare(struct device *dev)
1101+
int msm_kms_pm_prepare(struct device *dev)
11021102
{
11031103
struct msm_drm_private *priv = dev_get_drvdata(dev);
11041104
struct drm_device *ddev = priv ? priv->dev : NULL;
@@ -1109,7 +1109,7 @@ int msm_pm_prepare(struct device *dev)
11091109
return drm_mode_config_helper_suspend(ddev);
11101110
}
11111111

1112-
void msm_pm_complete(struct device *dev)
1112+
void msm_kms_pm_complete(struct device *dev)
11131113
{
11141114
struct msm_drm_private *priv = dev_get_drvdata(dev);
11151115
struct drm_device *ddev = priv ? priv->dev : NULL;

drivers/gpu/drm/msm/msm_drv.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -563,8 +563,8 @@ static inline unsigned long timeout_to_jiffies(const ktime_t *timeout)
563563

564564
extern const struct component_master_ops msm_drm_ops;
565565

566-
int msm_pm_prepare(struct device *dev);
567-
void msm_pm_complete(struct device *dev);
566+
int msm_kms_pm_prepare(struct device *dev);
567+
void msm_kms_pm_complete(struct device *dev);
568568

569569
int msm_drv_probe(struct device *dev,
570570
int (*kms_init)(struct drm_device *dev),

0 commit comments

Comments
 (0)