Commit 772ba8d6 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Make pre-skl sprite plane registers unlocked 



Drop the locks around sprite plane register writes. The
lock isn't needed since each plane's register are neatly
contained on their own cachelines.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220210062403.18690-6-ville.syrjala@linux.intel.com


Reviewed-by: default avatarStanislav Lisovskiy <stanislav.lisovskiy@intel.com>
parent 7ad9993b

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

+0 −45
Original line number Diff line number Diff line
@@ -430,9 +430,6 @@ vlv_sprite_update_noarm(struct intel_plane *plane, 
	int crtc_y = plane_state->uapi.dst.y1;

	u32 crtc_w = drm_rect_width(&plane_state->uapi.dst);

	u32 crtc_h = drm_rect_height(&plane_state->uapi.dst);

	unsigned long irqflags;



	spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);



	intel_de_write_fw(dev_priv, SPSTRIDE(pipe, plane_id),

			  plane_state->view.color_plane[0].mapping_stride);
@@ -440,8 +437,6 @@ vlv_sprite_update_noarm(struct intel_plane *plane, 
			  SP_POS_Y(crtc_y) | SP_POS_X(crtc_x));

	intel_de_write_fw(dev_priv, SPSIZE(pipe, plane_id),

			  SP_HEIGHT(crtc_h - 1) | SP_WIDTH(crtc_w - 1));



	spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);

}



static void
@@ -457,14 +452,11 @@ vlv_sprite_update_arm(struct intel_plane *plane, 
	u32 x = plane_state->view.color_plane[0].x;

	u32 y = plane_state->view.color_plane[0].y;

	u32 sprctl, linear_offset;

	unsigned long irqflags;



	sprctl = plane_state->ctl | vlv_sprite_ctl_crtc(crtc_state);



	linear_offset = intel_fb_xy_to_linear(x, y, plane_state, 0);



	spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);



	if (IS_CHERRYVIEW(dev_priv) && pipe == PIPE_B)

		chv_sprite_update_csc(plane_state);
@@ -494,8 +486,6 @@ vlv_sprite_update_arm(struct intel_plane *plane, 


	vlv_sprite_update_clrc(plane_state);

	vlv_sprite_update_gamma(plane_state);



	spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);

}



static void
@@ -505,14 +495,9 @@ vlv_sprite_disable_arm(struct intel_plane *plane, 
	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);

	enum pipe pipe = plane->pipe;

	enum plane_id plane_id = plane->id;

	unsigned long irqflags;



	spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);



	intel_de_write_fw(dev_priv, SPCNTR(pipe, plane_id), 0);

	intel_de_write_fw(dev_priv, SPSURF(pipe, plane_id), 0);



	spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);

}



static bool
@@ -862,15 +847,12 @@ ivb_sprite_update_noarm(struct intel_plane *plane, 
	u32 src_w = drm_rect_width(&plane_state->uapi.src) >> 16;

	u32 src_h = drm_rect_height(&plane_state->uapi.src) >> 16;

	u32 sprscale = 0;

	unsigned long irqflags;



	if (crtc_w != src_w || crtc_h != src_h)

		sprscale = SPRITE_SCALE_ENABLE |

			SPRITE_SRC_WIDTH(src_w - 1) |

			SPRITE_SRC_HEIGHT(src_h - 1);



	spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);



	intel_de_write_fw(dev_priv, SPRSTRIDE(pipe),

			  plane_state->view.color_plane[0].mapping_stride);

	intel_de_write_fw(dev_priv, SPRPOS(pipe),
@@ -879,8 +861,6 @@ ivb_sprite_update_noarm(struct intel_plane *plane, 
			  SPRITE_HEIGHT(crtc_h - 1) | SPRITE_WIDTH(crtc_w - 1));

	if (IS_IVYBRIDGE(dev_priv))

		intel_de_write_fw(dev_priv, SPRSCALE(pipe), sprscale);



	spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);

}



