diff options
| author | Mark Brown <broonie@linaro.org> | 2014-01-17 15:52:17 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-17 15:52:17 +0000 |
| commit | 81e53d0470878165a300d75ac06a5bc5eee543a2 (patch) | |
| tree | 5fdaacfb350c5a290109f98ab29e9858f1f11469 /drivers/gpu/drm/ttm/ttm_bo_util.c | |
| parent | 15e0964dc2a097de3cf518badf2237b6b6adf7fe (diff) | |
| parent | fcb4ed749c776a2ae89ca40343cbccb6f8981e60 (diff) | |
Merge branches 'topic/sc18is602' and 'topic/rspi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-bpw
Diffstat (limited to 'drivers/gpu/drm/ttm/ttm_bo_util.c')
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_bo_util.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c index 15b86a94949..40615215231 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_util.c +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c @@ -353,7 +353,8 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo, * Don't move nonexistent data. Clear destination instead. */ if (old_iomap == NULL && - (ttm == NULL || ttm->state == tt_unpopulated)) { + (ttm == NULL || (ttm->state == tt_unpopulated && + !(ttm->page_flags & TTM_PAGE_FLAG_SWAPPED)))) { memset_io(new_iomap, 0, new_mem->num_pages*PAGE_SIZE); goto out2; } |