drm/i915: report correct render clock frequencies on SNB

Fix up the debug file to report the right frequencies. On SNB, we program
the PCU with a frequency ratio, which is multiplied by 100MHz on the CPU
side. But GFX only runs at half that, so report it as such to avoid
confusion.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Keith Packard <keithp@keithp.com>

authored by Jesse Barnes and committed by Chris Wilson e281fcaa 48898b03

+5 -5
+4 -4
drivers/gpu/drm/i915/i915_debugfs.c
··· 892 seq_printf(m, "Render p-state limit: %d\n", 893 rp_state_limits & 0xff); 894 seq_printf(m, "CAGF: %dMHz\n", ((rpstat & GEN6_CAGF_MASK) >> 895 - GEN6_CAGF_SHIFT) * 100); 896 seq_printf(m, "RP CUR UP EI: %dus\n", rpupei & 897 GEN6_CURICONT_MASK); 898 seq_printf(m, "RP CUR UP: %dus\n", rpcurup & ··· 908 909 max_freq = (rp_state_cap & 0xff0000) >> 16; 910 seq_printf(m, "Lowest (RPN) frequency: %dMHz\n", 911 - max_freq * 100); 912 913 max_freq = (rp_state_cap & 0xff00) >> 8; 914 seq_printf(m, "Nominal (RP1) frequency: %dMHz\n", 915 - max_freq * 100); 916 917 max_freq = rp_state_cap & 0xff; 918 seq_printf(m, "Max non-overclocked (RP0) frequency: %dMHz\n", 919 - max_freq * 100); 920 921 __gen6_gt_force_wake_put(dev_priv); 922 } else {
··· 892 seq_printf(m, "Render p-state limit: %d\n", 893 rp_state_limits & 0xff); 894 seq_printf(m, "CAGF: %dMHz\n", ((rpstat & GEN6_CAGF_MASK) >> 895 + GEN6_CAGF_SHIFT) * 50); 896 seq_printf(m, "RP CUR UP EI: %dus\n", rpupei & 897 GEN6_CURICONT_MASK); 898 seq_printf(m, "RP CUR UP: %dus\n", rpcurup & ··· 908 909 max_freq = (rp_state_cap & 0xff0000) >> 16; 910 seq_printf(m, "Lowest (RPN) frequency: %dMHz\n", 911 + max_freq * 50); 912 913 max_freq = (rp_state_cap & 0xff00) >> 8; 914 seq_printf(m, "Nominal (RP1) frequency: %dMHz\n", 915 + max_freq * 50); 916 917 max_freq = rp_state_cap & 0xff; 918 seq_printf(m, "Max non-overclocked (RP0) frequency: %dMHz\n", 919 + max_freq * 50); 920 921 __gen6_gt_force_wake_put(dev_priv); 922 } else {
+1 -1
drivers/gpu/drm/i915/intel_display.c
··· 6930 DRM_ERROR("timeout waiting for pcode mailbox to finish\n"); 6931 if (pcu_mbox & (1<<31)) { /* OC supported */ 6932 max_freq = pcu_mbox & 0xff; 6933 - DRM_DEBUG_DRIVER("overclocking supported, adjusting frequency max to %dMHz\n", pcu_mbox * 100); 6934 } 6935 6936 /* In units of 100MHz */
··· 6930 DRM_ERROR("timeout waiting for pcode mailbox to finish\n"); 6931 if (pcu_mbox & (1<<31)) { /* OC supported */ 6932 max_freq = pcu_mbox & 0xff; 6933 + DRM_DEBUG_DRIVER("overclocking supported, adjusting frequency max to %dMHz\n", pcu_mbox * 50); 6934 } 6935 6936 /* In units of 100MHz */