Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

drm/i915: Don't use intel_pipe_to_cpu_transcoder() when there's a pipe config around 



No point in doing the crtc->pipe->crtc->config->cpu_transcoder dance
when we can just do crtc->config->cpu_transcoder.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1446146763-31821-2-git-send-email-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 5205bbe6

drivers/gpu/drm/i915/intel_display.c

+2 −5
Original line number Diff line number Diff line
@@ -2097,8 +2097,7 @@ static void intel_enable_pipe(struct intel_crtc *crtc) 
	struct drm_device *dev = crtc->base.dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	enum pipe pipe = crtc->pipe;

	enum transcoder cpu_transcoder = intel_pipe_to_cpu_transcoder(dev_priv,

								      pipe);

	enum transcoder cpu_transcoder = crtc->config->cpu_transcoder;

	enum pipe pch_transcoder;

	int reg;

	u32 val;
@@ -5174,13 +5173,11 @@ static unsigned long get_crtc_power_domains(struct drm_crtc *crtc) 
	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

	enum pipe pipe = intel_crtc->pipe;

	unsigned long mask;

	enum transcoder transcoder;

	enum transcoder transcoder = intel_crtc->config->cpu_transcoder;



	if (!crtc->state->active)

		return 0;



	transcoder = intel_pipe_to_cpu_transcoder(dev->dev_private, pipe);



	mask = BIT(POWER_DOMAIN_PIPE(pipe));

	mask |= BIT(POWER_DOMAIN_TRANSCODER(transcoder));

	if (intel_crtc->config->pch_pfit.enabled ||