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

Commit ac52bc56 authored by Daniel Vetter's avatar Daniel Vetter Committed by Dave Airlie
Browse files

drm/i915: introduce i915_gem_alloc_object 



Just preparation, no functional change.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent fd632aa3

drivers/gpu/drm/i915/i915_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -908,6 +908,8 @@ int i915_gem_get_aperture_ioctl(struct drm_device *dev, void *data, 
				struct drm_file *file_priv);

void i915_gem_load(struct drm_device *dev);

int i915_gem_init_object(struct drm_gem_object *obj);

struct drm_gem_object * i915_gem_alloc_object(struct drm_device *dev,

					      size_t size);

void i915_gem_free_object(struct drm_gem_object *obj);

int i915_gem_object_pin(struct drm_gem_object *obj, uint32_t alignment);

void i915_gem_object_unpin(struct drm_gem_object *obj);

drivers/gpu/drm/i915/i915_gem.c

+9 −3
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ i915_gem_create_ioctl(struct drm_device *dev, void *data, 
	args->size = roundup(args->size, PAGE_SIZE);



	/* Allocate the new object */

	obj = drm_gem_object_alloc(dev, args->size);

	obj = i915_gem_alloc_object(dev, args->size);

	if (obj == NULL)

		return -ENOMEM;
@@ -4421,6 +4421,12 @@ i915_gem_madvise_ioctl(struct drm_device *dev, void *data, 
	return 0;

}



struct drm_gem_object * i915_gem_alloc_object(struct drm_device *dev,

					      size_t size)

{

	return drm_gem_object_alloc(dev, size);

}



int i915_gem_init_object(struct drm_gem_object *obj)

{

	struct drm_i915_gem_object *obj_priv;
@@ -4563,7 +4569,7 @@ i915_gem_init_hws(struct drm_device *dev) 
	if (!I915_NEED_GFX_HWS(dev))

		return 0;



	obj = drm_gem_object_alloc(dev, 4096);

	obj = i915_gem_alloc_object(dev, 4096);

	if (obj == NULL) {

		DRM_ERROR("Failed to allocate status page\n");

		return -ENOMEM;
@@ -4640,7 +4646,7 @@ i915_gem_init_ringbuffer(struct drm_device *dev) 
	if (ret != 0)

		return ret;



	obj = drm_gem_object_alloc(dev, 128 * 1024);

	obj = i915_gem_alloc_object(dev, 128 * 1024);

	if (obj == NULL) {

		DRM_ERROR("Failed to allocate ringbuffer\n");

		i915_gem_cleanup_hws(dev);

drivers/gpu/drm/i915/intel_display.c

+1 −1
Original line number Diff line number Diff line
@@ -4967,7 +4967,7 @@ intel_alloc_power_context(struct drm_device *dev) 
	struct drm_gem_object *pwrctx;

	int ret;



	pwrctx = drm_gem_object_alloc(dev, 4096);

	pwrctx = i915_gem_alloc_object(dev, 4096);

	if (!pwrctx) {

		DRM_DEBUG("failed to alloc power context, RC6 disabled\n");

		return NULL;

drivers/gpu/drm/i915/intel_fb.c

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static int intelfb_create(struct intel_fbdev *ifbdev, 


	size = mode_cmd.pitch * mode_cmd.height;

	size = ALIGN(size, PAGE_SIZE);

	fbo = drm_gem_object_alloc(dev, size);

	fbo = i915_gem_alloc_object(dev, size);

	if (!fbo) {

		DRM_ERROR("failed to allocate framebuffer\n");

		ret = -ENOMEM;

drivers/gpu/drm/i915/intel_overlay.c

+1 −1
Original line number Diff line number Diff line
@@ -1341,7 +1341,7 @@ void intel_setup_overlay(struct drm_device *dev) 
		return;

	overlay->dev = dev;



	reg_bo = drm_gem_object_alloc(dev, PAGE_SIZE);

	reg_bo = i915_gem_alloc_object(dev, PAGE_SIZE);

	if (!reg_bo)

		goto out_free;

	overlay->reg_bo = to_intel_bo(reg_bo);