diff options
author | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2016-10-13 06:03:08 -0400 |
---|---|---|
committer | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2016-10-14 07:23:19 -0400 |
commit | 11a914c28679f19d7daf4218c698ac6c3e184e1a (patch) | |
tree | 2b1870b4b64f9c6f65b7259df837ad81888a74cc /drivers/gpu/drm/i915/i915_gpu_error.c | |
parent | 920a14b2459701196e42a47c7bc1559582e79ab9 (diff) |
drm/i915: Make IS_VALLEYVIEW only take dev_priv
Saves 944 bytes of .rodata strings and 128 bytes of .text.
v2: Add parantheses around dev_priv. (Ville Syrjala)
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: David Weinehall <david.weinehall@linux.intel.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Jani Nikula <jani.nikula@linux.intel.com>
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gpu_error.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gpu_error.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c index eee2c1102efb..9cdd818c082f 100644 --- a/drivers/gpu/drm/i915/i915_gpu_error.c +++ b/drivers/gpu/drm/i915/i915_gpu_error.c | |||
@@ -1424,7 +1424,7 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv, | |||
1424 | */ | 1424 | */ |
1425 | 1425 | ||
1426 | /* 1: Registers specific to a single generation */ | 1426 | /* 1: Registers specific to a single generation */ |
1427 | if (IS_VALLEYVIEW(dev)) { | 1427 | if (IS_VALLEYVIEW(dev_priv)) { |
1428 | error->gtier[0] = I915_READ(GTIER); | 1428 | error->gtier[0] = I915_READ(GTIER); |
1429 | error->ier = I915_READ(VLV_IER); | 1429 | error->ier = I915_READ(VLV_IER); |
1430 | error->forcewake = I915_READ_FW(FORCEWAKE_VLV); | 1430 | error->forcewake = I915_READ_FW(FORCEWAKE_VLV); |
@@ -1473,7 +1473,7 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv, | |||
1473 | error->gtier[0] = I915_READ(GTIER); | 1473 | error->gtier[0] = I915_READ(GTIER); |
1474 | } else if (IS_GEN2(dev)) { | 1474 | } else if (IS_GEN2(dev)) { |
1475 | error->ier = I915_READ16(IER); | 1475 | error->ier = I915_READ16(IER); |
1476 | } else if (!IS_VALLEYVIEW(dev)) { | 1476 | } else if (!IS_VALLEYVIEW(dev_priv)) { |
1477 | error->ier = I915_READ(IER); | 1477 | error->ier = I915_READ(IER); |
1478 | } | 1478 | } |
1479 | error->eir = I915_READ(EIR); | 1479 | error->eir = I915_READ(EIR); |