Commit 1a506e47 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux 

Pull i915 drm fixes from Dave Airlie:
 "These should be the last two fixes for i915, one is for a fence leak
  killing X on some older GPUs, and one is a late regression partial
  revert for an swiotlb/xen/i915 interaction, Konrad has promised to
  figure out the proper answer, and this patch is the best thing to do
  at this stage to avoid regressing"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/i915: make compact dma scatter lists creation work with SWIOTLB backend.
  drm/i915: Restore fences after resume and GPU resets
parents 34a08681 426729dc

drivers/gpu/drm/i915/i915_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -1697,6 +1697,8 @@ struct drm_gem_object *i915_gem_prime_import(struct drm_device *dev, 
struct dma_buf *i915_gem_prime_export(struct drm_device *dev,

				struct drm_gem_object *gem_obj, int flags);



void i915_gem_restore_fences(struct drm_device *dev);



/* i915_gem_context.c */

void i915_gem_context_init(struct drm_device *dev);

void i915_gem_context_fini(struct drm_device *dev);

drivers/gpu/drm/i915/i915_gem.c

+17 −20
Original line number Diff line number Diff line
@@ -1801,7 +1801,14 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj) 
			gfp |= __GFP_NORETRY | __GFP_NOWARN | __GFP_NO_KSWAPD;

			gfp &= ~(__GFP_IO | __GFP_WAIT);

		}



#ifdef CONFIG_SWIOTLB

		if (swiotlb_nr_tbl()) {

			st->nents++;

			sg_set_page(sg, page, PAGE_SIZE, 0);

			sg = sg_next(sg);

			continue;

		}

#endif

		if (!i || page_to_pfn(page) != last_pfn + 1) {

			if (i)

				sg = sg_next(sg);
@@ -1812,7 +1819,9 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj) 
		}

		last_pfn = page_to_pfn(page);

	}



#ifdef CONFIG_SWIOTLB

	if (!swiotlb_nr_tbl())

#endif

		sg_mark_end(sg);

	obj->pages = st;
@@ -2117,25 +2126,15 @@ static void i915_gem_reset_ring_lists(struct drm_i915_private *dev_priv, 
	}

}



static void i915_gem_reset_fences(struct drm_device *dev)

void i915_gem_restore_fences(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	int i;



	for (i = 0; i < dev_priv->num_fence_regs; i++) {

		struct drm_i915_fence_reg *reg = &dev_priv->fence_regs[i];



		if (reg->obj)

			i915_gem_object_fence_lost(reg->obj);



		i915_gem_write_fence(dev, i, NULL);



		reg->pin_count = 0;

		reg->obj = NULL;

		INIT_LIST_HEAD(&reg->lru_list);

		i915_gem_write_fence(dev, i, reg->obj);

	}



	INIT_LIST_HEAD(&dev_priv->mm.fence_list);

}



void i915_gem_reset(struct drm_device *dev)
@@ -2158,8 +2157,7 @@ void i915_gem_reset(struct drm_device *dev) 
		obj->base.read_domains &= ~I915_GEM_GPU_DOMAINS;

	}



	/* The fence registers are invalidated so clear them out */

	i915_gem_reset_fences(dev);

	i915_gem_restore_fences(dev);

}



/**
@@ -3865,8 +3863,6 @@ i915_gem_idle(struct drm_device *dev) 
	if (!drm_core_check_feature(dev, DRIVER_MODESET))

		i915_gem_evict_everything(dev);



	i915_gem_reset_fences(dev);



	/* Hack!  Don't let anybody do execbuf while we don't control the chip.

	 * We need to replace this with a semaphore, or something.

	 * And not confound mm.suspended!
@@ -4193,7 +4189,8 @@ i915_gem_load(struct drm_device *dev) 
		dev_priv->num_fence_regs = 8;



	/* Initialize fence registers to zero */

	i915_gem_reset_fences(dev);

	INIT_LIST_HEAD(&dev_priv->mm.fence_list);

	i915_gem_restore_fences(dev);



	i915_gem_detect_bit_6_swizzle(dev);

	init_waitqueue_head(&dev_priv->pending_flip_queue);

drivers/gpu/drm/i915/i915_suspend.c

+1 −0
Original line number Diff line number Diff line
@@ -384,6 +384,7 @@ int i915_restore_state(struct drm_device *dev) 


	mutex_lock(&dev->struct_mutex);



	i915_gem_restore_fences(dev);

	i915_restore_display(dev);



	if (!drm_core_check_feature(dev, DRIVER_MODESET)) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE