Skip to content

Commit 1da0340

Browse files
Bruce Wangrobclark
Bruce Wang
authored and
robclark
committed
drm/msm/dpu: Change _dpu_crtc_vblank_enable_no_lock to void
Removes redundant tests for _dpu_crtc_vblank_enable_no_lock. Function return type is now void and all function calls have been changed accordingly. Signed-off-by: Bruce Wang <bzwang@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> Signed-off-by: Sean Paul <seanpaul@chromium.org> Signed-off-by: Rob Clark <robdclark@gmail.com>
1 parent 9a9ede3 commit 1da0340

File tree

1 file changed

+7
-35
lines changed

1 file changed

+7
-35
lines changed

‎drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c

Lines changed: 7 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -771,24 +771,14 @@ void dpu_crtc_commit_kickoff(struct drm_crtc *crtc)
771771
* _dpu_crtc_vblank_enable_no_lock - update power resource and vblank request
772772
* @dpu_crtc: Pointer to dpu crtc structure
773773
* @enable: Whether to enable/disable vblanks
774-
*
775-
* @Return: error code
776774
*/
777-
static int _dpu_crtc_vblank_enable_no_lock(
775+
static void _dpu_crtc_vblank_enable_no_lock(
778776
struct dpu_crtc *dpu_crtc, bool enable)
779777
{
780-
struct drm_device *dev;
781-
struct drm_crtc *crtc;
778+
struct drm_crtc *crtc = &dpu_crtc->base;
779+
struct drm_device *dev = crtc->dev;
782780
struct drm_encoder *enc;
783781

784-
if (!dpu_crtc) {
785-
DPU_ERROR("invalid crtc\n");
786-
return -EINVAL;
787-
}
788-
789-
crtc = &dpu_crtc->base;
790-
dev = crtc->dev;
791-
792782
if (enable) {
793783
/* drop lock since power crtc cb may try to re-acquire lock */
794784
mutex_unlock(&dpu_crtc->crtc_lock);
@@ -823,8 +813,6 @@ static int _dpu_crtc_vblank_enable_no_lock(
823813
pm_runtime_put_sync(dev->dev);
824814
mutex_lock(&dpu_crtc->crtc_lock);
825815
}
826-
827-
return 0;
828816
}
829817

830818
/**
@@ -835,7 +823,6 @@ static int _dpu_crtc_vblank_enable_no_lock(
835823
static void _dpu_crtc_set_suspend(struct drm_crtc *crtc, bool enable)
836824
{
837825
struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
838-
int ret = 0;
839826

840827
DRM_DEBUG_KMS("crtc%d suspend = %d\n", crtc->base.id, enable);
841828

@@ -850,10 +837,7 @@ static void _dpu_crtc_set_suspend(struct drm_crtc *crtc, bool enable)
850837
DPU_DEBUG("crtc%d suspend already set to %d, ignoring update\n",
851838
crtc->base.id, enable);
852839
else if (dpu_crtc->enabled && dpu_crtc->vblank_requested) {
853-
ret = _dpu_crtc_vblank_enable_no_lock(dpu_crtc, !enable);
854-
if (ret)
855-
DPU_ERROR("%s vblank enable failed: %d\n",
856-
dpu_crtc->name, ret);
840+
_dpu_crtc_vblank_enable_no_lock(dpu_crtc, !enable);
857841
}
858842

859843
dpu_crtc->suspend = enable;
@@ -954,7 +938,6 @@ static void dpu_crtc_disable(struct drm_crtc *crtc)
954938
struct drm_display_mode *mode;
955939
struct drm_encoder *encoder;
956940
struct msm_drm_private *priv;
957-
int ret;
958941
unsigned long flags;
959942

960943
if (!crtc || !crtc->dev || !crtc->dev->dev_private || !crtc->state) {
@@ -985,10 +968,7 @@ static void dpu_crtc_disable(struct drm_crtc *crtc)
985968
trace_dpu_crtc_disable(DRMID(crtc), false, dpu_crtc);
986969
if (dpu_crtc->enabled && !dpu_crtc->suspend &&
987970
dpu_crtc->vblank_requested) {
988-
ret = _dpu_crtc_vblank_enable_no_lock(dpu_crtc, false);
989-
if (ret)
990-
DPU_ERROR("%s vblank enable failed: %d\n",
991-
dpu_crtc->name, ret);
971+
_dpu_crtc_vblank_enable_no_lock(dpu_crtc, false);
992972
}
993973
dpu_crtc->enabled = false;
994974

@@ -1034,7 +1014,6 @@ static void dpu_crtc_enable(struct drm_crtc *crtc,
10341014
struct dpu_crtc *dpu_crtc;
10351015
struct drm_encoder *encoder;
10361016
struct msm_drm_private *priv;
1037-
int ret;
10381017

10391018
if (!crtc || !crtc->dev || !crtc->dev->dev_private) {
10401019
DPU_ERROR("invalid crtc\n");
@@ -1056,10 +1035,7 @@ static void dpu_crtc_enable(struct drm_crtc *crtc,
10561035
trace_dpu_crtc_enable(DRMID(crtc), true, dpu_crtc);
10571036
if (!dpu_crtc->enabled && !dpu_crtc->suspend &&
10581037
dpu_crtc->vblank_requested) {
1059-
ret = _dpu_crtc_vblank_enable_no_lock(dpu_crtc, true);
1060-
if (ret)
1061-
DPU_ERROR("%s vblank enable failed: %d\n",
1062-
dpu_crtc->name, ret);
1038+
_dpu_crtc_vblank_enable_no_lock(dpu_crtc, true);
10631039
}
10641040
dpu_crtc->enabled = true;
10651041

@@ -1314,7 +1290,6 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc,
13141290
int dpu_crtc_vblank(struct drm_crtc *crtc, bool en)
13151291
{
13161292
struct dpu_crtc *dpu_crtc;
1317-
int ret;
13181293

13191294
if (!crtc) {
13201295
DPU_ERROR("invalid crtc\n");
@@ -1325,10 +1300,7 @@ int dpu_crtc_vblank(struct drm_crtc *crtc, bool en)
13251300
mutex_lock(&dpu_crtc->crtc_lock);
13261301
trace_dpu_crtc_vblank(DRMID(&dpu_crtc->base), en, dpu_crtc);
13271302
if (dpu_crtc->enabled && !dpu_crtc->suspend) {
1328-
ret = _dpu_crtc_vblank_enable_no_lock(dpu_crtc, en);
1329-
if (ret)
1330-
DPU_ERROR("%s vblank enable failed: %d\n",
1331-
dpu_crtc->name, ret);
1303+
_dpu_crtc_vblank_enable_no_lock(dpu_crtc, en);
13321304
}
13331305
dpu_crtc->vblank_requested = en;
13341306
mutex_unlock(&dpu_crtc->crtc_lock);

0 commit comments

Comments
 (0)