diff options
author | Carlos Santa <carlos.santa@intel.com> | 2016-08-17 15:30:41 -0400 |
---|---|---|
committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2016-09-07 19:07:08 -0400 |
commit | 2631034677ad74a57f10866e02ae8037fa5724f3 (patch) | |
tree | 8b1f28ddbc3571ca82ca8b05e25bb636a0bf816d /drivers/gpu/drm | |
parent | d4c5636e744738df5c1ee410c50576c48f2d75a0 (diff) |
drm/i915: Get rid of HAS_CORE_RING_FREQ
No need for HAS_CORE_RING_FREQ as that flag is actually the same as
.has_llc. Feedback from V. Syrjala.
Signed-off-by: Carlos Santa <carlos.santa@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r-- | drivers/gpu/drm/i915/i915_debugfs.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index b8e40fde132a..e52e12855850 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c | |||
@@ -1763,7 +1763,7 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused) | |||
1763 | int gpu_freq, ia_freq; | 1763 | int gpu_freq, ia_freq; |
1764 | unsigned int max_gpu_freq, min_gpu_freq; | 1764 | unsigned int max_gpu_freq, min_gpu_freq; |
1765 | 1765 | ||
1766 | if (!HAS_CORE_RING_FREQ(dev_priv)) { | 1766 | if (!HAS_LLC(dev_priv)) { |
1767 | seq_puts(m, "unsupported on this chipset\n"); | 1767 | seq_puts(m, "unsupported on this chipset\n"); |
1768 | return 0; | 1768 | return 0; |
1769 | } | 1769 | } |
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 886ebd71b28d..0978f1701f1d 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
@@ -2805,10 +2805,6 @@ struct drm_i915_cmd_table { | |||
2805 | #define HAS_RESOURCE_STREAMER(dev) (IS_HASWELL(dev) || \ | 2805 | #define HAS_RESOURCE_STREAMER(dev) (IS_HASWELL(dev) || \ |
2806 | INTEL_INFO(dev)->gen >= 8) | 2806 | INTEL_INFO(dev)->gen >= 8) |
2807 | 2807 | ||
2808 | #define HAS_CORE_RING_FREQ(dev) (INTEL_INFO(dev)->gen >= 6 && \ | ||
2809 | !IS_VALLEYVIEW(dev) && !IS_CHERRYVIEW(dev) && \ | ||
2810 | !IS_BROXTON(dev)) | ||
2811 | |||
2812 | #define HAS_POOLED_EU(dev) (INTEL_INFO(dev)->has_pooled_eu) | 2808 | #define HAS_POOLED_EU(dev) (INTEL_INFO(dev)->has_pooled_eu) |
2813 | 2809 | ||
2814 | #define INTEL_PCH_DEVICE_ID_MASK 0xff00 | 2810 | #define INTEL_PCH_DEVICE_ID_MASK 0xff00 |