diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-01-12 17:07:46 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-01-12 17:07:46 -0500 |
commit | 0a87a2db485a1456b7427914969c0e8195a1bbda (patch) | |
tree | 8d0186672af22c6ee76118c471881cd66a36502d /drivers/gpu/drm/i915/i915_gem_execbuffer.c | |
parent | 7226572d8ed48f7e1aa9de5383d919490d6e9a0c (diff) | |
parent | fcf3aac5fc307f0cae429f5844ddc25761662858 (diff) |
Merge tag 'topic/i915-hda-componentized-2015-01-12' into drm-intel-next-queued
Conflicts:
drivers/gpu/drm/i915/intel_runtime_pm.c
Separate branch so that Takashi can also pull just this refactoring
into sound-next.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_execbuffer.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem_execbuffer.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index 6c21c59ed71d..e3ef17783765 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c | |||
@@ -122,9 +122,6 @@ eb_lookup_vmas(struct eb_vmas *eb, | |||
122 | goto err; | 122 | goto err; |
123 | } | 123 | } |
124 | 124 | ||
125 | WARN_ONCE(obj->base.dumb, | ||
126 | "GPU use of dumb buffer is illegal.\n"); | ||
127 | |||
128 | drm_gem_object_reference(&obj->base); | 125 | drm_gem_object_reference(&obj->base); |
129 | list_add_tail(&obj->obj_exec_link, &objects); | 126 | list_add_tail(&obj->obj_exec_link, &objects); |
130 | } | 127 | } |