aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZou Nan hai <nanhai.zou@intel.com>2010-05-31 01:58:47 -0400
committerEric Anholt <eric@anholt.net>2010-06-01 14:21:09 -0400
commite3a815fcd38043b8f1bb526123d8ab6ae01deb77 (patch)
tree903c75fcd0e5cc7ef20885562c7807de23323968
parent9bc354998f8aa8a83b0cd430e8fcf2cbc3be7367 (diff)
drm/i915: add HAS_BSD check to i915_getparam
This will let userland only try to use the new media decode functionality when the appropriate kernel is present. Signed-off-by: Zou Nan hai <nanhai.zou@intel.com> Signed-off-by: Eric Anholt <eric@anholt.net>
-rw-r--r--drivers/gpu/drm/i915/i915_dma.c3
-rw-r--r--include/drm/i915_drm.h1
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 6577798d344..84ce95602f0 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -744,6 +744,9 @@ static int i915_getparam(struct drm_device *dev, void *data,
744 /* depends on GEM */ 744 /* depends on GEM */
745 value = dev_priv->has_gem; 745 value = dev_priv->has_gem;
746 break; 746 break;
747 case I915_PARAM_HAS_BSD:
748 value = HAS_BSD(dev);
749 break;
747 default: 750 default:
748 DRM_DEBUG_DRIVER("Unknown parameter %d\n", 751 DRM_DEBUG_DRIVER("Unknown parameter %d\n",
749 param->param); 752 param->param);
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
index e9168704cab..7f0028e1010 100644
--- a/include/drm/i915_drm.h
+++ b/include/drm/i915_drm.h
@@ -275,6 +275,7 @@ typedef struct drm_i915_irq_wait {
275#define I915_PARAM_HAS_OVERLAY 7 275#define I915_PARAM_HAS_OVERLAY 7
276#define I915_PARAM_HAS_PAGEFLIPPING 8 276#define I915_PARAM_HAS_PAGEFLIPPING 8
277#define I915_PARAM_HAS_EXECBUF2 9 277#define I915_PARAM_HAS_EXECBUF2 9
278#define I915_PARAM_HAS_BSD 10
278 279
279typedef struct drm_i915_getparam { 280typedef struct drm_i915_getparam {
280 int param; 281 int param;