diff mbox

[09/35] drm/i915: Split out reading of HSW watermark latency values

Message ID 1373014667-19484-10-git-send-email-ville.syrjala@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ville Syrjälä July 5, 2013, 8:57 a.m. UTC 
From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Move parsing of MCH_SSKPD to a separate function, we'll add other
platforms there later.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_pm.c | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

Comments

Chris Wilson July 5, 2013, 9:19 a.m. UTC | #1 
On Fri, Jul 05, 2013 at 11:57:21AM +0300, ville.syrjala@linux.intel.com wrote:
> @@ -2593,10 +2598,11 @@ static void haswell_update_wm(struct drm_device *dev)
>  	struct hsw_wm_maximums lp_max_1_2, lp_max_5_6;
>  	struct hsw_pipe_wm_parameters params[3];
>  	struct hsw_wm_values results_1_2, results_5_6, *best_results;
> -	uint16_t wm[5];
> +	uint16_t wm[5] = {};

Trying to hide a warning?
-Chris
Ville Syrjälä July 5, 2013, 10:51 a.m. UTC | #2 
On Fri, Jul 05, 2013 at 10:19:29AM +0100, Chris Wilson wrote:
> On Fri, Jul 05, 2013 at 11:57:21AM +0300, ville.syrjala@linux.intel.com wrote:
> > @@ -2593,10 +2598,11 @@ static void haswell_update_wm(struct drm_device *dev)
> >  	struct hsw_wm_maximums lp_max_1_2, lp_max_5_6;
> >  	struct hsw_pipe_wm_parameters params[3];
> >  	struct hsw_wm_values results_1_2, results_5_6, *best_results;
> > -	uint16_t wm[5];
> > +	uint16_t wm[5] = {};
> 
> Trying to hide a warning?

