xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/i915: introduce i915_gem_alloc_object

Browse Source 
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>
This commit is contained in:
Daniel Vetter
2010-04-09 19:05:06 +00:00
committed by Dave Airlie
parent fd632aa34c
commit ac52bc56de
5 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/i915/i915_drv.h
View File

@@ -908,6 +908,8 @@ int i915_gem_get_aperture_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv); struct drm_file *file_priv);
void i915_gem_load(struct drm_device *dev); void i915_gem_load(struct drm_device *dev);
int i915_gem_init_object(struct drm_gem_object *obj); 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); void i915_gem_free_object(struct drm_gem_object *obj);
int i915_gem_object_pin(struct drm_gem_object *obj, uint32_t alignment); int i915_gem_object_pin(struct drm_gem_object *obj, uint32_t alignment);
void i915_gem_object_unpin(struct drm_gem_object *obj); void i915_gem_object_unpin(struct drm_gem_object *obj);

12
drivers/gpu/drm/i915/i915_gem.c
View File

@@ -124,7 +124,7 @@ i915_gem_create_ioctl(struct drm_device *dev, void *data,
args->size = roundup(args->size, PAGE_SIZE); args->size = roundup(args->size, PAGE_SIZE);
/* Allocate the new object */ /* Allocate the new object */
obj = drm_gem_object_alloc(dev, args->size); obj = i915_gem_alloc_object(dev, args->size);
if (obj == NULL) if (obj == NULL)
return -ENOMEM; return -ENOMEM;
@@ -4421,6 +4421,12 @@ i915_gem_madvise_ioctl(struct drm_device *dev, void *data,
return 0; 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) int i915_gem_init_object(struct drm_gem_object *obj)
{ {
struct drm_i915_gem_object *obj_priv; 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)) if (!I915_NEED_GFX_HWS(dev))
return 0; return 0;
obj = drm_gem_object_alloc(dev, 4096); obj = i915_gem_alloc_object(dev, 4096);
if (obj == NULL) { if (obj == NULL) {
DRM_ERROR("Failed to allocate status page\n"); DRM_ERROR("Failed to allocate status page\n");
return -ENOMEM; return -ENOMEM;
@@ -4640,7 +4646,7 @@ i915_gem_init_ringbuffer(struct drm_device *dev)
if (ret != 0) if (ret != 0)
return ret; return ret;
obj = drm_gem_object_alloc(dev, 128 * 1024); obj = i915_gem_alloc_object(dev, 128 * 1024);
if (obj == NULL) { if (obj == NULL) {
DRM_ERROR("Failed to allocate ringbuffer\n"); DRM_ERROR("Failed to allocate ringbuffer\n");
i915_gem_cleanup_hws(dev); i915_gem_cleanup_hws(dev);

2
drivers/gpu/drm/i915/intel_display.c
View File

@@ -4967,7 +4967,7 @@ intel_alloc_power_context(struct drm_device *dev)
struct drm_gem_object *pwrctx; struct drm_gem_object *pwrctx;
int ret; int ret;
pwrctx = drm_gem_object_alloc(dev, 4096); pwrctx = i915_gem_alloc_object(dev, 4096);
if (!pwrctx) { if (!pwrctx) {
DRM_DEBUG("failed to alloc power context, RC6 disabled\n"); DRM_DEBUG("failed to alloc power context, RC6 disabled\n");
return NULL; return NULL;

2
drivers/gpu/drm/i915/intel_fb.c
View File

@@ -88,7 +88,7 @@ static int intelfb_create(struct intel_fbdev *ifbdev,
size = mode_cmd.pitch * mode_cmd.height; size = mode_cmd.pitch * mode_cmd.height;
size = ALIGN(size, PAGE_SIZE); size = ALIGN(size, PAGE_SIZE);
fbo = drm_gem_object_alloc(dev, size); fbo = i915_gem_alloc_object(dev, size);
if (!fbo) { if (!fbo) {
DRM_ERROR("failed to allocate framebuffer\n"); DRM_ERROR("failed to allocate framebuffer\n");
ret = -ENOMEM; ret = -ENOMEM;

2
drivers/gpu/drm/i915/intel_overlay.c
View File

@@ -1341,7 +1341,7 @@ void intel_setup_overlay(struct drm_device *dev)
return; return;
overlay->dev = dev; overlay->dev = dev;
reg_bo = drm_gem_object_alloc(dev, PAGE_SIZE); reg_bo = i915_gem_alloc_object(dev, PAGE_SIZE);
if (!reg_bo) if (!reg_bo)
goto out_free; goto out_free;
overlay->reg_bo = to_intel_bo(reg_bo); overlay->reg_bo = to_intel_bo(reg_bo);