All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Damien Lespiau <damien.lespiau@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 05/14] drm/i915: Use adjusted_mode appropriately when computing watermarks
Date: Tue, 10 Sep 2013 18:04:53 +0300	[thread overview]
Message-ID: <20130910150453.GP11428@intel.com> (raw)
In-Reply-To: <20130910150003.GE16273@strange.amr.corp.intel.com>

On Tue, Sep 10, 2013 at 04:00:03PM +0100, Damien Lespiau wrote:
> On Wed, Sep 04, 2013 at 06:25:22PM +0300, ville.syrjala@linux.intel.com wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > 
> > Currently most of the watermark code looks at crtc->mode which is the
> > user requested mode. The only piece of information there that is
> > relevant is hdisplay, the rest must come from adjusted_mode. Convert
> > all of the code to use requested_mode and adjusted_mode from
> > pipe config appropriately.
> 
> I'm not quite sure why you single out hdisplay here, would you mind
> explaining why?

The watermark code is usually interested in the primary plane width.
requested_mode.hdisplay is the closest thing we have at the momemnt.

> 
> -- 
> Damien
> 
> > 
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > ---
> >  drivers/gpu/drm/i915/intel_pm.c | 55 ++++++++++++++++++++++++-----------------
> >  1 file changed, 33 insertions(+), 22 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> > index af1f4de..48d93d3 100644
> > --- a/drivers/gpu/drm/i915/intel_pm.c
> > +++ b/drivers/gpu/drm/i915/intel_pm.c
> > @@ -1109,7 +1109,7 @@ static void pineview_update_wm(struct drm_device *dev)
> >  
> >  	crtc = single_enabled_crtc(dev);
> >  	if (crtc) {
> > -		int clock = crtc->mode.clock;
> > +		int clock = to_intel_crtc(crtc)->config.adjusted_mode.clock;
> >  		int pixel_size = crtc->fb->bits_per_pixel / 8;
> >  
> >  		/* Display SR */
> > @@ -1170,6 +1170,7 @@ static bool g4x_compute_wm0(struct drm_device *dev,
> >  			    int *cursor_wm)
> >  {
> >  	struct drm_crtc *crtc;
> > +	const struct drm_display_mode *adjusted_mode;
> >  	int htotal, hdisplay, clock, pixel_size;
> >  	int line_time_us, line_count;
> >  	int entries, tlb_miss;
> > @@ -1181,9 +1182,10 @@ static bool g4x_compute_wm0(struct drm_device *dev,
> >  		return false;
> >  	}
> >  
> > -	htotal = crtc->mode.htotal;
> > -	hdisplay = crtc->mode.hdisplay;
> > -	clock = crtc->mode.clock;
> > +	adjusted_mode = &to_intel_crtc(crtc)->config.adjusted_mode;
> > +	clock = adjusted_mode->clock;
> > +	htotal = adjusted_mode->htotal;
> > +	hdisplay = to_intel_crtc(crtc)->config.requested_mode.hdisplay;
> >  	pixel_size = crtc->fb->bits_per_pixel / 8;
> >  
> >  	/* Use the small buffer method to calculate plane watermark */
> > @@ -1254,6 +1256,7 @@ static bool g4x_compute_srwm(struct drm_device *dev,
> >  			     int *display_wm, int *cursor_wm)
> >  {
> >  	struct drm_crtc *crtc;
> > +	const struct drm_display_mode *adjusted_mode;
> >  	int hdisplay, htotal, pixel_size, clock;
> >  	unsigned long line_time_us;
> >  	int line_count, line_size;
> > @@ -1266,9 +1269,10 @@ static bool g4x_compute_srwm(struct drm_device *dev,
> >  	}
> >  
> >  	crtc = intel_get_crtc_for_plane(dev, plane);
> > -	hdisplay = crtc->mode.hdisplay;
> > -	htotal = crtc->mode.htotal;
> > -	clock = crtc->mode.clock;
> > +	adjusted_mode = &to_intel_crtc(crtc)->config.adjusted_mode;
> > +	clock = adjusted_mode->clock;
> > +	htotal = adjusted_mode->htotal;
> > +	hdisplay = to_intel_crtc(crtc)->config.requested_mode.hdisplay;
> >  	pixel_size = crtc->fb->bits_per_pixel / 8;
> >  
> >  	line_time_us = (htotal * 1000) / clock;
> > @@ -1307,7 +1311,7 @@ static bool vlv_compute_drain_latency(struct drm_device *dev,
> >  	if (!intel_crtc_active(crtc))
> >  		return false;
> >  
> > -	clock = crtc->mode.clock;	/* VESA DOT Clock */
> > +	clock = to_intel_crtc(crtc)->config.adjusted_mode.clock;
> >  	pixel_size = crtc->fb->bits_per_pixel / 8;	/* BPP */
> >  
> >  	entries = (clock / 1000) * pixel_size;
> > @@ -1492,9 +1496,11 @@ static void i965_update_wm(struct drm_device *dev)
> >  	if (crtc) {
> >  		/* self-refresh has much higher latency */
> >  		static const int sr_latency_ns = 12000;
> > -		int clock = crtc->mode.clock;
> > -		int htotal = crtc->mode.htotal;
> > -		int hdisplay = crtc->mode.hdisplay;
> > +		const struct drm_display_mode *adjusted_mode =
> > +			&to_intel_crtc(crtc)->config.adjusted_mode;
> > +		int clock = adjusted_mode->clock;
> > +		int htotal = adjusted_mode->htotal;
> > +		int hdisplay = to_intel_crtc(crtc)->config.requested_mode.hdisplay;
> >  		int pixel_size = crtc->fb->bits_per_pixel / 8;
> >  		unsigned long line_time_us;
> >  		int entries;
> > @@ -1570,7 +1576,7 @@ static void i9xx_update_wm(struct drm_device *dev)
> >  		if (IS_GEN2(dev))
> >  			cpp = 4;
> >  
> > -		planea_wm = intel_calculate_wm(crtc->mode.clock,
> > +		planea_wm = intel_calculate_wm(to_intel_crtc(crtc)->config.adjusted_mode.clock,
> >  					       wm_info, fifo_size, cpp,
> >  					       latency_ns);
> >  		enabled = crtc;
> > @@ -1584,7 +1590,7 @@ static void i9xx_update_wm(struct drm_device *dev)
> >  		if (IS_GEN2(dev))
> >  			cpp = 4;
> >  
> > -		planeb_wm = intel_calculate_wm(crtc->mode.clock,
> > +		planeb_wm = intel_calculate_wm(to_intel_crtc(crtc)->config.adjusted_mode.clock,
> >  					       wm_info, fifo_size, cpp,
> >  					       latency_ns);
> >  		if (enabled == NULL)
> > @@ -1611,9 +1617,11 @@ static void i9xx_update_wm(struct drm_device *dev)
> >  	if (HAS_FW_BLC(dev) && enabled) {
> >  		/* self-refresh has much higher latency */
> >  		static const int sr_latency_ns = 6000;
> > -		int clock = enabled->mode.clock;
> > -		int htotal = enabled->mode.htotal;
> > -		int hdisplay = enabled->mode.hdisplay;
> > +		const struct drm_display_mode *adjusted_mode =
> > +			&to_intel_crtc(enabled)->config.adjusted_mode;
> > +		int clock = adjusted_mode->clock;
> > +		int htotal = adjusted_mode->htotal;
> > +		int hdisplay = to_intel_crtc(crtc)->config.requested_mode.hdisplay;
> >  		int pixel_size = enabled->fb->bits_per_pixel / 8;
> >  		unsigned long line_time_us;
> >  		int entries;
> > @@ -1673,7 +1681,8 @@ static void i830_update_wm(struct drm_device *dev)
> >  	if (crtc == NULL)
> >  		return;
> >  
> > -	planea_wm = intel_calculate_wm(crtc->mode.clock, &i830_wm_info,
> > +	planea_wm = intel_calculate_wm(to_intel_crtc(crtc)->config.adjusted_mode.clock,
> > +				       &i830_wm_info,
> >  				       dev_priv->display.get_fifo_size(dev, 0),
> >  				       4, latency_ns);
> >  	fwater_lo = I915_READ(FW_BLC) & ~0xfff;
> > @@ -1745,6 +1754,7 @@ static bool ironlake_compute_srwm(struct drm_device *dev, int level, int plane,
> >  				  int *fbc_wm, int *display_wm, int *cursor_wm)
> >  {
> >  	struct drm_crtc *crtc;
> > +	const struct drm_display_mode *adjusted_mode;
> >  	unsigned long line_time_us;
> >  	int hdisplay, htotal, pixel_size, clock;
> >  	int line_count, line_size;
> > @@ -1757,9 +1767,10 @@ static bool ironlake_compute_srwm(struct drm_device *dev, int level, int plane,
> >  	}
> >  
> >  	crtc = intel_get_crtc_for_plane(dev, plane);
> > -	hdisplay = crtc->mode.hdisplay;
> > -	htotal = crtc->mode.htotal;
> > -	clock = crtc->mode.clock;
> > +	adjusted_mode = &to_intel_crtc(crtc)->config.adjusted_mode;
> > +	clock = adjusted_mode->clock;
> > +	htotal = adjusted_mode->htotal;
> > +	hdisplay = to_intel_crtc(crtc)->config.requested_mode.hdisplay;
> >  	pixel_size = crtc->fb->bits_per_pixel / 8;
> >  
> >  	line_time_us = (htotal * 1000) / clock;
> > @@ -2902,7 +2913,7 @@ sandybridge_compute_sprite_wm(struct drm_device *dev, int plane,
> >  		return false;
> >  	}
> >  
> > -	clock = crtc->mode.clock;
> > +	clock = to_intel_crtc(crtc)->config.adjusted_mode.clock;
> >  
> >  	/* Use the small buffer method to calculate the sprite watermark */
> >  	entries = ((clock * pixel_size / 1000) * display_latency_ns) / 1000;
> > @@ -2937,7 +2948,7 @@ sandybridge_compute_sprite_srwm(struct drm_device *dev, int plane,
> >  	}
> >  
> >  	crtc = intel_get_crtc_for_plane(dev, plane);
> > -	clock = crtc->mode.clock;
> > +	clock = to_intel_crtc(crtc)->config.adjusted_mode.clock;
> >  	if (!clock) {
> >  		*sprite_wm = 0;
> >  		return false;
> > -- 
> > 1.8.1.5
> > 
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel OTC

  reply	other threads:[~2013-09-10 15:05 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-04 15:25 [PATCH 0/14] drm/i915: pipe_config, adjusted_mode vs. requested_mode, etc. v2 ville.syrjala
2013-09-04 15:25 ` [PATCH v2 01/14] drm/i915: Grab the pixel clock from adjusted_mode not requested_mode ville.syrjala
2013-09-10 14:27   ` Damien Lespiau
2013-09-04 15:25 ` [PATCH 02/14] drm/i915: Use adjusted_mode->clock in lpt_program_iclkip ville.syrjala
2013-09-10 14:41   ` Damien Lespiau
2013-09-04 15:25 ` [PATCH 03/14] drm/i915: Use adjusted_mode in HDMI 12bpc clock check ville.syrjala
2013-09-10 14:42   ` Damien Lespiau
2013-09-04 15:25 ` [PATCH 04/14] drm/i915: Use adjusted_mode in intel_update_fbc() ville.syrjala
2013-09-10 14:45   ` Damien Lespiau
2013-09-04 15:25 ` [PATCH 05/14] drm/i915: Use adjusted_mode appropriately when computing watermarks ville.syrjala
2013-09-10 15:00   ` Damien Lespiau
2013-09-10 15:04     ` Ville Syrjälä [this message]
2013-09-10 16:08   ` Damien Lespiau
2013-09-04 15:25 ` [PATCH 06/14] drm/i915: Check the clock from adjusted mode in intel_crtc_active() ville.syrjala
2013-09-10 15:00   ` Damien Lespiau
2013-09-04 15:25 ` [PATCH 07/14] drm/i915: Use adjusted_mode when checking conditions for PSR ville.syrjala
2013-09-10 16:42   ` Damien Lespiau
2013-09-04 15:25 ` [PATCH v2 08/14] drm/i915: Make intel_crtc_active() available outside intel_pm.c ville.syrjala
2013-09-10 16:43   ` Damien Lespiau
2013-09-04 15:25 ` [PATCH 09/14] drm/i915: Use pipe config in sprite code ville.syrjala
2013-09-10 16:44   ` Damien Lespiau
2013-09-04 15:25 ` [PATCH 10/14] drm/i915: Use adjusted_mode in DSI PLL calculations ville.syrjala
2013-09-10 16:45   ` Damien Lespiau
2013-09-04 15:25 ` [PATCH v2 11/14] drm/i915: Add explicit pipe src size to pipe config ville.syrjala
2013-09-10 17:02   ` Damien Lespiau
2013-09-04 15:25 ` [PATCH 12/14] drm/i915: Document the inteded use of requested_mode ville.syrjala
2013-09-10 17:07   ` Damien Lespiau
2013-09-10 17:17     ` Ville Syrjälä
2013-09-10 17:49       ` Daniel Vetter
2013-09-10 17:10   ` Damien Lespiau
2013-09-04 15:25 ` [PATCH 13/14] drm/i915: Fix cursor visibility check with negative coordinates ville.syrjala
2013-09-04 15:25 ` [PATCH 14/14] drm/i915: Fix cursor visibility checks also for the right/bottom screen edges ville.syrjala
2013-09-16 21:52   ` Daniel Vetter
2013-09-17  9:56     ` Ville Syrjälä

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=20130910150453.GP11428@intel.com \
    --to=ville.syrjala@linux.intel.com \
    --cc=damien.lespiau@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.