diff options
| author | Mark Brown <broonie@linaro.org> | 2014-01-14 14:14:47 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-14 14:14:47 +0000 |
| commit | 13ea3300100ec3461560b1e061033cd167333a86 (patch) | |
| tree | c60a016a06c488adada6959516e2a2de96d6d7d3 /drivers/gpu/drm/ttm/ttm_bo_util.c | |
| parent | b7ed6b88b2a5e961eeb939ef637a3cbb435a23a7 (diff) | |
| parent | 68e67d97e1f91ed11e041b67f3a1336f518c608f (diff) | |
Merge branch 'topic/rcar' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-rspi
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; } |