Commit e7d66d89 authored by Daniel Vetter's avatar Daniel Vetter

drm/i915: Remove more ilk rc6 remnants

Leftover from the big purge

commit a5611654
Author: John Harrison <John.C.Harrison@Intel.com>
Date:   Thu Mar 5 14:03:03 2015 +0000

    drm/i915: Remove ironlake rc6 support

Cc: John Harrison <John.C.Harrison@Intel.com>
Cc: Rob Clark <robdclark@gmail.com>
Reported-by: default avatarRob Clark <robdclark@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parent 0904deaf
...@@ -4249,12 +4249,8 @@ static void intel_print_rc6_info(struct drm_device *dev, u32 mode) ...@@ -4249,12 +4249,8 @@ static void intel_print_rc6_info(struct drm_device *dev, u32 mode)
static int sanitize_rc6_option(const struct drm_device *dev, int enable_rc6) static int sanitize_rc6_option(const struct drm_device *dev, int enable_rc6)
{ {
/* No RC6 before Ironlake */ /* No RC6 before Ironlake and code is gone for ilk. */
if (INTEL_INFO(dev)->gen < 5) if (INTEL_INFO(dev)->gen < 6)
return 0;
/* RC6 is only on Ironlake mobile not on desktop */
if (INTEL_INFO(dev)->gen == 5 && !IS_IRONLAKE_M(dev))
return 0; return 0;
/* Respect the kernel parameter if it is set */ /* Respect the kernel parameter if it is set */
...@@ -4274,10 +4270,6 @@ static int sanitize_rc6_option(const struct drm_device *dev, int enable_rc6) ...@@ -4274,10 +4270,6 @@ static int sanitize_rc6_option(const struct drm_device *dev, int enable_rc6)
return enable_rc6 & mask; return enable_rc6 & mask;
} }
/* Disable RC6 on Ironlake */
if (INTEL_INFO(dev)->gen == 5)
return 0;
if (IS_IVYBRIDGE(dev)) if (IS_IVYBRIDGE(dev))
return (INTEL_RC6_ENABLE | INTEL_RC6p_ENABLE); return (INTEL_RC6_ENABLE | INTEL_RC6p_ENABLE);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment