aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Weinehall <david.weinehall@linux.intel.com>2016-08-22 06:32:41 -0400
committerChris Wilson <chris@chris-wilson.co.uk>2016-08-22 07:19:52 -0400
commit351c3b53e767b2512461843882f7c6baa8996c4b (patch)
tree37c4ca77a3bce5a8d267cc28b04a949361461a5f
parent536ab3ca19ef856e84389a155c5832c68559a28a (diff)
drm/i915: cosmetic fixes to i915_drv.h
Fix minor whitespace issues plus a typo. Signed-off-by: David Weinehall <david.weinehall@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20160822103245.24069-2-david.weinehall@linux.intel.com Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 63e499337ad4..2089066b5b87 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2556,7 +2556,7 @@ struct drm_i915_cmd_table {
2556 BUILD_BUG(); \ 2556 BUILD_BUG(); \
2557 __p; \ 2557 __p; \
2558}) 2558})
2559#define INTEL_INFO(p) (&__I915__(p)->info) 2559#define INTEL_INFO(p) (&__I915__(p)->info)
2560#define INTEL_GEN(p) (INTEL_INFO(p)->gen) 2560#define INTEL_GEN(p) (INTEL_INFO(p)->gen)
2561#define INTEL_DEVID(p) (INTEL_INFO(p)->device_id) 2561#define INTEL_DEVID(p) (INTEL_INFO(p)->device_id)
2562 2562
@@ -2850,7 +2850,7 @@ extern int i915_suspend_switcheroo(struct drm_device *dev, pm_message_t state);
2850extern int i915_resume_switcheroo(struct drm_device *dev); 2850extern int i915_resume_switcheroo(struct drm_device *dev);
2851 2851
2852int intel_sanitize_enable_ppgtt(struct drm_i915_private *dev_priv, 2852int intel_sanitize_enable_ppgtt(struct drm_i915_private *dev_priv,
2853 int enable_ppgtt); 2853 int enable_ppgtt);
2854 2854
2855bool intel_sanitize_semaphores(struct drm_i915_private *dev_priv, int value); 2855bool intel_sanitize_semaphores(struct drm_i915_private *dev_priv, int value);
2856 2856
@@ -3787,7 +3787,7 @@ __raw_write(64, q)
3787#undef __raw_write 3787#undef __raw_write
3788 3788
3789/* These are untraced mmio-accessors that are only valid to be used inside 3789/* These are untraced mmio-accessors that are only valid to be used inside
3790 * criticial sections inside IRQ handlers where forcewake is explicitly 3790 * critical sections inside IRQ handlers where forcewake is explicitly
3791 * controlled. 3791 * controlled.
3792 * Think twice, and think again, before using these. 3792 * Think twice, and think again, before using these.
3793 * Note: Should only be used between intel_uncore_forcewake_irqlock() and 3793 * Note: Should only be used between intel_uncore_forcewake_irqlock() and