diff options
| -rw-r--r-- | drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 13 |
2 files changed, 1 insertions, 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 5404c330d258..ffdb90c70c34 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | |||
| @@ -495,7 +495,6 @@ static void _dpu_crtc_setup_mixers(struct drm_crtc *crtc) | |||
| 495 | static void _dpu_crtc_setup_lm_bounds(struct drm_crtc *crtc, | 495 | static void _dpu_crtc_setup_lm_bounds(struct drm_crtc *crtc, |
| 496 | struct drm_crtc_state *state) | 496 | struct drm_crtc_state *state) |
| 497 | { | 497 | { |
| 498 | struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc); | ||
| 499 | struct dpu_crtc_state *cstate = to_dpu_crtc_state(state); | 498 | struct dpu_crtc_state *cstate = to_dpu_crtc_state(state); |
| 500 | struct drm_display_mode *adj_mode = &state->adjusted_mode; | 499 | struct drm_display_mode *adj_mode = &state->adjusted_mode; |
| 501 | u32 crtc_split_width = _dpu_crtc_get_mixer_width(cstate, adj_mode); | 500 | u32 crtc_split_width = _dpu_crtc_get_mixer_width(cstate, adj_mode); |
| @@ -506,7 +505,7 @@ static void _dpu_crtc_setup_lm_bounds(struct drm_crtc *crtc, | |||
| 506 | r->x1 = crtc_split_width * i; | 505 | r->x1 = crtc_split_width * i; |
| 507 | r->y1 = 0; | 506 | r->y1 = 0; |
| 508 | r->x2 = r->x1 + crtc_split_width; | 507 | r->x2 = r->x1 + crtc_split_width; |
| 509 | r->y2 = dpu_crtc_get_mixer_height(dpu_crtc, cstate, adj_mode); | 508 | r->y2 = adj_mode->vdisplay; |
| 510 | 509 | ||
| 511 | trace_dpu_crtc_setup_lm_bounds(DRMID(crtc), i, r); | 510 | trace_dpu_crtc_setup_lm_bounds(DRMID(crtc), i, r); |
| 512 | } | 511 | } |
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h index fc7123573891..b84dc5730a0e 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | |||
| @@ -237,19 +237,6 @@ static inline bool dpu_crtc_state_is_stereo(struct dpu_crtc_state *cstate) | |||
| 237 | } | 237 | } |
| 238 | 238 | ||
| 239 | /** | 239 | /** |
| 240 | * dpu_crtc_get_mixer_height - get the mixer height | ||
| 241 | * Mixer height will be same as panel height | ||
| 242 | */ | ||
| 243 | static inline int dpu_crtc_get_mixer_height(struct dpu_crtc *dpu_crtc, | ||
| 244 | struct dpu_crtc_state *cstate, struct drm_display_mode *mode) | ||
| 245 | { | ||
| 246 | if (!dpu_crtc || !cstate || !mode) | ||
| 247 | return 0; | ||
| 248 | |||
| 249 | return mode->vdisplay; | ||
| 250 | } | ||
| 251 | |||
| 252 | /** | ||
| 253 | * dpu_crtc_frame_pending - retun the number of pending frames | 240 | * dpu_crtc_frame_pending - retun the number of pending frames |
| 254 | * @crtc: Pointer to drm crtc object | 241 | * @crtc: Pointer to drm crtc object |
| 255 | */ | 242 | */ |
