Skip to content

Commit

Permalink
drm/ttm: Handle in-memory region copies
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Jakob Bornecrantz authored and Thomas Hellstrom committed Nov 6, 2013
1 parent 15205fb commit 9a0599d
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/gpu/drm/ttm/ttm_bo_util.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9a0599d

Please sign in to comment.