Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9df5a9b0 authored by Dave Airlie's avatar Dave Airlie
Browse files

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
parents 8b7ad1bb 1b76af5c

drivers/gpu/drm/ttm/ttm_object.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

			}

drivers/gpu/drm/ttm/ttm_tt.c

+3 −0
Original line number Diff line number Diff line
@@ -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;