static void
@@ -895,14 +875,11 @@ ivb_sprite_update_arm(struct intel_plane *plane, 
	u32 x = plane_state->view.color_plane[0].x;

	u32 y = plane_state->view.color_plane[0].y;

	u32 sprctl, linear_offset;

	unsigned long irqflags;



	sprctl = plane_state->ctl | ivb_sprite_ctl_crtc(crtc_state);



	linear_offset = intel_fb_xy_to_linear(x, y, plane_state, 0);



	spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);



	if (key->flags) {

		intel_de_write_fw(dev_priv, SPRKEYVAL(pipe), key->min_value);

		intel_de_write_fw(dev_priv, SPRKEYMSK(pipe),
@@ -931,8 +908,6 @@ ivb_sprite_update_arm(struct intel_plane *plane, 
			  intel_plane_ggtt_offset(plane_state) + sprsurf_offset);



	ivb_sprite_update_gamma(plane_state);



	spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);

}



static void
@@ -941,17 +916,12 @@ ivb_sprite_disable_arm(struct intel_plane *plane, 
{

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

	enum pipe pipe = plane->pipe;

	unsigned long irqflags;



	spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);



	intel_de_write_fw(dev_priv, SPRCTL(pipe), 0);

	/* Disable the scaler */

	if (IS_IVYBRIDGE(dev_priv))

		intel_de_write_fw(dev_priv, SPRSCALE(pipe), 0);

	intel_de_write_fw(dev_priv, SPRSURF(pipe), 0);



	spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);

}



static bool
@@ -1204,15 +1174,12 @@ g4x_sprite_update_noarm(struct intel_plane *plane, 
	u32 src_w = drm_rect_width(&plane_state->uapi.src) >> 16;

	u32 src_h = drm_rect_height(&plane_state->uapi.src) >> 16;

	u32 dvsscale = 0;

	unsigned long irqflags;



	if (crtc_w != src_w || crtc_h != src_h)

		dvsscale = DVS_SCALE_ENABLE |

			DVS_SRC_WIDTH(src_w - 1) |

			DVS_SRC_HEIGHT(src_h - 1);



	spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);



	intel_de_write_fw(dev_priv, DVSSTRIDE(pipe),

			  plane_state->view.color_plane[0].mapping_stride);

	intel_de_write_fw(dev_priv, DVSPOS(pipe),
@@ -1220,8 +1187,6 @@ g4x_sprite_update_noarm(struct intel_plane *plane, 
	intel_de_write_fw(dev_priv, DVSSIZE(pipe),

			  DVS_HEIGHT(crtc_h - 1) | DVS_WIDTH(crtc_w - 1));

	intel_de_write_fw(dev_priv, DVSSCALE(pipe), dvsscale);



	spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);

}



static void
@@ -1236,14 +1201,11 @@ g4x_sprite_update_arm(struct intel_plane *plane, 
	u32 x = plane_state->view.color_plane[0].x;

	u32 y = plane_state->view.color_plane[0].y;

	u32 dvscntr, linear_offset;

	unsigned long irqflags;



	dvscntr = plane_state->ctl | g4x_sprite_ctl_crtc(crtc_state);



	linear_offset = intel_fb_xy_to_linear(x, y, plane_state, 0);



	spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);



	if (key->flags) {

		intel_de_write_fw(dev_priv, DVSKEYVAL(pipe), key->min_value);

		intel_de_write_fw(dev_priv, DVSKEYMSK(pipe),
@@ -1267,8 +1229,6 @@ g4x_sprite_update_arm(struct intel_plane *plane, 
		g4x_sprite_update_gamma(plane_state);

	else

		ilk_sprite_update_gamma(plane_state);



	spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);

}



static void
@@ -1277,16 +1237,11 @@ g4x_sprite_disable_arm(struct intel_plane *plane, 
{

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

	enum pipe pipe = plane->pipe;

	unsigned long irqflags;



	spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);



	intel_de_write_fw(dev_priv, DVSCNTR(pipe), 0);

	/* Disable the scaler */

	intel_de_write_fw(dev_priv, DVSSCALE(pipe), 0);

	intel_de_write_fw(dev_priv, DVSSURF(pipe), 0);



	spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);

}



static bool