Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Vetter <daniel@ffwll.ch>
To: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
	Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Subject: Re: [PATCH] drm/i915: hw state readout support for pipe timings
Date: Mon, 29 Apr 2013 22:14:51 +0200	[thread overview]
Message-ID: <20130429201451.GA6169@phenom.ffwll.local> (raw)
In-Reply-To: <87r4hy663w.fsf@gaia.fi.intel.com>

On Thu, Apr 25, 2013 at 05:24:19PM +0300, Mika Kuoppala wrote:
> Daniel Vetter <daniel.vetter@ffwll.ch> writes:
> 
> > This does duplicate the logic in intel_crtc_mode_get a bit, but the
> > issue is that we also should handle interlace modes and other insanity
> > correctly.
> >
> > Hence I've opted for a sligthly more elaborate route where we first
> > read out the crtc timings for the adjusted mode, and then optionally
> > (not sure if we really need it) compute the modeline from that.
> >
> > v2: Also read out the pipe source dimensions into the requested mode.
> >
> > v3: Rebase on top of the moved cpu_transcoder.
> >
> > v4: Simplify CHECK_FLAGS logic as suggested by Chris Wilson. Also
> > properly #undef that macro again.
> >
> > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> > ---
> >  drivers/gpu/drm/i915/i915_reg.h      |  1 +
> >  drivers/gpu/drm/i915/intel_display.c | 75 ++++++++++++++++++++++++++++++++++++
> >  2 files changed, 76 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> > index a017120..b569e17 100644
> > --- a/drivers/gpu/drm/i915/i915_reg.h
> > +++ b/drivers/gpu/drm/i915/i915_reg.h
> > @@ -2837,6 +2837,7 @@
> >  #define   PIPECONF_INTERLACED_ILK		(3 << 21)
> >  #define   PIPECONF_INTERLACED_DBL_ILK		(4 << 21) /* ilk/snb only */
> >  #define   PIPECONF_PFIT_PF_INTERLACED_DBL_ILK	(5 << 21) /* ilk/snb only */
> > +#define   PIPECONF_INTERLACE_MODE_MASK		(7 << 21)
> 
> You can use PIPECONF_INTERLACE_MODE.
> With that fixed on the series:

Fixed and the entire series merged, thanks for the review.
-Daniel

> Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>

