diff options
| author | Thomas Hellstrom <thellstrom@vmware.com> | 2014-02-05 09:18:26 +0100 |
|---|---|---|
| committer | Thomas Hellstrom <thellstrom@vmware.com> | 2014-02-05 16:03:29 +0100 |
| commit | 1b76af5ce8deb1c775ad1674bd249d782b5b13d9 (patch) | |
| tree | 201a27807dde2d1ab37d54c351c319e8fb5e5bc6 | |
| parent | c66f854338253e603a4fb6817069ee23eacf0ae3 (diff) | |
drm/ttm: Don't clear page metadata of imported sg pagesttm-fixes-3.14-2014-02-05
These page pointers shouldn't be visible to TTM in the first place, but
until we fix that up, don't clear the page metadata because that
will upset the exporter.
Reported-and-tested-by: Cristoph Haag <haagch.christoph@googleemail.com>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_tt.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c index 9af99084b344..75f319090043 100644 --- a/drivers/gpu/drm/ttm/ttm_tt.c +++ b/drivers/gpu/drm/ttm/ttm_tt.c @@ -380,6 +380,9 @@ static void ttm_tt_clear_mapping(struct ttm_tt *ttm) pgoff_t i; struct page **page = ttm->pages; + if (ttm->page_flags & TTM_PAGE_FLAG_SG) + return; + for (i = 0; i < ttm->num_pages; ++i) { (*page)->mapping = NULL; (*page++)->index = 0; |