Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 6295 → Rev 6296

/drivers/video/drm/i915/kms_display.c
88,7 → 88,7
size = stride * ALIGN(mode->vdisplay, 2);
}
 
dbgprintf("size %x stride %x\n", size, stride);
DRM_DEBUG_KMS("size %x stride %x\n", size, stride);
 
if(intel_fb == NULL || size > intel_fb->obj->base.size)
{
148,6 → 148,20
obj->stride = stride;
};
 
if (obj->base.name == 0)
{
int ret;
 
mutex_lock(&dev->object_name_lock);
idr_preload(GFP_KERNEL);
ret = idr_alloc(&dev->object_name_idr, &obj->base, 1, 0, GFP_NOWAIT);
idr_preload_end();
mutex_unlock(&dev->object_name_lock);
obj->base.name = ret;
obj->base.handle_count++;
DRM_DEBUG_KMS("%s allocate fb name %d\n", __FUNCTION__, obj->base.name );
}
 
fb->width = mode->hdisplay;
fb->height = mode->vdisplay;
 
561,19 → 575,6
return -1;
};
 
/*
mutex_lock(&dev->object_name_lock);
idr_preload(GFP_KERNEL);
if (!main_fb_obj->base.name) {
ret = idr_alloc(&dev->object_name_idr, &main_fb_obj->base, 1, 0, GFP_NOWAIT);
 
main_fb_obj->base.name = ret;
main_fb_obj->base.handle_count++;
DRM_DEBUG_KMS("%s allocate fb name %d\n", __FUNCTION__, main_fb_obj->base.name );
}
idr_preload_end();
mutex_unlock(&dev->object_name_lock);
*/
dummy_fb_page = AllocPage();
 
os_display = GetDisplay();
820,10 → 821,10
fb->pipe = crtc->pipe;
}
safe_sti(ifl);
 
return 0;
}
 
 
int kolibri_framebuffer_init(struct intel_framebuffer *intel_fb)
{
struct kos_framebuffer *kfb;
830,7 → 831,7
addr_t dummy_table;
addr_t *pt_addr = NULL;
int pde;
ENTER();
 
kfb = kzalloc(sizeof(struct kos_framebuffer),0);
kfb->private = intel_fb;
 
845,7 → 846,7
};
 
intel_fb->private = kfb;
LEAVE();
 
return 0;
#if 0
struct sg_page_iter sg_iter;