Commit 351c3b53 authored by David Weinehall's avatar David Weinehall Committed by Chris Wilson
parent 536ab3ca
...@@ -2556,7 +2556,7 @@ struct drm_i915_cmd_table { ...@@ -2556,7 +2556,7 @@ struct drm_i915_cmd_table {
BUILD_BUG(); \ BUILD_BUG(); \
__p; \ __p; \
}) })
#define INTEL_INFO(p) (&__I915__(p)->info) #define INTEL_INFO(p) (&__I915__(p)->info)
#define INTEL_GEN(p) (INTEL_INFO(p)->gen) #define INTEL_GEN(p) (INTEL_INFO(p)->gen)
#define INTEL_DEVID(p) (INTEL_INFO(p)->device_id) #define INTEL_DEVID(p) (INTEL_INFO(p)->device_id)
...@@ -2850,7 +2850,7 @@ extern int i915_suspend_switcheroo(struct drm_device *dev, pm_message_t state); ...@@ -2850,7 +2850,7 @@ extern int i915_suspend_switcheroo(struct drm_device *dev, pm_message_t state);
extern int i915_resume_switcheroo(struct drm_device *dev); extern int i915_resume_switcheroo(struct drm_device *dev);
int intel_sanitize_enable_ppgtt(struct drm_i915_private *dev_priv, int intel_sanitize_enable_ppgtt(struct drm_i915_private *dev_priv,
int enable_ppgtt); int enable_ppgtt);
bool intel_sanitize_semaphores(struct drm_i915_private *dev_priv, int value); bool intel_sanitize_semaphores(struct drm_i915_private *dev_priv, int value);
...@@ -3787,7 +3787,7 @@ __raw_write(64, q) ...@@ -3787,7 +3787,7 @@ __raw_write(64, q)
#undef __raw_write #undef __raw_write
/* These are untraced mmio-accessors that are only valid to be used inside /* These are untraced mmio-accessors that are only valid to be used inside
* criticial sections inside IRQ handlers where forcewake is explicitly * critical sections inside IRQ handlers where forcewake is explicitly
* controlled. * controlled.
* Think twice, and think again, before using these. * Think twice, and think again, before using these.
* Note: Should only be used between intel_uncore_forcewake_irqlock() and * Note: Should only be used between intel_uncore_forcewake_irqlock() and
......
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