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

Commit fcee3c73 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2015-06-18' of git://anongit.freedesktop.org/drm-intel into drm-fixes 

one fix, one revert
* tag 'drm-intel-fixes-2015-06-18' of git://anongit.freedesktop.org/drm-intel:
  Revert "drm/i915: Don't skip request retirement if the active list is empty"
  drm/i915: Always reset vma->ggtt_view.pages cache on unbinding
parents 031fea43 245ec9d8

drivers/gpu/drm/i915/i915_gem.c

+4 −1
Original line number Diff line number Diff line
@@ -2656,6 +2656,9 @@ void i915_gem_reset(struct drm_device *dev) 
void

i915_gem_retire_requests_ring(struct intel_engine_cs *ring)

{

	if (list_empty(&ring->request_list))

		return;



	WARN_ON(i915_verify_lists(ring->dev));



	/* Retire requests first as we use it above for the early return.
@@ -3000,8 +3003,8 @@ int i915_vma_unbind(struct i915_vma *vma) 
		} else if (vma->ggtt_view.pages) {

			sg_free_table(vma->ggtt_view.pages);

			kfree(vma->ggtt_view.pages);

			vma->ggtt_view.pages = NULL;

		}

		vma->ggtt_view.pages = NULL;

	}



	drm_mm_remove_node(&vma->node);