diff options
| author | Ben Widawsky <benjamin.widawsky@intel.com> | 2013-12-26 15:49:55 -0800 |
|---|---|---|
| committer | Ben Widawsky <benjamin.widawsky@intel.com> | 2013-12-29 00:00:27 -0800 |
| commit | f451c9c8d122a1109bdaca29174b699f298bc3a7 (patch) | |
| tree | 677a4f4293db8fa1f77fa7e9a61e2fd8d39e067d | |
| parent | 5c2bac844bbdc1361b33dd50b80e0f1c9505772d (diff) | |
Revert "drm/i915: Drop I915_PARAM_HAS_FULL_PPGTT again"reuse-default
This reverts commit 7d9c477966e739a52d4c9655149958a2671ef376.
| -rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 5 | ||||
| -rw-r--r-- | include/uapi/drm/i915_drm.h | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index ee9502b88df3..ad63ef68c937 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -990,7 +990,7 @@ static int i915_getparam(struct drm_device *dev, void *data, value = HAS_WT(dev); break; case I915_PARAM_HAS_ALIASING_PPGTT: - value = dev_priv->mm.aliasing_ppgtt || USES_FULL_PPGTT(dev); + value = dev_priv->mm.aliasing_ppgtt ? 1 : 0; break; case I915_PARAM_HAS_WAIT_TIMEOUT: value = 1; @@ -1013,6 +1013,9 @@ static int i915_getparam(struct drm_device *dev, void *data, case I915_PARAM_HAS_EXEC_HANDLE_LUT: value = 1; break; + case I915_PARAM_HAS_FULL_PPGTT: + value = USES_FULL_PPGTT(dev); + break; default: DRM_DEBUG("Unknown parameter %d\n", param->param); return -EINVAL; diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h index 52aed893710a..d5b52846ae8f 100644 --- a/include/uapi/drm/i915_drm.h +++ b/include/uapi/drm/i915_drm.h @@ -337,6 +337,7 @@ typedef struct drm_i915_irq_wait { #define I915_PARAM_HAS_EXEC_NO_RELOC 25 #define I915_PARAM_HAS_EXEC_HANDLE_LUT 26 #define I915_PARAM_HAS_WT 27 +#define I915_PARAM_HAS_FULL_PPGTT 28 typedef struct drm_i915_getparam { int param; |