public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 00:34:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/i915: Remove intel_finish_page_flip_plane.

Browse source 
This function is duplicated with intel_finish_page_flip,
and is only ever used from planes that could use the
other function anyway.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1463490484-19540-4-git-send-email-maarten.lankhorst@linux.intel.com
Reviewed-by: Patrik Jakobsson <patrik.jakobsson@linux.intel.com>
This commit is contained in:
Maarten Lankhorst 2016-05-17 15:07:46 +02:00
parent 55d80d2301
commit ef58319d3f
3 changed files with 7 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/gpu/drm/i915/i915_irq.c
View file

@ -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)

18
drivers/gpu/drm/i915/intel_display.c
View file

@ -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;
struct intel_crtc *crtc;
for_each_crtc(dev_priv->dev, crtc) {
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
enum plane plane = intel_crtc->plane;
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)
{

1
drivers/gpu/drm/i915/intel_drv.h
View file

@ -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);