Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 3037 → Rev 3036

/drivers/video/drm/i915/bitmap.c
16,11 → 16,13
extern struct drm_device *main_device;
 
 
 
void __attribute__((regparm(1))) destroy_bitmap(bitmap_t *bitmap)
{
dma_addr_t *pages = bitmap->obj->allocated_pages;
dma_addr_t *pages = bitmap->obj->allocated_pages;;
int i;
 
printf("destroy bitmap %d\n", bitmap->handle);
free_handle(&bm_mm, bitmap->handle);
bitmap->handle = 0;
bitmap->obj->base.read_domains = I915_GEM_DOMAIN_GTT;
27,7 → 29,6
bitmap->obj->base.write_domain = I915_GEM_DOMAIN_CPU;
 
mutex_lock(&main_device->struct_mutex);
 
drm_gem_object_unreference(&bitmap->obj->base);
mutex_unlock(&main_device->struct_mutex);
 
36,8 → 37,6
for (i = 0; i < bitmap->page_count; i++)
FreePage(pages[i]);
 
DRM_DEBUG("%s freec %d pages\n", __FUNCTION__, bitmap->page_count);
 
free(pages);
};
UserFree(bitmap->uaddr);
213,8 → 212,6
bitmap->max_count = max_count;
};
 
DRM_DEBUG("%s alloc %d pages\n", __FUNCTION__, page_count);
 
obj = i915_gem_alloc_object(dev, size);
if (obj == NULL)
goto err4;
246,7 → 243,7
pbitmap->pitch = pitch;
 
 
DRM_DEBUG("%s handle: %d pitch: %d gpu_addr: %x user_addr: %x\n",
printf("%s handle: %d pitch: %d gpu_addr: %x user_addr: %x\n",
__FUNCTION__, handle, pitch, obj->gtt_offset, uaddr);
 
return 0;
285,9 → 282,7
if(unlikely(bitmap==NULL))
return -1;
 
mutex_lock(&main_device->struct_mutex);
ret = i915_gem_object_set_to_cpu_domain(bitmap->obj, true);
mutex_unlock(&main_device->struct_mutex);
 
if(ret != 0 )
{
343,7 → 338,7
 
void __attribute__((regparm(1))) destroy_context(struct context *context)
{
DRM_DEBUG("destroy context %x\n", context);
printf("destroy context %x\n", context);
 
context_map[context->slot] = NULL;
 
370,7 → 365,7
return context;
 
context = CreateObject(GetPid(), sizeof(*context));
 
printf("context %x\n", context);
if( context != NULL)
{
drm_i915_private_t *dev_priv = dev->dev_private;