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

Commit 5ec5b516 authored by Imre Deak's avatar Imre Deak Committed by Daniel Vetter
Browse files

drm/i915: remove unused has_dma_mapping flag 



After the previous patch this flag will check always clear, as it's
never set for shmem backed and userptr objects, so we can remove it.

Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
[danvet: Yeah this isn't really fixes but it's a nice cleanup to
clarify the code but not really worth the hassle of backmerging. So
just add to -fixes, we're still early in -rc.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 101057fa

drivers/gpu/drm/i915/i915_drv.h

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

drivers/gpu/drm/i915/i915_gem.c

+0 −3
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

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);

drivers/gpu/drm/i915/i915_gem_stolen.c

+0 −1
Original line number Diff line number Diff line
@@ -416,7 +416,6 @@ _i915_gem_object_create_stolen(struct drm_device *dev, 
	if (obj->pages == NULL)

		goto cleanup;



	obj->has_dma_mapping = true;

	i915_gem_object_pin_pages(obj);

	obj->stolen = stolen;