[Intel-gfx] [PATCH] drm/i915: Fix CAGF for HSW

[Paulo Zanoni]

Hi

2013/1/29 Ben Widawsky <ben at bwidawsk.net>:
> The shift changed, hurray.
>
> WARNING: only compile tested

Now it's tested, so you can remove this sentence.

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

>
> Reported-by: Kenneth Graunke <kenneth at whitecape.org>
> Cc: Paulo Zanoni <przanoni at gmail.com>
> Signed-off-by: Ben Widawsky <ben at bwidawsk.net>
> ---
>  drivers/gpu/drm/i915/i915_debugfs.c | 10 +++++++---
>  drivers/gpu/drm/i915/i915_reg.h     |  2 ++
>  2 files changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index 384f193..7491148 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -957,7 +957,7 @@ static int i915_cur_delayinfo(struct seq_file *m, void *unused)
>                 u32 gt_perf_status = I915_READ(GEN6_GT_PERF_STATUS);
>                 u32 rp_state_limits = I915_READ(GEN6_RP_STATE_LIMITS);
>                 u32 rp_state_cap = I915_READ(GEN6_RP_STATE_CAP);
> -               u32 rpstat;
> +               u32 rpstat, cagf;
>                 u32 rpupei, rpcurup, rpprevup;
>                 u32 rpdownei, rpcurdown, rpprevdown;
>                 int max_freq;
> @@ -976,6 +976,11 @@ static int i915_cur_delayinfo(struct seq_file *m, void *unused)
>                 rpdownei = I915_READ(GEN6_RP_CUR_DOWN_EI);
>                 rpcurdown = I915_READ(GEN6_RP_CUR_DOWN);
>                 rpprevdown = I915_READ(GEN6_RP_PREV_DOWN);
> +               if (IS_HASWELL(dev))
> +                       cagf = (rpstat & HSW_CAGF_MASK) >> HSW_CAGF_SHIFT;
> +               else
> +                       cagf = (rpstat & GEN6_CAGF_MASK) >> GEN6_CAGF_SHIFT;
> +               cagf *= GT_FREQUENCY_MULTIPLIER;
>
>                 gen6_gt_force_wake_put(dev_priv);
>                 mutex_unlock(&dev->struct_mutex);
> @@ -988,8 +993,7 @@ static int i915_cur_delayinfo(struct seq_file *m, void *unused)
>                            gt_perf_status & 0xff);
>                 seq_printf(m, "Render p-state limit: %d\n",
>                            rp_state_limits & 0xff);
> -               seq_printf(m, "CAGF: %dMHz\n", ((rpstat & GEN6_CAGF_MASK) >>
> -                                               GEN6_CAGF_SHIFT) * GT_FREQUENCY_MULTIPLIER);
> +               seq_printf(m, "CAGF: %dMHz\n", cagf);
>                 seq_printf(m, "RP CUR UP EI: %dus\n", rpupei &
>                            GEN6_CURICONT_MASK);
>                 seq_printf(m, "RP CUR UP: %dus\n", rpcurup &
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index 0c89cf5..9a3cd04 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -4196,7 +4196,9 @@
>  #define GEN6_RP_INTERRUPT_LIMITS               0xA014
>  #define GEN6_RPSTAT1                           0xA01C
>  #define   GEN6_CAGF_SHIFT                      8
> +#define   HSW_CAGF_SHIFT                       7
>  #define   GEN6_CAGF_MASK                       (0x7f << GEN6_CAGF_SHIFT)
> +#define   HSW_CAGF_MASK                                (0x7f << HSW_CAGF_SHIFT)
>  #define GEN6_RP_CONTROL                                0xA024
>  #define   GEN6_RP_MEDIA_TURBO                  (1<<11)
>  #define   GEN6_RP_MEDIA_MODE_MASK              (3<<9)
> --
> 1.8.1.1
>



-- 
Paulo Zanoni