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

Commit 187685cb authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

drm/i915: Make GEM object alloc/free and stolen created take dev_priv 



Where it is more appropriate and also to be consistent with
the direction of the driver.

v2: Leave out object alloc/free inlining. (Joonas Lahtinen)

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
parent 908764f6

drivers/gpu/drm/i915/i915_drv.h

+3 −3
Original line number Diff line number Diff line
@@ -2981,7 +2981,7 @@ void i915_gem_load_init_fences(struct drm_i915_private *dev_priv); 
int i915_gem_freeze(struct drm_i915_private *dev_priv);

int i915_gem_freeze_late(struct drm_i915_private *dev_priv);



void *i915_gem_object_alloc(struct drm_device *dev);

void *i915_gem_object_alloc(struct drm_i915_private *dev_priv);

void i915_gem_object_free(struct drm_i915_gem_object *obj);

void i915_gem_object_init(struct drm_i915_gem_object *obj,

			 const struct drm_i915_gem_object_ops *ops);
@@ -3366,9 +3366,9 @@ void i915_gem_stolen_remove_node(struct drm_i915_private *dev_priv, 
int i915_gem_init_stolen(struct drm_i915_private *dev_priv);

void i915_gem_cleanup_stolen(struct drm_device *dev);

struct drm_i915_gem_object *

i915_gem_object_create_stolen(struct drm_device *dev, u32 size);

i915_gem_object_create_stolen(struct drm_i915_private *dev_priv, u32 size);

struct drm_i915_gem_object *

i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev,

i915_gem_object_create_stolen_for_preallocated(struct drm_i915_private *dev_priv,

					       u32 stolen_offset,

					       u32 gtt_offset,

					       u32 size);

drivers/gpu/drm/i915/i915_gem.c

+2 −3
Original line number Diff line number Diff line
@@ -622,9 +622,8 @@ i915_gem_phys_pwrite(struct drm_i915_gem_object *obj, 
	return ret;

}



void *i915_gem_object_alloc(struct drm_device *dev)

void *i915_gem_object_alloc(struct drm_i915_private *dev_priv)

{

	struct drm_i915_private *dev_priv = to_i915(dev);

	return kmem_cache_zalloc(dev_priv->objects, GFP_KERNEL);

}
@@ -3990,7 +3989,7 @@ i915_gem_object_create(struct drm_device *dev, u64 size) 
	if (overflows_type(size, obj->base.size))

		return ERR_PTR(-E2BIG);



	obj = i915_gem_object_alloc(dev);

	obj = i915_gem_object_alloc(dev_priv);

	if (obj == NULL)

		return ERR_PTR(-ENOMEM);

drivers/gpu/drm/i915/i915_gem_dmabuf.c

+1 −1
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ struct drm_gem_object *i915_gem_prime_import(struct drm_device *dev, 


	get_dma_buf(dma_buf);



	obj = i915_gem_object_alloc(dev);

	obj = i915_gem_object_alloc(to_i915(dev));

	if (obj == NULL) {

		ret = -ENOMEM;

		goto fail_detach;

drivers/gpu/drm/i915/i915_gem_internal.c

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ i915_gem_object_create_internal(struct drm_i915_private *i915, 
{

	struct drm_i915_gem_object *obj;



	obj = i915_gem_object_alloc(&i915->drm);

	obj = i915_gem_object_alloc(i915);

	if (!obj)

		return ERR_PTR(-ENOMEM);

drivers/gpu/drm/i915/i915_gem_stolen.c

+9 −12
Original line number Diff line number Diff line
@@ -579,22 +579,21 @@ static const struct drm_i915_gem_object_ops i915_gem_object_stolen_ops = { 
};



static struct drm_i915_gem_object *

_i915_gem_object_create_stolen(struct drm_device *dev,

_i915_gem_object_create_stolen(struct drm_i915_private *dev_priv,

			       struct drm_mm_node *stolen)

{

	struct drm_i915_gem_object *obj;



	obj = i915_gem_object_alloc(dev);

	obj = i915_gem_object_alloc(dev_priv);

	if (obj == NULL)

		return NULL;



	drm_gem_private_object_init(dev, &obj->base, stolen->size);

	drm_gem_private_object_init(&dev_priv->drm, &obj->base, stolen->size);

	i915_gem_object_init(obj, &i915_gem_object_stolen_ops);



	obj->stolen = stolen;

	obj->base.read_domains = I915_GEM_DOMAIN_CPU | I915_GEM_DOMAIN_GTT;

	obj->cache_level = HAS_LLC(to_i915(dev)) ?

			   I915_CACHE_LLC : I915_CACHE_NONE;

	obj->cache_level = HAS_LLC(dev_priv) ? I915_CACHE_LLC : I915_CACHE_NONE;



	if (i915_gem_object_pin_pages(obj))

		goto cleanup;
@@ -607,9 +606,8 @@ _i915_gem_object_create_stolen(struct drm_device *dev, 
}



struct drm_i915_gem_object *

i915_gem_object_create_stolen(struct drm_device *dev, u32 size)

i915_gem_object_create_stolen(struct drm_i915_private *dev_priv, u32 size)

{

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct drm_i915_gem_object *obj;

	struct drm_mm_node *stolen;

	int ret;
@@ -630,7 +628,7 @@ i915_gem_object_create_stolen(struct drm_device *dev, u32 size) 
		return NULL;

	}



	obj = _i915_gem_object_create_stolen(dev, stolen);

	obj = _i915_gem_object_create_stolen(dev_priv, stolen);

	if (obj)

		return obj;
@@ -640,12 +638,11 @@ i915_gem_object_create_stolen(struct drm_device *dev, u32 size) 
}



struct drm_i915_gem_object *

i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev,

i915_gem_object_create_stolen_for_preallocated(struct drm_i915_private *dev_priv,

					       u32 stolen_offset,

					       u32 gtt_offset,

					       u32 size)

{

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct i915_ggtt *ggtt = &dev_priv->ggtt;

	struct drm_i915_gem_object *obj;

	struct drm_mm_node *stolen;
@@ -655,7 +652,7 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev, 
	if (!drm_mm_initialized(&dev_priv->mm.stolen))

		return NULL;



	lockdep_assert_held(&dev->struct_mutex);

	lockdep_assert_held(&dev_priv->drm.struct_mutex);



	DRM_DEBUG_KMS("creating preallocated stolen object: stolen_offset=%x, gtt_offset=%x, size=%x\n",

			stolen_offset, gtt_offset, size);
@@ -680,7 +677,7 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev, 
		return NULL;

	}



	obj = _i915_gem_object_create_stolen(dev, stolen);

	obj = _i915_gem_object_create_stolen(dev_priv, stolen);

	if (obj == NULL) {

		DRM_DEBUG_KMS("failed to allocate stolen object\n");

		i915_gem_stolen_remove_node(dev_priv, stolen);