It's actually for the future ILK/SNB/IVB patches where we won't have
latency values for all 5 levels. I guess it should have been part of
those patches instead.
Paulo Zanoni July 30, 2013, 8:09 p.m. UTC | #3 
2013/7/5  <ville.syrjala@linux.intel.com>:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Move parsing of MCH_SSKPD to a separate function, we'll add other
> platforms there later.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
>  drivers/gpu/drm/i915/intel_pm.c | 34 ++++++++++++++++++++--------------
>  1 file changed, 20 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 2239cdb..c266e47 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -2336,28 +2336,33 @@ hsw_compute_linetime_wm(struct drm_device *dev, struct drm_crtc *crtc)
>                PIPE_WM_LINETIME_TIME(linetime);
>  }
>
> +static void intel_read_wm_latency(struct drm_device *dev, uint16_t wm[5])
> +{
> +       struct drm_i915_private *dev_priv = dev->dev_private;
> +
> +       if (IS_HASWELL(dev)) {
> +               uint64_t sskpd = I915_READ64(MCH_SSKPD);
> +
> +               wm[0] = (sskpd >> 56) & 0xFF;
> +               if (wm[0] == 0)
> +                       wm[0] = sskpd & 0xF;
> +               wm[1] = ((sskpd >> 4) & 0xFF) * 5;
> +               wm[2] = ((sskpd >> 12) & 0xFF) * 5;
> +               wm[3] = ((sskpd >> 20) & 0x1FF) * 5;
> +               wm[4] = ((sskpd >> 32) & 0x1FF) * 5;
> +       }
> +}
> +
>  static void hsw_compute_wm_parameters(struct drm_device *dev,
>                                       struct hsw_pipe_wm_parameters *params,
> -                                     uint16_t *wm,
>                                       struct hsw_wm_maximums *lp_max_1_2,
>                                       struct hsw_wm_maximums *lp_max_5_6)
>  {
> -       struct drm_i915_private *dev_priv = dev->dev_private;
>         struct drm_crtc *crtc;
>         struct drm_plane *plane;
> -       uint64_t sskpd = I915_READ64(MCH_SSKPD);
>         enum pipe pipe;
>         int pipes_active = 0, sprites_enabled = 0;
>
> -       if ((sskpd >> 56) & 0xFF)
> -               wm[0] = (sskpd >> 56) & 0xFF;
> -       else
> -               wm[0] = sskpd & 0xF;
> -       wm[1] = ((sskpd >> 4) & 0xFF) * 5;
> -       wm[2] = ((sskpd >> 12) & 0xFF) * 5;
> -       wm[3] = ((sskpd >> 20) & 0x1FF) * 5;
> -       wm[4] = ((sskpd >> 32) & 0x1FF) * 5;
> -
>         list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
>                 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
>                 struct hsw_pipe_wm_parameters *p;
> @@ -2593,10 +2598,11 @@ static void haswell_update_wm(struct drm_device *dev)
>         struct hsw_wm_maximums lp_max_1_2, lp_max_5_6;
>         struct hsw_pipe_wm_parameters params[3];
>         struct hsw_wm_values results_1_2, results_5_6, *best_results;
> -       uint16_t wm[5];
> +       uint16_t wm[5] = {};

Maybe we could make the "wm" array be part of "struct
hsw_pipe_wm_parameters"? Then we could move the call to
intel_read_wm_latency back to hsw_compute_wm_parameters. But that
would be material for a separate patch.

Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>


>         enum hsw_data_buf_partitioning partitioning;
>
> -       hsw_compute_wm_parameters(dev, params, wm, &lp_max_1_2, &lp_max_5_6);
> +       intel_read_wm_latency(dev, wm);
> +       hsw_compute_wm_parameters(dev, params, &lp_max_1_2, &lp_max_5_6);
>
>         hsw_compute_wm_results(dev, params, wm, &lp_max_1_2, &results_1_2);
>         if (lp_max_1_2.pri != lp_max_5_6.pri) {
> --
> 1.8.1.5
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 2239cdb..c266e47 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -2336,28 +2336,33 @@  hsw_compute_linetime_wm(struct drm_device *dev, struct drm_crtc *crtc)
 	       PIPE_WM_LINETIME_TIME(linetime);
 }
 
+static void intel_read_wm_latency(struct drm_device *dev, uint16_t wm[5])
+{
+	struct drm_i915_private *dev_priv = dev->dev_private;
+
+	if (IS_HASWELL(dev)) {
+		uint64_t sskpd = I915_READ64(MCH_SSKPD);
+
+		wm[0] = (sskpd >> 56) & 0xFF;
+		if (wm[0] == 0)
+			wm[0] = sskpd & 0xF;
+		wm[1] = ((sskpd >> 4) & 0xFF) * 5;
+		wm[2] = ((sskpd >> 12) & 0xFF) * 5;
+		wm[3] = ((sskpd >> 20) & 0x1FF) * 5;
+		wm[4] = ((sskpd >> 32) & 0x1FF) * 5;
+	}
+}
+
 static void hsw_compute_wm_parameters(struct drm_device *dev,
 				      struct hsw_pipe_wm_parameters *params,
-				      uint16_t *wm,
 				      struct hsw_wm_maximums *lp_max_1_2,
 				      struct hsw_wm_maximums *lp_max_5_6)
 {
-	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct drm_crtc *crtc;
 	struct drm_plane *plane;
-	uint64_t sskpd = I915_READ64(MCH_SSKPD);
 	enum pipe pipe;
 	int pipes_active = 0, sprites_enabled = 0;
 
-	if ((sskpd >> 56) & 0xFF)
-		wm[0] = (sskpd >> 56) & 0xFF;
-	else
-		wm[0] = sskpd & 0xF;
-	wm[1] = ((sskpd >> 4) & 0xFF) * 5;
-	wm[2] = ((sskpd >> 12) & 0xFF) * 5;
-	wm[3] = ((sskpd >> 20) & 0x1FF) * 5;
-	wm[4] = ((sskpd >> 32) & 0x1FF) * 5;
-
 	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
 		struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
 		struct hsw_pipe_wm_parameters *p;
@@ -2593,10 +2598,11 @@  static void haswell_update_wm(struct drm_device *dev)
 	struct hsw_wm_maximums lp_max_1_2, lp_max_5_6;
 	struct hsw_pipe_wm_parameters params[3];
 	struct hsw_wm_values results_1_2, results_5_6, *best_results;
-	uint16_t wm[5];
+	uint16_t wm[5] = {};
 	enum hsw_data_buf_partitioning partitioning;
 
-	hsw_compute_wm_parameters(dev, params, wm, &lp_max_1_2, &lp_max_5_6);
+	intel_read_wm_latency(dev, wm);
+	hsw_compute_wm_parameters(dev, params, &lp_max_1_2, &lp_max_5_6);
 
 	hsw_compute_wm_results(dev, params, wm, &lp_max_1_2, &results_1_2);
 	if (lp_max_1_2.pri != lp_max_5_6.pri) {