diff mbox series

[03/11] drm/msm/dpu: Remove dpu_crtc_get_mixer_height

Message ID 20181018195836.15885-4-jcrouse@codeaurora.org (mailing list archive)
State New, archived
Headers show
Series DPU cleanups | expand

Commit Message

Jordan Crouse Oct. 18, 2018, 7:58 p.m. UTC
dpu_crtc_get_mixer_height() is only used once and the value it
returns can be easily derived from the calling function.

Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
---
 drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c |  3 +--
 drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 13 -------------
 2 files changed, 1 insertion(+), 15 deletions(-)

Comments

Bruce Wang Oct. 18, 2018, 9:44 p.m. UTC | #1
On Thu, Oct 18, 2018 at 3:59 PM Jordan Crouse <jcrouse@codeaurora.org> wrote:
>
> dpu_crtc_get_mixer_height() is only used once and the value it
> returns can be easily derived from the calling function.
>
> Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>

Reviewed-by: Bruce Wang <bzwang@chromium.org>

> ---
>  drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c |  3 +--
>  drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 13 -------------
>  2 files changed, 1 insertion(+), 15 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> index fb923c0c4171..a8aa59b8caeb 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> @@ -491,7 +491,6 @@ static void _dpu_crtc_setup_mixers(struct drm_crtc *crtc)
>  static void _dpu_crtc_setup_lm_bounds(struct drm_crtc *crtc,
>                 struct drm_crtc_state *state)
>  {
> -       struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
>         struct dpu_crtc_state *cstate = to_dpu_crtc_state(state);
>         struct drm_display_mode *adj_mode = &state->adjusted_mode;
>         u32 crtc_split_width = _dpu_crtc_get_mixer_width(cstate, adj_mode);
> @@ -502,7 +501,7 @@ static void _dpu_crtc_setup_lm_bounds(struct drm_crtc *crtc,
>                 r->x1 = crtc_split_width * i;
>                 r->y1 = 0;
>                 r->x2 = r->x1 + crtc_split_width;
> -               r->y2 = dpu_crtc_get_mixer_height(dpu_crtc, cstate, adj_mode);
> +               r->y2 = adj_mode->vdisplay;
>
>                 trace_dpu_crtc_setup_lm_bounds(DRMID(crtc), i, r);
>         }
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h
> index 4822602402f9..2be4312038c9 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h
> @@ -245,19 +245,6 @@ static inline bool dpu_crtc_state_is_stereo(struct dpu_crtc_state *cstate)
>         return cstate->num_mixers == CRTC_DUAL_MIXERS;
>  }
>
> -/**
> - * dpu_crtc_get_mixer_height - get the mixer height
> - * Mixer height will be same as panel height
> - */
> -static inline int dpu_crtc_get_mixer_height(struct dpu_crtc *dpu_crtc,
> -               struct dpu_crtc_state *cstate, struct drm_display_mode *mode)
> -{
> -       if (!dpu_crtc || !cstate || !mode)
> -               return 0;
> -
> -       return mode->vdisplay;
> -}
> -
>  /**
>   * dpu_crtc_frame_pending - retun the number of pending frames
>   * @crtc: Pointer to drm crtc object
> --
> 2.18.0
>
diff mbox series

Patch

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
index fb923c0c4171..a8aa59b8caeb 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
@@ -491,7 +491,6 @@  static void _dpu_crtc_setup_mixers(struct drm_crtc *crtc)
 static void _dpu_crtc_setup_lm_bounds(struct drm_crtc *crtc,
 		struct drm_crtc_state *state)
 {
-	struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
 	struct dpu_crtc_state *cstate = to_dpu_crtc_state(state);
 	struct drm_display_mode *adj_mode = &state->adjusted_mode;
 	u32 crtc_split_width = _dpu_crtc_get_mixer_width(cstate, adj_mode);
@@ -502,7 +501,7 @@  static void _dpu_crtc_setup_lm_bounds(struct drm_crtc *crtc,
 		r->x1 = crtc_split_width * i;
 		r->y1 = 0;
 		r->x2 = r->x1 + crtc_split_width;
-		r->y2 = dpu_crtc_get_mixer_height(dpu_crtc, cstate, adj_mode);
+		r->y2 = adj_mode->vdisplay;
 
 		trace_dpu_crtc_setup_lm_bounds(DRMID(crtc), i, r);
 	}
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h
index 4822602402f9..2be4312038c9 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h
@@ -245,19 +245,6 @@  static inline bool dpu_crtc_state_is_stereo(struct dpu_crtc_state *cstate)
 	return cstate->num_mixers == CRTC_DUAL_MIXERS;
 }
 
-/**
- * dpu_crtc_get_mixer_height - get the mixer height
- * Mixer height will be same as panel height
- */
-static inline int dpu_crtc_get_mixer_height(struct dpu_crtc *dpu_crtc,
-		struct dpu_crtc_state *cstate, struct drm_display_mode *mode)
-{
-	if (!dpu_crtc || !cstate || !mode)
-		return 0;
-
-	return mode->vdisplay;
-}
-
 /**
  * dpu_crtc_frame_pending - retun the number of pending frames
  * @crtc: Pointer to drm crtc object