diff options
| -rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 18 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 1 |
3 files changed, 7 insertions, 18 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index f0d941455bed..920a5e4abb70 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -2164,7 +2164,7 @@ static void ilk_display_irq_handler(struct drm_i915_private *dev_priv, /* plane/pipes map 1:1 on ilk+ */ if (de_iir & DE_PLANE_FLIP_DONE(pipe)) { intel_prepare_page_flip(dev_priv, pipe); - intel_finish_page_flip_plane(dev_priv, pipe); + intel_finish_page_flip(dev_priv, pipe); } } @@ -2211,7 +2211,7 @@ static void ivb_display_irq_handler(struct drm_i915_private *dev_priv, /* plane/pipes map 1:1 on ilk+ */ if (de_iir & DE_PLANE_FLIP_DONE_IVB(pipe)) { intel_prepare_page_flip(dev_priv, pipe); - intel_finish_page_flip_plane(dev_priv, pipe); + intel_finish_page_flip(dev_priv, pipe); } } @@ -2419,7 +2419,7 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl) if (flip_done) { intel_prepare_page_flip(dev_priv, pipe); - intel_finish_page_flip_plane(dev_priv, pipe); + intel_finish_page_flip(dev_priv, pipe); } if (iir & GEN8_PIPE_CDCLK_CRC_DONE) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index a591f2ae36a8..a298b8d137bf 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3110,14 +3110,11 @@ intel_pipe_set_base_atomic(struct drm_crtc *crtc, struct drm_framebuffer *fb, static void intel_complete_page_flips(struct drm_i915_private *dev_priv) { - struct drm_crtc *crtc; - - for_each_crtc(dev_priv->dev, crtc) { - struct intel_crtc *intel_crtc = to_intel_crtc(crtc); - enum plane plane = intel_crtc->plane; + struct intel_crtc *crtc; - intel_prepare_page_flip(dev_priv, plane); - intel_finish_page_flip_plane(dev_priv, plane); + for_each_intel_crtc(dev_priv->dev, crtc) { + intel_prepare_page_flip(dev_priv, crtc->plane); + intel_finish_page_flip(dev_priv, crtc->pipe); } } @@ -10905,13 +10902,6 @@ void intel_finish_page_flip(struct drm_i915_private *dev_priv, int pipe) do_intel_finish_page_flip(dev_priv, crtc); } -void intel_finish_page_flip_plane(struct drm_i915_private *dev_priv, int plane) -{ - struct drm_crtc *crtc = dev_priv->plane_to_crtc_mapping[plane]; - - do_intel_finish_page_flip(dev_priv, crtc); -} - /* Is 'a' after or equal to 'b'? */ static bool g4x_flip_count_after_eq(u32 a, u32 b) { diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index afde6a132b46..ff268567cc0e 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -1201,7 +1201,6 @@ __intel_framebuffer_create(struct drm_device *dev, struct drm_i915_gem_object *obj); void intel_prepare_page_flip(struct drm_i915_private *dev_priv, int plane); void intel_finish_page_flip(struct drm_i915_private *dev_priv, int pipe); -void intel_finish_page_flip_plane(struct drm_i915_private *dev_priv, int plane); void intel_check_page_flip(struct drm_i915_private *dev_priv, int pipe); int intel_prepare_plane_fb(struct drm_plane *plane, const struct drm_plane_state *new_state); |