diff options
| author | Daniel Vetter | 2014-11-19 21:24:54 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2014-11-19 21:34:18 +0100 |
| commit | ac883c84e45f44a671e6ebe2a4be41b3167c0261 (patch) | |
| tree | 3a61648943c14d23c1aa1bd3993d69cddc22f71a /drivers/gpu/drm/i915/i915_dma.c | |
| parent | drm/i915: Replace dri1 functions with drm_noop (diff) | |
| download | kernel-qcow2-linux-ac883c84e45f44a671e6ebe2a4be41b3167c0261.tar.gz kernel-qcow2-linux-ac883c84e45f44a671e6ebe2a4be41b3167c0261.tar.xz kernel-qcow2-linux-ac883c84e45f44a671e6ebe2a4be41b3167c0261.zip | |
drm/i915: Drop checks for initialization
KMS always intializes, this was only a valid check when userspace
was still in control of the kernel driver.
v2: Comment that we outright reject all dri1/ums params.
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 887df56cb655..69d6c76f4c2d 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -58,17 +58,11 @@ static int i915_getparam(struct drm_device *dev, void *data, drm_i915_getparam_t *param = data; int value; - if (!dev_priv) { - DRM_ERROR("called with no initialization\n"); - return -EINVAL; - } - switch (param->param) { case I915_PARAM_IRQ_ACTIVE: - return -ENODEV; case I915_PARAM_ALLOW_BATCHBUFFER: - return -ENODEV; case I915_PARAM_LAST_DISPATCH: + /* Reject all old ums/dri params. */ return -ENODEV; case I915_PARAM_CHIPSET_ID: value = dev->pdev->device; @@ -168,15 +162,11 @@ static int i915_setparam(struct drm_device *dev, void *data, struct drm_i915_private *dev_priv = dev->dev_private; drm_i915_setparam_t *param = data; - if (!dev_priv) { - DRM_ERROR("called with no initialization\n"); - return -EINVAL; - } - switch (param->param) { case I915_SETPARAM_USE_MI_BATCHBUFFER_START: case I915_SETPARAM_TEX_LRU_LOG_GRANULARITY: case I915_SETPARAM_ALLOW_BATCHBUFFER: + /* Reject all old ums/dri params. */ return -ENODEV; case I915_SETPARAM_NUM_USED_FENCES: |