diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-11-19 15:24:54 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-11-19 15:34:18 -0500 |
commit | ac883c84e45f44a671e6ebe2a4be41b3167c0261 (patch) | |
tree | 3a61648943c14d23c1aa1bd3993d69cddc22f71a | |
parent | 77f31815e1d0a9ae2cb073fc5f9ef33e5f3df059 (diff) |
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>
-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, | |||
58 | drm_i915_getparam_t *param = data; | 58 | drm_i915_getparam_t *param = data; |
59 | int value; | 59 | int value; |
60 | 60 | ||
61 | if (!dev_priv) { | ||
62 | DRM_ERROR("called with no initialization\n"); | ||
63 | return -EINVAL; | ||
64 | } | ||
65 | |||
66 | switch (param->param) { | 61 | switch (param->param) { |
67 | case I915_PARAM_IRQ_ACTIVE: | 62 | case I915_PARAM_IRQ_ACTIVE: |
68 | return -ENODEV; | ||
69 | case I915_PARAM_ALLOW_BATCHBUFFER: | 63 | case I915_PARAM_ALLOW_BATCHBUFFER: |
70 | return -ENODEV; | ||
71 | case I915_PARAM_LAST_DISPATCH: | 64 | case I915_PARAM_LAST_DISPATCH: |
65 | /* Reject all old ums/dri params. */ | ||
72 | return -ENODEV; | 66 | return -ENODEV; |
73 | case I915_PARAM_CHIPSET_ID: | 67 | case I915_PARAM_CHIPSET_ID: |
74 | value = dev->pdev->device; | 68 | value = dev->pdev->device; |
@@ -168,15 +162,11 @@ static int i915_setparam(struct drm_device *dev, void *data, | |||
168 | struct drm_i915_private *dev_priv = dev->dev_private; | 162 | struct drm_i915_private *dev_priv = dev->dev_private; |
169 | drm_i915_setparam_t *param = data; | 163 | drm_i915_setparam_t *param = data; |
170 | 164 | ||
171 | if (!dev_priv) { | ||
172 | DRM_ERROR("called with no initialization\n"); | ||
173 | return -EINVAL; | ||
174 | } | ||
175 | |||
176 | switch (param->param) { | 165 | switch (param->param) { |
177 | case I915_SETPARAM_USE_MI_BATCHBUFFER_START: | 166 | case I915_SETPARAM_USE_MI_BATCHBUFFER_START: |
178 | case I915_SETPARAM_TEX_LRU_LOG_GRANULARITY: | 167 | case I915_SETPARAM_TEX_LRU_LOG_GRANULARITY: |
179 | case I915_SETPARAM_ALLOW_BATCHBUFFER: | 168 | case I915_SETPARAM_ALLOW_BATCHBUFFER: |
169 | /* Reject all old ums/dri params. */ | ||
180 | return -ENODEV; | 170 | return -ENODEV; |
181 | 171 | ||
182 | case I915_SETPARAM_NUM_USED_FENCES: | 172 | case I915_SETPARAM_NUM_USED_FENCES: |