drm/i915: Drop checks for initialization
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 19 Nov 2014 20:24:54 +0000 (21:24 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 19 Nov 2014 20:34:18 +0000 (21:34 +0100)
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>
drivers/gpu/drm/i915/i915_dma.c

index 887df56..69d6c76 100644 (file)
@@ -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: