drm/i915: introduce i915_gem_alloc_object

Just preparation, no functional change.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 1258b1119d93303ef4aa3111de5ef5430b697603..6b931b8750aaeebd8b760dc5c0f13fc10d7a269f 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -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);

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index d4ea90999f675b93c22a4559d4e73dbc1569c78e..92dd52216825dbe485bee3a44272cc34361dd239 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -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);

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 2f5f74160cbfa195389f324eaf19a77dd32d1fa6..3836f56e842c8df6ab92c6f66abd3bfa1fbcf5c3 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -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;

diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c
index 34ad0333eaefbb1dc33874bfc07250097c31e6c9..b04e0a86bf9af6ddc3e5096a7377c5eb5fa7a0b0 100644 (file)
--- a/drivers/gpu/drm/i915/intel_fb.c
+++ b/drivers/gpu/drm/i915/intel_fb.c
@@ -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;

diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
index 6d524a1fc271331939c0e3625e75e08e45376d61..bc3721af855c084d7e3c10d437a8e20e5f5bb814 100644 (file)
--- a/drivers/gpu/drm/i915/intel_overlay.c
+++ b/drivers/gpu/drm/i915/intel_overlay.c
@@ -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);