Commit 61f2669f authored by Dave Airlie's avatar Dave Airlie
Browse files

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

Next batch of i915 fixes. Note that the compat32 patch here needs the drm
core one to be actually useful, I'll send you that one with a separate
drm-fixes pull request. One revert because a fix in -rc2 did break
existing userspace.

* tag 'drm-intel-fixes-2015-07-15' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: Do not call intel_crtc_disable if the crtc is already disabled.
  Revert "drm/i915: Declare the swizzling unknown for L-shaped configurations"
  drm/i915: Forward all core DRM ioctls to core compat handling
  drm/i915: fix oops in primary_check_plane
  drm/i915: remove unused has_dma_mapping flag
  drm/i915: Fix missing return warning for !CONFIG_DEBUGFS
  drm/i915: avoid leaking DMA mappings
  drm/i915: Snapshot seqno of most recently submitted request.
  drm/i915: Store device pointer in contexts for late tracepoint usafe
parents 37553983 ccfb8b2e

drivers/gpu/drm/i915/i915_drv.h

+3 −3
Original line number Diff line number Diff line
@@ -826,6 +826,7 @@ struct intel_context { 
	struct kref ref;

	int user_handle;

	uint8_t remap_slice;

	struct drm_i915_private *i915;

	struct drm_i915_file_private *file_priv;

	struct i915_ctx_hang_stats hang_stats;

	struct i915_hw_ppgtt *ppgtt;
@@ -2036,8 +2037,6 @@ struct drm_i915_gem_object { 
	unsigned int cache_level:3;

	unsigned int cache_dirty:1;



	unsigned int has_dma_mapping:1;



	unsigned int frontbuffer_bits:INTEL_FRONTBUFFER_BITS;



	unsigned int pin_display;
@@ -3116,7 +3115,8 @@ void i915_debugfs_cleanup(struct drm_minor *minor); 
int i915_debugfs_connector_add(struct drm_connector *connector);

void intel_display_crc_init(struct drm_device *dev);

#else

static inline int i915_debugfs_connector_add(struct drm_connector *connector) {}

static inline int i915_debugfs_connector_add(struct drm_connector *connector)

{ return 0; }

static inline void intel_display_crc_init(struct drm_device *dev) {}

#endif

drivers/gpu/drm/i915/i915_gem.c

+17 −18
Original line number Diff line number Diff line
@@ -213,7 +213,6 @@ i915_gem_object_get_pages_phys(struct drm_i915_gem_object *obj) 
	sg_dma_len(sg) = obj->base.size;



	obj->pages = st;

	obj->has_dma_mapping = true;

	return 0;

}
@@ -265,8 +264,6 @@ i915_gem_object_put_pages_phys(struct drm_i915_gem_object *obj) 


	sg_free_table(obj->pages);

	kfree(obj->pages);



	obj->has_dma_mapping = false;

}



static void
@@ -2139,6 +2136,8 @@ i915_gem_object_put_pages_gtt(struct drm_i915_gem_object *obj) 
		obj->base.read_domains = obj->base.write_domain = I915_GEM_DOMAIN_CPU;

	}



	i915_gem_gtt_finish_object(obj);



	if (i915_gem_object_needs_bit17_swizzle(obj))

		i915_gem_object_save_bit_17_swizzle(obj);
@@ -2199,6 +2198,7 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj) 
	struct sg_page_iter sg_iter;

	struct page *page;

	unsigned long last_pfn = 0;	/* suppress gcc warning */

	int ret;

	gfp_t gfp;



	/* Assert that the object is not currently in any GPU domain. As it
@@ -2246,9 +2246,11 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj) 
			 */

			i915_gem_shrink_all(dev_priv);

			page = shmem_read_mapping_page(mapping, i);

			if (IS_ERR(page))

			if (IS_ERR(page)) {

				ret = PTR_ERR(page);

				goto err_pages;

			}

		}

#ifdef CONFIG_SWIOTLB

		if (swiotlb_nr_tbl()) {

			st->nents++;
@@ -2276,6 +2278,10 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj) 
		sg_mark_end(sg);

	obj->pages = st;



	ret = i915_gem_gtt_prepare_object(obj);

	if (ret)

		goto err_pages;



	if (i915_gem_object_needs_bit17_swizzle(obj))

		i915_gem_object_do_bit_17_swizzle(obj);
@@ -2300,10 +2306,10 @@ err_pages: 
	 * space and so want to translate the error from shmemfs back to our

	 * usual understanding of ENOMEM.

	 */

	if (PTR_ERR(page) == -ENOSPC)

		return -ENOMEM;

	else

		return PTR_ERR(page);

	if (ret == -ENOSPC)

		ret = -ENOMEM;



	return ret;

}



