diff options
author | Ben Widawsky <benjamin.widawsky@intel.com> | 2013-10-05 20:57:11 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-10-10 06:47:10 -0400 |
commit | ab484f8fd62c97fc52dbb380d8b7cf3ff77b1e70 (patch) | |
tree | 629b298922bc00509e6e30a1b0407e25992333ea /drivers/gpu/drm/i915/i915_drv.c | |
parent | 4032ef4315475dd9605d6cde461168fb85d776ea (diff) |
drm/i915: Remove gen specific checks in MMIO
Now that MMIO has been split up into gen specific functions it is
obvious when HAS_FPGA_DBG_UNCLAIMED, HAS_FORCE_WAKE are needed. As such,
we can remove this extraneous condition.
As a result of this, as well as previously existing function pointers
for forcewake, we no longer need the has_force_wake member in the device
specific data structure.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 96f230497cbe..59649c060986 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c | |||
@@ -257,7 +257,6 @@ static const struct intel_device_info intel_sandybridge_d_info = { | |||
257 | .has_bsd_ring = 1, | 257 | .has_bsd_ring = 1, |
258 | .has_blt_ring = 1, | 258 | .has_blt_ring = 1, |
259 | .has_llc = 1, | 259 | .has_llc = 1, |
260 | .has_force_wake = 1, | ||
261 | }; | 260 | }; |
262 | 261 | ||
263 | static const struct intel_device_info intel_sandybridge_m_info = { | 262 | static const struct intel_device_info intel_sandybridge_m_info = { |
@@ -267,7 +266,6 @@ static const struct intel_device_info intel_sandybridge_m_info = { | |||
267 | .has_bsd_ring = 1, | 266 | .has_bsd_ring = 1, |
268 | .has_blt_ring = 1, | 267 | .has_blt_ring = 1, |
269 | .has_llc = 1, | 268 | .has_llc = 1, |
270 | .has_force_wake = 1, | ||
271 | }; | 269 | }; |
272 | 270 | ||
273 | #define GEN7_FEATURES \ | 271 | #define GEN7_FEATURES \ |
@@ -275,8 +273,7 @@ static const struct intel_device_info intel_sandybridge_m_info = { | |||
275 | .need_gfx_hws = 1, .has_hotplug = 1, \ | 273 | .need_gfx_hws = 1, .has_hotplug = 1, \ |
276 | .has_bsd_ring = 1, \ | 274 | .has_bsd_ring = 1, \ |
277 | .has_blt_ring = 1, \ | 275 | .has_blt_ring = 1, \ |
278 | .has_llc = 1, \ | 276 | .has_llc = 1 |
279 | .has_force_wake = 1 | ||
280 | 277 | ||
281 | static const struct intel_device_info intel_ivybridge_d_info = { | 278 | static const struct intel_device_info intel_ivybridge_d_info = { |
282 | GEN7_FEATURES, | 279 | GEN7_FEATURES, |