diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-02-06 11:50:48 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-02-06 11:50:48 +1000 |
| commit | 9df5a9b02fb59a4148bc93e0d20731c72aaffa5f (patch) | |
| tree | 9ab958c42e2db08fe0c8767e339e0b20c48bba2f /drivers/gpu | |
| parent | 8b7ad1bb3d440da888f2a939dc870eba429b9192 (diff) | |
| parent | 1b76af5ce8deb1c775ad1674bd249d782b5b13d9 (diff) | |
| download | op-kernel-dev-9df5a9b02fb59a4148bc93e0d20731c72aaffa5f.zip op-kernel-dev-9df5a9b02fb59a4148bc93e0d20731c72aaffa5f.tar.gz | |
Merge tag 'ttm-fixes-3.14-2014-02-05' of git://people.freedesktop.org/~thomash/linux into drm-next
Two ttm regression fixes.
Pull request of 2014-02-05
* tag 'ttm-fixes-3.14-2014-02-05' of git://people.freedesktop.org/~thomash/linux:
drm/ttm: Don't clear page metadata of imported sg pages
drm/ttm: Fix TTM object open regression
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_object.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_tt.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_object.c b/drivers/gpu/drm/ttm/ttm_object.c index 3707985..53b51c4 100644 --- a/drivers/gpu/drm/ttm/ttm_object.c +++ b/drivers/gpu/drm/ttm/ttm_object.c @@ -292,7 +292,7 @@ int ttm_ref_object_add(struct ttm_object_file *tfile, if (ret == 0) { ref = drm_hash_entry(hash, struct ttm_ref_object, hash); - if (!kref_get_unless_zero(&ref->kref)) { + if (kref_get_unless_zero(&ref->kref)) { rcu_read_unlock(); break; } diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c index 9af9908..75f3190 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; |