/* Ensure that the associated pages are gathered from the backing storage
@@ -2542,6 +2548,7 @@ int __i915_add_request(struct intel_engine_cs *ring, 
	}



	request->emitted_jiffies = jiffies;

	ring->last_submitted_seqno = request->seqno;

	list_add_tail(&request->list, &ring->request_list);

	request->file_priv = NULL;
@@ -3247,10 +3254,8 @@ int i915_vma_unbind(struct i915_vma *vma) 


	/* Since the unbound list is global, only move to that list if

	 * no more VMAs exist. */

	if (list_empty(&obj->vma_list)) {

		i915_gem_gtt_finish_object(obj);

	if (list_empty(&obj->vma_list))

		list_move_tail(&obj->global_list, &dev_priv->mm.unbound_list);

	}



	/* And finally now the object is completely decoupled from this vma,

	 * we can drop its hold on the backing storage and allow it to be
@@ -3768,22 +3773,16 @@ search_free: 
		goto err_remove_node;

	}



	ret = i915_gem_gtt_prepare_object(obj);

	if (ret)

		goto err_remove_node;



	trace_i915_vma_bind(vma, flags);

	ret = i915_vma_bind(vma, obj->cache_level, flags);

	if (ret)

		goto err_finish_gtt;

		goto err_remove_node;



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

	list_add_tail(&vma->mm_list, &vm->inactive_list);



	return vma;



err_finish_gtt:

	i915_gem_gtt_finish_object(obj);

err_remove_node:

	drm_mm_remove_node(&vma->node);

err_free_vma:

drivers/gpu/drm/i915/i915_gem_context.c

+2 −2
Original line number Diff line number Diff line
@@ -135,8 +135,7 @@ static int get_context_size(struct drm_device *dev) 


void i915_gem_context_free(struct kref *ctx_ref)

{

	struct intel_context *ctx = container_of(ctx_ref,

						 typeof(*ctx), ref);

	struct intel_context *ctx = container_of(ctx_ref, typeof(*ctx), ref);



	trace_i915_context_free(ctx);
@@ -195,6 +194,7 @@ __create_hw_context(struct drm_device *dev, 


	kref_init(&ctx->ref);

	list_add_tail(&ctx->link, &dev_priv->context_list);

	ctx->i915 = dev_priv;



	if (dev_priv->hw_context_size) {

		struct drm_i915_gem_object *obj =

drivers/gpu/drm/i915/i915_gem_dmabuf.c

+0 −2
Original line number Diff line number Diff line
@@ -256,7 +256,6 @@ static int i915_gem_object_get_pages_dmabuf(struct drm_i915_gem_object *obj) 
		return PTR_ERR(sg);



	obj->pages = sg;

	obj->has_dma_mapping = true;

	return 0;

}
@@ -264,7 +263,6 @@ static void i915_gem_object_put_pages_dmabuf(struct drm_i915_gem_object *obj) 
{

	dma_buf_unmap_attachment(obj->base.import_attach,

				 obj->pages, DMA_BIDIRECTIONAL);

	obj->has_dma_mapping = false;

}



static const struct drm_i915_gem_object_ops i915_gem_object_dmabuf_ops = {

drivers/gpu/drm/i915/i915_gem_gtt.c

+2 −7
Original line number Diff line number Diff line
@@ -1723,9 +1723,6 @@ void i915_gem_suspend_gtt_mappings(struct drm_device *dev) 


int i915_gem_gtt_prepare_object(struct drm_i915_gem_object *obj)

{

	if (obj->has_dma_mapping)

		return 0;



	if (!dma_map_sg(&obj->base.dev->pdev->dev,

			obj->pages->sgl, obj->pages->nents,

			PCI_DMA_BIDIRECTIONAL))
@@ -1972,9 +1969,7 @@ void i915_gem_gtt_finish_object(struct drm_i915_gem_object *obj) 


	interruptible = do_idling(dev_priv);



	if (!obj->has_dma_mapping)

		dma_unmap_sg(&dev->pdev->dev,

			     obj->pages->sgl, obj->pages->nents,

	dma_unmap_sg(&dev->pdev->dev, obj->pages->sgl, obj->pages->nents,

		     PCI_DMA_BIDIRECTIONAL);



	undo_idling(dev_priv, interruptible);

CRA Git | Maintained and supported by SUSTech CRA and CCSE