Commit 007232f6 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/irq: convert intel_display_irq.[ch] interfaces to struct intel_display 



Going forward, struct intel_display is the main display device data
pointer. Convert the external interfaces of intel_display_irq.[ch] to
struct intel_display.

Reviewed-by: default avatarUma Shankar <uma.shankar@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://lore.kernel.org/r/83b552154761d2790d8c774707e8d7612037bdf5.1742481923.git.jani.nikula@intel.com
parent 1e40b20e

drivers/gpu/drm/i915/display/i9xx_plane.c

+16 −8
Original line number Diff line number Diff line
@@ -630,84 +630,92 @@ vlv_primary_async_flip(struct intel_dsb *dsb, 
static void

bdw_primary_enable_flip_done(struct intel_plane *plane)

{

	struct intel_display *display = to_intel_display(plane);

	struct drm_i915_private *i915 = to_i915(plane->base.dev);

	enum pipe pipe = plane->pipe;



	spin_lock_irq(&i915->irq_lock);

	bdw_enable_pipe_irq(i915, pipe, GEN8_PIPE_PRIMARY_FLIP_DONE);

	bdw_enable_pipe_irq(display, pipe, GEN8_PIPE_PRIMARY_FLIP_DONE);

	spin_unlock_irq(&i915->irq_lock);

}



static void

bdw_primary_disable_flip_done(struct intel_plane *plane)

{

	struct intel_display *display = to_intel_display(plane);

	struct drm_i915_private *i915 = to_i915(plane->base.dev);

	enum pipe pipe = plane->pipe;



	spin_lock_irq(&i915->irq_lock);

	bdw_disable_pipe_irq(i915, pipe, GEN8_PIPE_PRIMARY_FLIP_DONE);

	bdw_disable_pipe_irq(display, pipe, GEN8_PIPE_PRIMARY_FLIP_DONE);

	spin_unlock_irq(&i915->irq_lock);

}



static void

ivb_primary_enable_flip_done(struct intel_plane *plane)

{

	struct intel_display *display = to_intel_display(plane);

	struct drm_i915_private *i915 = to_i915(plane->base.dev);



	spin_lock_irq(&i915->irq_lock);

	ilk_enable_display_irq(i915, DE_PLANE_FLIP_DONE_IVB(plane->i9xx_plane));

	ilk_enable_display_irq(display, DE_PLANE_FLIP_DONE_IVB(plane->i9xx_plane));

	spin_unlock_irq(&i915->irq_lock);

}



static void

ivb_primary_disable_flip_done(struct intel_plane *plane)

{

	struct intel_display *display = to_intel_display(plane);

	struct drm_i915_private *i915 = to_i915(plane->base.dev);



	spin_lock_irq(&i915->irq_lock);

	ilk_disable_display_irq(i915, DE_PLANE_FLIP_DONE_IVB(plane->i9xx_plane));

	ilk_disable_display_irq(display, DE_PLANE_FLIP_DONE_IVB(plane->i9xx_plane));

	spin_unlock_irq(&i915->irq_lock);

}



static void

ilk_primary_enable_flip_done(struct intel_plane *plane)

{

	struct intel_display *display = to_intel_display(plane);

	struct drm_i915_private *i915 = to_i915(plane->base.dev);



	spin_lock_irq(&i915->irq_lock);

	ilk_enable_display_irq(i915, DE_PLANE_FLIP_DONE(plane->i9xx_plane));

	ilk_enable_display_irq(display, DE_PLANE_FLIP_DONE(plane->i9xx_plane));

	spin_unlock_irq(&i915->irq_lock);

}



static void

ilk_primary_disable_flip_done(struct intel_plane *plane)

{

	struct intel_display *display = to_intel_display(plane);

	struct drm_i915_private *i915 = to_i915(plane->base.dev);



	spin_lock_irq(&i915->irq_lock);

	ilk_disable_display_irq(i915, DE_PLANE_FLIP_DONE(plane->i9xx_plane));

	ilk_disable_display_irq(display, DE_PLANE_FLIP_DONE(plane->i9xx_plane));

	spin_unlock_irq(&i915->irq_lock);

}



static void

vlv_primary_enable_flip_done(struct intel_plane *plane)

{

	struct intel_display *display = to_intel_display(plane);

	struct drm_i915_private *i915 = to_i915(plane->base.dev);

	enum pipe pipe = plane->pipe;



	spin_lock_irq(&i915->irq_lock);

	i915_enable_pipestat(i915, pipe, PLANE_FLIP_DONE_INT_STATUS_VLV);

	i915_enable_pipestat(display, pipe, PLANE_FLIP_DONE_INT_STATUS_VLV);

	spin_unlock_irq(&i915->irq_lock);

}



static void

vlv_primary_disable_flip_done(struct intel_plane *plane)

{

	struct intel_display *display = to_intel_display(plane);

	struct drm_i915_private *i915 = to_i915(plane->base.dev);

	enum pipe pipe = plane->pipe;



	spin_lock_irq(&i915->irq_lock);

	i915_disable_pipestat(i915, pipe, PLANE_FLIP_DONE_INT_STATUS_VLV);

	i915_disable_pipestat(display, pipe, PLANE_FLIP_DONE_INT_STATUS_VLV);

	spin_unlock_irq(&i915->irq_lock);

}

drivers/gpu/drm/i915/display/intel_display_driver.c

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ void intel_display_driver_early_probe(struct intel_display *display) 
	mutex_init(&display->pps.mutex);

	mutex_init(&display->hdcp.hdcp_mutex);



	intel_display_irq_init(i915);

	intel_display_irq_init(display);

	intel_dkl_phy_init(display);

	intel_color_init_hooks(display);

	intel_init_cdclk_hooks(display);

drivers/gpu/drm/i915/display/intel_display_irq.c

+105 −99

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/i915/display/intel_display_irq.h

+37 −38

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/i915/display/intel_display_power_well.c

+4 −8
Original line number Diff line number Diff line
@@ -186,22 +186,18 @@ int intel_power_well_refcount(struct i915_power_well *power_well) 
static void hsw_power_well_post_enable(struct intel_display *display,

				       u8 irq_pipe_mask, bool has_vga)

{

	struct drm_i915_private *dev_priv = to_i915(display->drm);



	if (has_vga)

		intel_vga_reset_io_mem(display);



	if (irq_pipe_mask)

		gen8_irq_power_well_post_enable(dev_priv, irq_pipe_mask);

		gen8_irq_power_well_post_enable(display, irq_pipe_mask);

}



static void hsw_power_well_pre_disable(struct intel_display *display,

				       u8 irq_pipe_mask)

{

	struct drm_i915_private *dev_priv = to_i915(display->drm);



	if (irq_pipe_mask)

		gen8_irq_power_well_pre_disable(dev_priv, irq_pipe_mask);

		gen8_irq_power_well_pre_disable(display, irq_pipe_mask);

}



#define ICL_AUX_PW_TO_PHY(pw_idx)	\
@@ -1226,7 +1222,7 @@ static void vlv_display_power_well_init(struct intel_display *display) 
	vlv_init_display_clock_gating(display);



	spin_lock_irq(&dev_priv->irq_lock);

	valleyview_enable_display_irqs(dev_priv);

	valleyview_enable_display_irqs(display);

	spin_unlock_irq(&dev_priv->irq_lock);



	/*
@@ -1255,7 +1251,7 @@ static void vlv_display_power_well_deinit(struct intel_display *display) 
	struct drm_i915_private *dev_priv = to_i915(display->drm);



	spin_lock_irq(&dev_priv->irq_lock);

	valleyview_disable_display_irqs(dev_priv);

	valleyview_disable_display_irqs(display);

	spin_unlock_irq(&dev_priv->irq_lock);



	/* make sure we're done processing display irqs */