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

drm/i915: Stop using crtc->index as the pipe 



The pipe crc code slipped theough the net when we tried to
eliminate all crtc->index==pipe abuses. Remedy that.

And while at it get rid of those nasty intel_crtc+drm_crtc
pointer aliases.

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


Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
parent 661af379

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

+26 −25
Original line number Diff line number Diff line
@@ -580,13 +580,14 @@ int intel_crtc_verify_crc_source(struct drm_crtc *crtc, const char *source_name, 
	return -EINVAL;

}



int intel_crtc_set_crc_source(struct drm_crtc *crtc, const char *source_name)

int intel_crtc_set_crc_source(struct drm_crtc *_crtc, const char *source_name)

{

	struct drm_i915_private *dev_priv = to_i915(crtc->dev);

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

	struct intel_pipe_crc *pipe_crc = &intel_crtc->pipe_crc;

	struct intel_crtc *crtc = to_intel_crtc(_crtc);

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

	struct intel_pipe_crc *pipe_crc = &crtc->pipe_crc;

	enum intel_display_power_domain power_domain;

	enum intel_pipe_crc_source source;

	enum pipe pipe = crtc->pipe;

	intel_wakeref_t wakeref;

	u32 val = 0; /* shut up gcc */

	int ret = 0;
@@ -597,7 +598,7 @@ int intel_crtc_set_crc_source(struct drm_crtc *crtc, const char *source_name) 
		return -EINVAL;

	}



	power_domain = POWER_DOMAIN_PIPE(crtc->index);

	power_domain = POWER_DOMAIN_PIPE(pipe);

	wakeref = intel_display_power_get_if_enabled(dev_priv, power_domain);

	if (!wakeref) {

		drm_dbg_kms(&dev_priv->drm,
@@ -607,64 +608,64 @@ int intel_crtc_set_crc_source(struct drm_crtc *crtc, const char *source_name) 


	enable = source != INTEL_PIPE_CRC_SOURCE_NONE;

	if (enable)

		intel_crtc_crc_setup_workarounds(to_intel_crtc(crtc), true);

		intel_crtc_crc_setup_workarounds(crtc, true);



	ret = get_new_crc_ctl_reg(dev_priv, crtc->index, &source, &val);

	ret = get_new_crc_ctl_reg(dev_priv, pipe, &source, &val);

	if (ret != 0)

		goto out;



	pipe_crc->source = source;

	intel_de_write(dev_priv, PIPE_CRC_CTL(crtc->index), val);

	intel_de_posting_read(dev_priv, PIPE_CRC_CTL(crtc->index));

	intel_de_write(dev_priv, PIPE_CRC_CTL(pipe), val);

	intel_de_posting_read(dev_priv, PIPE_CRC_CTL(pipe));



	if (!source) {

		if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))

			vlv_undo_pipe_scramble_reset(dev_priv, crtc->index);

			vlv_undo_pipe_scramble_reset(dev_priv, pipe);

	}



	pipe_crc->skipped = 0;



out:

	if (!enable)

		intel_crtc_crc_setup_workarounds(to_intel_crtc(crtc), false);

		intel_crtc_crc_setup_workarounds(crtc, false);



	intel_display_power_put(dev_priv, power_domain, wakeref);



	return ret;

}



void intel_crtc_enable_pipe_crc(struct intel_crtc *intel_crtc)

void intel_crtc_enable_pipe_crc(struct intel_crtc *crtc)

{

	struct drm_crtc *crtc = &intel_crtc->base;

	struct drm_i915_private *dev_priv = to_i915(crtc->dev);

	struct intel_pipe_crc *pipe_crc = &intel_crtc->pipe_crc;

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

	struct intel_pipe_crc *pipe_crc = &crtc->pipe_crc;

	enum pipe pipe = crtc->pipe;

	u32 val = 0;



	if (!crtc->crc.opened)

	if (!crtc->base.crc.opened)

		return;



	if (get_new_crc_ctl_reg(dev_priv, crtc->index, &pipe_crc->source, &val) < 0)

	if (get_new_crc_ctl_reg(dev_priv, pipe, &pipe_crc->source, &val) < 0)

		return;



	/* Don't need pipe_crc->lock here, IRQs are not generated. */

	pipe_crc->skipped = 0;



	intel_de_write(dev_priv, PIPE_CRC_CTL(crtc->index), val);

	intel_de_posting_read(dev_priv, PIPE_CRC_CTL(crtc->index));

	intel_de_write(dev_priv, PIPE_CRC_CTL(pipe), val);

	intel_de_posting_read(dev_priv, PIPE_CRC_CTL(pipe));

}



void intel_crtc_disable_pipe_crc(struct intel_crtc *intel_crtc)

void intel_crtc_disable_pipe_crc(struct intel_crtc *crtc)

{

	struct drm_crtc *crtc = &intel_crtc->base;

	struct drm_i915_private *dev_priv = to_i915(crtc->dev);

	struct intel_pipe_crc *pipe_crc = &intel_crtc->pipe_crc;

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

	struct intel_pipe_crc *pipe_crc = &crtc->pipe_crc;

	enum pipe pipe = crtc->pipe;



	/* Swallow crc's until we stop generating them. */

	spin_lock_irq(&pipe_crc->lock);

	pipe_crc->skipped = INT_MIN;

	spin_unlock_irq(&pipe_crc->lock);



	intel_de_write(dev_priv, PIPE_CRC_CTL(crtc->index), 0);

	intel_de_posting_read(dev_priv, PIPE_CRC_CTL(crtc->index));

	intel_de_write(dev_priv, PIPE_CRC_CTL(pipe), 0);

	intel_de_posting_read(dev_priv, PIPE_CRC_CTL(pipe));

	intel_synchronize_irq(dev_priv);

}