summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/ttm
diff options
context:
space:
mode:
authorJakob Bornecrantz <jakob@vmware.com>2013-10-30 02:46:56 -0700
committerThomas Hellstrom <thellstrom@vmware.com>2013-11-06 04:35:58 -0800
commit9a0599ddeae012a771bba5e23393fc52d8a59d89 (patch)
tree378cc851a1bbdbded9b73f47eaa946ad1b01446d /drivers/gpu/drm/ttm
parent15205fbcbe5abf52d6b064c5e8d2f901518d14a2 (diff)
downloadop-kernel-dev-9a0599ddeae012a771bba5e23393fc52d8a59d89.zip
op-kernel-dev-9a0599ddeae012a771bba5e23393fc52d8a59d89.tar.gz
drm/ttm: Handle in-memory region copies
Fix the case where the ttm pointer may be NULL causing a NULL pointer dereference. Signed-off-by: Jakob Bornecrantz <jakob@vmware.com> Signed-off-by: Thomas Hellström <thellstrom@vmware.com> Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/gpu/drm/ttm')
-rw-r--r--drivers/gpu/drm/ttm/ttm_bo_util.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
index 7cc904d..8369e35c 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_util.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
@@ -348,7 +348,9 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo,
if (old_iomap == NULL && ttm == NULL)
goto out2;
- if (ttm->state == tt_unpopulated) {
+ /* TTM might be null for moves within the same region.
+ */
+ if (ttm && ttm->state == tt_unpopulated) {
ret = ttm->bdev->driver->ttm_tt_populate(ttm);
if (ret) {
/* if we fail here don't nuke the mm node
OpenPOWER on IntegriCloud