> 
> >  #define   PIPECONF_CXSR_DOWNCLOCK	(1<<16)
> >  #define   PIPECONF_COLOR_RANGE_SELECT	(1 << 13)
> >  #define   PIPECONF_BPC_MASK	(0x7 << 5)
> > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> > index a023dc2..cde2cdd 100644
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -4704,6 +4704,45 @@ static void intel_set_pipe_timings(struct intel_crtc *intel_crtc,
> >  		   ((mode->hdisplay - 1) << 16) | (mode->vdisplay - 1));
> >  }
> >  
> > +static void intel_get_pipe_timings(struct intel_crtc *crtc,
> > +				   struct intel_crtc_config *pipe_config)
> > +{
> > +	struct drm_device *dev = crtc->base.dev;
> > +	struct drm_i915_private *dev_priv = dev->dev_private;
> > +	enum transcoder cpu_transcoder = pipe_config->cpu_transcoder;
> > +	uint32_t tmp;
> > +
> > +	tmp = I915_READ(HTOTAL(cpu_transcoder));
> > +	pipe_config->adjusted_mode.crtc_hdisplay = (tmp & 0xffff) + 1;
> > +	pipe_config->adjusted_mode.crtc_htotal = ((tmp >> 16) & 0xffff) + 1;
> > +	tmp = I915_READ(HBLANK(cpu_transcoder));
> > +	pipe_config->adjusted_mode.crtc_hblank_start = (tmp & 0xffff) + 1;
> > +	pipe_config->adjusted_mode.crtc_hblank_end = ((tmp >> 16) & 0xffff) + 1;
> > +	tmp = I915_READ(HSYNC(cpu_transcoder));
> > +	pipe_config->adjusted_mode.crtc_hsync_start = (tmp & 0xffff) + 1;
> > +	pipe_config->adjusted_mode.crtc_hsync_end = ((tmp >> 16) & 0xffff) + 1;
> > +
> > +	tmp = I915_READ(VTOTAL(cpu_transcoder));
> > +	pipe_config->adjusted_mode.crtc_vdisplay = (tmp & 0xffff) + 1;
> > +	pipe_config->adjusted_mode.crtc_vtotal = ((tmp >> 16) & 0xffff) + 1;
> > +	tmp = I915_READ(VBLANK(cpu_transcoder));
> > +	pipe_config->adjusted_mode.crtc_vblank_start = (tmp & 0xffff) + 1;
> > +	pipe_config->adjusted_mode.crtc_vblank_end = ((tmp >> 16) & 0xffff) + 1;
> > +	tmp = I915_READ(VSYNC(cpu_transcoder));
> > +	pipe_config->adjusted_mode.crtc_vsync_start = (tmp & 0xffff) + 1;
> > +	pipe_config->adjusted_mode.crtc_vsync_end = ((tmp >> 16) & 0xffff) + 1;
> > +
> > +	if (I915_READ(PIPECONF(cpu_transcoder)) & PIPECONF_INTERLACE_MODE_MASK) {
> > +		pipe_config->adjusted_mode.flags |= DRM_MODE_FLAG_INTERLACE;
> > +		pipe_config->adjusted_mode.crtc_vtotal += 1;
> > +		pipe_config->adjusted_mode.crtc_vblank_end += 1;
> > +	}
> > +
> > +	tmp = I915_READ(PIPESRC(crtc->pipe));
> > +	pipe_config->requested_mode.vdisplay = (tmp & 0xffff) + 1;
> > +	pipe_config->requested_mode.hdisplay = ((tmp >> 16) & 0xffff) + 1;
> > +}
> > +
> >  static void i9xx_set_pipeconf(struct intel_crtc *intel_crtc)
> >  {
> >  	struct drm_device *dev = intel_crtc->base.dev;
> > @@ -4918,6 +4957,8 @@ static bool i9xx_get_pipe_config(struct intel_crtc *crtc,
> >  	if (!(tmp & PIPECONF_ENABLE))
> >  		return false;
> >  
> > +	intel_get_pipe_timings(crtc, pipe_config);
> > +
> >  	return true;
> >  }
> >  
> > @@ -5835,6 +5876,8 @@ static bool ironlake_get_pipe_config(struct intel_crtc *crtc,
> >  		ironlake_get_fdi_m_n_config(crtc, pipe_config);
> >  	}
> >  
> > +	intel_get_pipe_timings(crtc, pipe_config);
> > +
> >  	return true;
> >  }
> >  
> > @@ -5982,6 +6025,8 @@ static bool haswell_get_pipe_config(struct intel_crtc *crtc,
> >  		ironlake_get_fdi_m_n_config(crtc, pipe_config);
> >  	}
> >  
> > +	intel_get_pipe_timings(crtc, pipe_config);
> > +
> >  	return true;
> >  }
> >  
> > @@ -7959,6 +8004,15 @@ intel_pipe_config_compare(struct intel_crtc_config *current_config,
> >  		return false; \
> >  	}
> >  
> > +#define PIPE_CONF_CHECK_FLAGS(name, mask)	\
> > +	if ((current_config->name ^ pipe_config->name) & (mask)) { \
> > +		DRM_ERROR("mismatch in " #name " " \
> > +			  "(expected %i, found %i)\n", \
> > +			  current_config->name & (mask), \
> > +			  pipe_config->name & (mask)); \
> > +		return false; \
> > +	}
> > +
> >  	PIPE_CONF_CHECK_I(has_pch_encoder);
> >  	PIPE_CONF_CHECK_I(fdi_lanes);
> >  	PIPE_CONF_CHECK_I(fdi_m_n.gmch_m);
> > @@ -7967,7 +8021,28 @@ intel_pipe_config_compare(struct intel_crtc_config *current_config,
> >  	PIPE_CONF_CHECK_I(fdi_m_n.link_n);
> >  	PIPE_CONF_CHECK_I(fdi_m_n.tu);
> >  
> > +	PIPE_CONF_CHECK_I(adjusted_mode.crtc_hdisplay);
> > +	PIPE_CONF_CHECK_I(adjusted_mode.crtc_htotal);
> > +	PIPE_CONF_CHECK_I(adjusted_mode.crtc_hblank_start);
> > +	PIPE_CONF_CHECK_I(adjusted_mode.crtc_hblank_end);
> > +	PIPE_CONF_CHECK_I(adjusted_mode.crtc_hsync_start);
> > +	PIPE_CONF_CHECK_I(adjusted_mode.crtc_hsync_end);
> > +
> > +	PIPE_CONF_CHECK_I(adjusted_mode.crtc_vdisplay);
> > +	PIPE_CONF_CHECK_I(adjusted_mode.crtc_vtotal);
> > +	PIPE_CONF_CHECK_I(adjusted_mode.crtc_vblank_start);
> > +	PIPE_CONF_CHECK_I(adjusted_mode.crtc_vblank_end);
> > +	PIPE_CONF_CHECK_I(adjusted_mode.crtc_vsync_start);
> > +	PIPE_CONF_CHECK_I(adjusted_mode.crtc_vsync_end);
> > +
> > +	PIPE_CONF_CHECK_FLAGS(adjusted_mode.flags,
> > +			      DRM_MODE_FLAG_INTERLACE);
> > +
> > +	PIPE_CONF_CHECK_I(requested_mode.hdisplay);
> > +	PIPE_CONF_CHECK_I(requested_mode.vdisplay);
> > +
> >  #undef PIPE_CONF_CHECK_I
> > +#undef PIPE_CONF_CHECK_FLAGS
> >  
> >  	return true;
> >  }
> > -- 
> > 1.7.11.7
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

      reply	other threads:[~2013-04-29 20:11 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-19  9:25 [PATCH 1/4] drm/i915: stop for_each_intel_crtc_masked macro from leaking Daniel Vetter
2013-04-19  9:25 ` [PATCH 2/4] drm/i915: introduce macros to check pipe config properties Daniel Vetter
2013-04-19  9:25 ` [PATCH 3/4] drm/i915: hw state readout support for fdi m/n Daniel Vetter
2013-04-19  9:25 ` [PATCH 4/4] drm/i915: hw state readout support for pipe timings Daniel Vetter
2013-04-19 18:15   ` [PATCH] " Daniel Vetter
2013-04-25 14:24     ` Mika Kuoppala
2013-04-29 20:14       ` Daniel Vetter [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130429201451.GA6169@phenom.ffwll.local \
    --to=daniel@ffwll.ch \
    --cc=daniel.vetter@ffwll.ch \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=mika.kuoppala@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox