Deleted Added
full compact
28c28
< __FBSDID("$FreeBSD: head/sys/dev/drm2/i915/intel_fb.c 251961 2013-06-18 20:19:09Z kib $");
---
> __FBSDID("$FreeBSD: head/sys/dev/drm2/i915/intel_fb.c 259016 2013-12-05 22:38:53Z ray $");
44d43
< struct fb_info *info;
45a45
> struct fb_info *info;
88a89,98
> #else
> info = malloc(sizeof(struct fb_info), DRM_MEM_KMS, M_WAITOK | M_ZERO);
> info->fb_size = size;
> info->fb_bpp = sizes->surface_bpp;
> info->fb_width = sizes->fb_width;
> info->fb_height = sizes->fb_height;
> info->fb_pbase = dev->agp->base + obj->gtt_offset;
> info->fb_vbase = (vm_offset_t)pmap_mapdev_attr(info->fb_pbase, size,
> PAT_WRITE_COMBINING);
>
98d107
< #if 0
99a109
> #if 0
138,140c148,149
<
< DRM_DEBUG_KMS("allocated %dx%d fb: 0x%08x, bo %p\n",
< fb->width, fb->height,
---
> DRM_DEBUG_KMS("allocated %dx%d (s %dbits) fb: 0x%08x, bo %p\n",
> fb->width, fb->height, fb->depth,