Commit 8be0e5c4 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-next 

Some fixes for 3.8:
- Watermark fixups from Chris Wilson (4 pieces).
- 2 snb workarounds, seem to be recently added to our internal DB.
- workaround for the infamous i830/i845 hang, seems now finally solid!
  Based on Chris' fix for SNA, now also for UXA/mesa&old SNA.
- Some more fixlets for shrinker-pulls-the-rug issues (Chris&me).
- Fix dma-buf flags when exporting (you).
- Disable the VGA plane if it's enabled on lid open - similar fix in
  spirit to the one I've sent you last weeek, BIOS' really like to mess
  with the display when closing the lid (awesome debug work from Krzysztof
  Mazur).

* 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
  drm/i915: disable shrinker lock stealing for create_mmap_offset
  drm/i915: optionally disable shrinker lock stealing
  drm/i915: fix flags in dma buf exporting
  i915: ensure that VGA plane is disabled
  drm/i915: Preallocate the drm_mm_node prior to manipulating the GTT drm_mm manager
  drm: Export routines for inserting preallocated nodes into the mm manager
  drm/i915: don't disable disconnected outputs
  drm/i915: Implement workaround for broken CS tlb on i830/845
  drm/i915: Implement WaSetupGtModeTdRowDispatch
  drm/i915: Implement WaDisableHiZPlanesWhenMSAAEnabled
  drm/i915: Prefer CRTC 'active' rather than 'enabled' during WM computations
  drm/i915: Clear self-refresh watermarks when disabled
  drm/i915: Double the cursor self-refresh latency on Valleyview
  drm/i915: Fixup cursor latency used for IVB lp3 watermarks
parents b1d778b9 da494d7c

drivers/gpu/drm/drm_mm.c

+29 −12
Original line number Diff line number Diff line
@@ -184,19 +184,27 @@ EXPORT_SYMBOL(drm_mm_get_block_generic); 
 * -ENOSPC if no suitable free area is available. The preallocated memory node

 * must be cleared.

 */

int drm_mm_insert_node(struct drm_mm *mm, struct drm_mm_node *node,

		       unsigned long size, unsigned alignment)

int drm_mm_insert_node_generic(struct drm_mm *mm, struct drm_mm_node *node,

			       unsigned long size, unsigned alignment,

			       unsigned long color)

{

	struct drm_mm_node *hole_node;



	hole_node = drm_mm_search_free(mm, size, alignment, false);

	hole_node = drm_mm_search_free_generic(mm, size, alignment,

					       color, 0);

	if (!hole_node)

		return -ENOSPC;



	drm_mm_insert_helper(hole_node, node, size, alignment, 0);



	drm_mm_insert_helper(hole_node, node, size, alignment, color);

	return 0;

}

EXPORT_SYMBOL(drm_mm_insert_node_generic);



int drm_mm_insert_node(struct drm_mm *mm, struct drm_mm_node *node,

		       unsigned long size, unsigned alignment)

{

	return drm_mm_insert_node_generic(mm, node, size, alignment, 0);

}

EXPORT_SYMBOL(drm_mm_insert_node);



