Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 4559 → Rev 4560

/drivers/video/drm/i915/kms_display.c
61,11 → 61,11
u32 mask_seqno;
u32 check_mouse;
u32 check_m_pixel;
 
};
 
 
static display_t *os_display;
struct drm_i915_gem_object *main_fb_obj;
 
u32_t cmd_buffer;
u32_t cmd_offset;
83,6 → 83,7
void disable_mouse(void)
{};
 
 
static char *manufacturer_name(unsigned char *x)
{
static char name[4];
106,7 → 107,6
struct drm_framebuffer *fb = NULL;
struct drm_crtc *crtc;
struct drm_encoder *encoder;
struct drm_i915_gem_object *fb_obj;
struct drm_mode_set set;
const char *con_name;
const char *enc_name;
164,7 → 164,6
if (crtc->invert_dimensions)
swap(hdisplay, vdisplay);
 
fb_obj = get_fb_obj();
fb = fb_helper->fb;
 
fb->width = reqmode->width;
172,7 → 171,7
 
if(dev_priv->mm.bit_6_swizzle_x != I915_BIT_6_SWIZZLE_NONE)
{
fb_obj->tiling_mode = I915_TILING_X;
main_fb_obj->tiling_mode = I915_TILING_X;
 
if(IS_GEN3(dev))
for (stride = 512; stride < reqmode->width * 4; stride <<= 1);
181,7 → 180,7
}
else
{
fb_obj->tiling_mode = I915_TILING_NONE;
main_fb_obj->tiling_mode = I915_TILING_NONE;
stride = ALIGN(reqmode->width * 4, 64);
}
 
190,7 → 189,7
fb->pitches[2] =
fb->pitches[3] = stride;
 
fb_obj->stride = stride;
main_fb_obj->stride = stride;
 
fb->bits_per_pixel = 32;
fb->depth = 24;
199,7 → 198,7
crtc->enabled = true;
os_display->crtc = crtc;
 
i915_gem_object_put_fence(fb_obj);
i915_gem_object_put_fence(main_fb_obj);
 
set.crtc = crtc;
set.x = 0;
931,7 → 930,7
return -EINVAL;
}
 
#if 1
#if 0
if(warn_count < 1000)
{
printf("left %d top %d right %d bottom %d\n",