diff options
| author | Thomas Hellstrom <thellstrom@vmware.com> | 2012-11-09 10:45:14 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-11-09 11:49:06 +0100 |
| commit | afcc87aa6a233e52df73552dc1dc9ae3881b7cc8 (patch) | |
| tree | d39b407af26ea604cbeacbdb569cf2ff43ae21d5 /drivers/gpu | |
| parent | drm/vmwgfx: Fix hibernation device reset (diff) | |
| download | linux-afcc87aa6a233e52df73552dc1dc9ae3881b7cc8.tar.xz linux-afcc87aa6a233e52df73552dc1dc9ae3881b7cc8.zip | |
drm/vmwgfx: Fix a case where the code would BUG when trying to pin GMR memory
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Dmitry Torokhov <dtor@vmware.com>
Cc: stable@vger.kernel.org
Cc: linux-graphics-maintainer@vmware.com
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c index 3ce68a2e312d..d1498bfd7873 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c @@ -306,7 +306,7 @@ void vmw_bo_pin(struct ttm_buffer_object *bo, bool pin) BUG_ON(!atomic_read(&bo->reserved)); BUG_ON(old_mem_type != TTM_PL_VRAM && - old_mem_type != VMW_PL_FLAG_GMR); + old_mem_type != VMW_PL_GMR); pl_flags = TTM_PL_FLAG_VRAM | VMW_PL_FLAG_GMR | TTM_PL_FLAG_CACHED; if (pin) |