static void drm_mm_insert_helper_range(struct drm_mm_node *hole_node,
@@ -275,22 +283,31 @@ EXPORT_SYMBOL(drm_mm_get_block_range_generic); 
 * -ENOSPC if no suitable free area is available. This is for range

 * restricted allocations. The preallocated memory node must be cleared.

 */

int drm_mm_insert_node_in_range(struct drm_mm *mm, struct drm_mm_node *node,

				unsigned long size, unsigned alignment,

int drm_mm_insert_node_in_range_generic(struct drm_mm *mm, struct drm_mm_node *node,

					unsigned long size, unsigned alignment, unsigned long color,

					unsigned long start, unsigned long end)

{

	struct drm_mm_node *hole_node;



	hole_node = drm_mm_search_free_in_range(mm, size, alignment,

						start, end, false);

	hole_node = drm_mm_search_free_in_range_generic(mm,

							size, alignment, color,

							start, end, 0);

	if (!hole_node)

		return -ENOSPC;



	drm_mm_insert_helper_range(hole_node, node, size, alignment, 0,

	drm_mm_insert_helper_range(hole_node, node,

				   size, alignment, color,

				   start, end);



	return 0;

}

EXPORT_SYMBOL(drm_mm_insert_node_in_range_generic);



int drm_mm_insert_node_in_range(struct drm_mm *mm, struct drm_mm_node *node,

				unsigned long size, unsigned alignment,

				unsigned long start, unsigned long end)

{

	return drm_mm_insert_node_in_range_generic(mm, node, size, alignment, 0, start, end);

}

EXPORT_SYMBOL(drm_mm_insert_node_in_range);



/**

drivers/gpu/drm/i915/i915_dma.c

+3 −0
Original line number Diff line number Diff line
@@ -989,6 +989,9 @@ static int i915_getparam(struct drm_device *dev, void *data, 
	case I915_PARAM_HAS_SECURE_BATCHES:

		value = capable(CAP_SYS_ADMIN);

		break;

	case I915_PARAM_HAS_PINNED_BATCHES:

		value = 1;

		break;

	default:

		DRM_DEBUG_DRIVER("Unknown parameter %d\n",

				 param->param);

drivers/gpu/drm/i915/i915_drv.h

+8 −0
Original line number Diff line number Diff line
@@ -780,6 +780,7 @@ typedef struct drm_i915_private { 
		struct i915_hw_ppgtt *aliasing_ppgtt;



		struct shrinker inactive_shrinker;

		bool shrinker_no_lock_stealing;



		/**

		 * List of objects currently involved in rendering.
@@ -1100,6 +1101,7 @@ struct drm_i915_gem_object { 
	 */

	atomic_t pending_flip;

};

#define to_gem_object(obj) (&((struct drm_i915_gem_object *)(obj))->base)



#define to_intel_bo(x) container_of(x, struct drm_i915_gem_object, base)
@@ -1166,6 +1168,9 @@ struct drm_i915_file_private { 
#define IS_IVB_GT1(dev)		((dev)->pci_device == 0x0156 || \

				 (dev)->pci_device == 0x0152 ||	\

				 (dev)->pci_device == 0x015a)

#define IS_SNB_GT1(dev)		((dev)->pci_device == 0x0102 || \

				 (dev)->pci_device == 0x0106 ||	\

				 (dev)->pci_device == 0x010A)

#define IS_VALLEYVIEW(dev)	(INTEL_INFO(dev)->is_valleyview)

#define IS_HASWELL(dev)	(INTEL_INFO(dev)->is_haswell)

#define IS_MOBILE(dev)		(INTEL_INFO(dev)->is_mobile)
@@ -1196,6 +1201,9 @@ struct drm_i915_file_private { 
#define HAS_OVERLAY(dev)		(INTEL_INFO(dev)->has_overlay)

#define OVERLAY_NEEDS_PHYSICAL(dev)	(INTEL_INFO(dev)->overlay_needs_physical)



/* Early gen2 have a totally busted CS tlb and require pinned batches. */

#define HAS_BROKEN_CS_TLB(dev)		(IS_I830(dev) || IS_845G(dev))



/* With the 945 and later, Y tiling got adjusted so that it was 32 128-byte

 * rows, which changed the alignment requirements and fence programming.

 */

drivers/gpu/drm/i915/i915_gem.c

+37 −40
Original line number Diff line number Diff line
@@ -1517,9 +1517,11 @@ static int i915_gem_object_create_mmap_offset(struct drm_i915_gem_object *obj) 
	if (obj->base.map_list.map)

		return 0;



	dev_priv->mm.shrinker_no_lock_stealing = true;



	ret = drm_gem_create_mmap_offset(&obj->base);

	if (ret != -ENOSPC)

		return ret;

		goto out;



	/* Badly fragmented mmap space? The only way we can recover

	 * space is by destroying unwanted objects. We can't randomly release
@@ -1531,10 +1533,14 @@ static int i915_gem_object_create_mmap_offset(struct drm_i915_gem_object *obj) 
	i915_gem_purge(dev_priv, obj->base.size >> PAGE_SHIFT);

	ret = drm_gem_create_mmap_offset(&obj->base);

	if (ret != -ENOSPC)

		return ret;

		goto out;



	i915_gem_shrink_all(dev_priv);

	return drm_gem_create_mmap_offset(&obj->base);

	ret = drm_gem_create_mmap_offset(&obj->base);

out:

	dev_priv->mm.shrinker_no_lock_stealing = false;



	return ret;

}



static void i915_gem_object_free_mmap_offset(struct drm_i915_gem_object *obj)
@@ -2890,7 +2896,7 @@ i915_gem_object_bind_to_gtt(struct drm_i915_gem_object *obj, 
{

	struct drm_device *dev = obj->base.dev;

	drm_i915_private_t *dev_priv = dev->dev_private;

	struct drm_mm_node *free_space;

	struct drm_mm_node *node;

	u32 size, fence_size, fence_alignment, unfenced_alignment;

	bool mappable, fenceable;

	int ret;
@@ -2936,66 +2942,54 @@ i915_gem_object_bind_to_gtt(struct drm_i915_gem_object *obj, 


	i915_gem_object_pin_pages(obj);



 search_free:

	if (map_and_fenceable)

		free_space = drm_mm_search_free_in_range_color(&dev_priv->mm.gtt_space,

							       size, alignment, obj->cache_level,

							       0, dev_priv->mm.gtt_mappable_end,

							       false);

	else

		free_space = drm_mm_search_free_color(&dev_priv->mm.gtt_space,

						      size, alignment, obj->cache_level,

						      false);

	node = kzalloc(sizeof(*node), GFP_KERNEL);

	if (node == NULL) {

		i915_gem_object_unpin_pages(obj);

		return -ENOMEM;

	}



	if (free_space != NULL) {

 search_free:

	if (map_and_fenceable)

			free_space =

				drm_mm_get_block_range_generic(free_space,

		ret = drm_mm_insert_node_in_range_generic(&dev_priv->mm.gtt_space, node,

							  size, alignment, obj->cache_level,

							       0, dev_priv->mm.gtt_mappable_end,

							       false);

							  0, dev_priv->mm.gtt_mappable_end);

	else

			free_space =

				drm_mm_get_block_generic(free_space,

							 size, alignment, obj->cache_level,

							 false);

	}

	if (free_space == NULL) {

		ret = drm_mm_insert_node_generic(&dev_priv->mm.gtt_space, node,

						 size, alignment, obj->cache_level);

	if (ret) {

		ret = i915_gem_evict_something(dev, size, alignment,

					       obj->cache_level,

					       map_and_fenceable,

					       nonblocking);

		if (ret) {

		if (ret == 0)

			goto search_free;



		i915_gem_object_unpin_pages(obj);

		kfree(node);

		return ret;

	}



		goto search_free;

	}

	if (WARN_ON(!i915_gem_valid_gtt_space(dev,

					      free_space,

					      obj->cache_level))) {

	if (WARN_ON(!i915_gem_valid_gtt_space(dev, node, obj->cache_level))) {

		i915_gem_object_unpin_pages(obj);

		drm_mm_put_block(free_space);

		drm_mm_put_block(node);

		return -EINVAL;

	}



	ret = i915_gem_gtt_prepare_object(obj);

	if (ret) {

		i915_gem_object_unpin_pages(obj);

		drm_mm_put_block(free_space);

		drm_mm_put_block(node);

		return ret;

	}



	list_move_tail(&obj->gtt_list, &dev_priv->mm.bound_list);

	list_add_tail(&obj->mm_list, &dev_priv->mm.inactive_list);



	obj->gtt_space = free_space;

	obj->gtt_offset = free_space->start;

	obj->gtt_space = node;

	obj->gtt_offset = node->start;



	fenceable =

		free_space->size == fence_size &&

		(free_space->start & (fence_alignment - 1)) == 0;

		node->size == fence_size &&

		(node->start & (fence_alignment - 1)) == 0;



	mappable =

		obj->gtt_offset + obj->base.size <= dev_priv->mm.gtt_mappable_end;
@@ -4392,6 +4386,9 @@ i915_gem_inactive_shrink(struct shrinker *shrinker, struct shrink_control *sc) 
		if (!mutex_is_locked_by(&dev->struct_mutex, current))

			return 0;



		if (dev_priv->mm.shrinker_no_lock_stealing)

			return 0;



		unlock = false;

	}

drivers/gpu/drm/i915/i915_gem_dmabuf.c

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ struct dma_buf *i915_gem_prime_export(struct drm_device *dev, 
{

	struct drm_i915_gem_object *obj = to_intel_bo(gem_obj);



	return dma_buf_export(obj, &i915_dmabuf_ops, obj->base.size, 0600);

	return dma_buf_export(obj, &i915_dmabuf_ops, obj->base.size, flags);

}



static int i915_gem_object_get_pages_dmabuf(struct drm_i915_gem_object *obj)

CRA Git | Maintained and supported by SUSTech CRA and CCSE