Deleted Added
sdiff udiff text old ( 251961 ) new ( 259016 )
full compact
1/*
2 * Copyright �� 2007 David Airlie
3 *
4 * Permission is hereby granted, free of charge, to any person obtaining a
5 * copy of this software and associated documentation files (the "Software"),
6 * to deal in the Software without restriction, including without limitation
7 * the rights to use, copy, modify, merge, publish, distribute, sublicense,
8 * and/or sell copies of the Software, and to permit persons to whom the

--- 11 unchanged lines hidden (view full) ---

20 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21 * DEALINGS IN THE SOFTWARE.
22 *
23 * Authors:
24 * David Airlie
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/dev/drm2/i915/intel_fb.c 251961 2013-06-18 20:19:09Z kib $");
29
30#include <dev/drm2/drmP.h>
31#include <dev/drm2/drm.h>
32#include <dev/drm2/drm_crtc.h>
33#include <dev/drm2/drm_fb_helper.h>
34#include <dev/drm2/i915/i915_drm.h>
35#include <dev/drm2/i915/i915_drv.h>
36#include <dev/drm2/i915/intel_drv.h>
37
38static int intelfb_create(struct intel_fbdev *ifbdev,
39 struct drm_fb_helper_surface_size *sizes)
40{
41 struct drm_device *dev = ifbdev->helper.dev;
42#if 0
43 struct drm_i915_private *dev_priv = dev->dev_private;
44 struct fb_info *info;
45#endif
46 struct drm_framebuffer *fb;
47 struct drm_mode_fb_cmd2 mode_cmd;
48 struct drm_i915_gem_object *obj;
49 int size, ret;
50
51 /* we don't do packed 24bpp */
52 if (sizes->surface_bpp == 24)
53 sizes->surface_bpp = 32;

--- 27 unchanged lines hidden (view full) ---

81#if 0
82 info = framebuffer_alloc(0, device);
83 if (!info) {
84 ret = -ENOMEM;
85 goto out_unpin;
86 }
87
88 info->par = ifbdev;
89#endif
90
91 ret = intel_framebuffer_init(dev, &ifbdev->ifb, &mode_cmd, obj);
92 if (ret)
93 goto out_unpin;
94
95 fb = &ifbdev->ifb.base;
96
97 ifbdev->helper.fb = fb;
98#if 0
99 ifbdev->helper.fbdev = info;
100
101 strcpy(info->fix.id, "inteldrmfb");
102
103 info->flags = FBINFO_DEFAULT | FBINFO_CAN_FORCE_OUTPUT;
104 info->fbops = &intelfb_ops;
105
106 ret = fb_alloc_cmap(&info->cmap, 256, 0);
107 if (ret) {

--- 22 unchanged lines hidden (view full) ---

130
131// memset(info->screen_base, 0, size);
132
133 drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth);
134 drm_fb_helper_fill_var(info, &ifbdev->helper, sizes->fb_width, sizes->fb_height);
135
136 /* Use default scratch pixmap (info->pixmap.flags = FB_PIXMAP_SYSTEM) */
137#endif
138
139 DRM_DEBUG_KMS("allocated %dx%d fb: 0x%08x, bo %p\n",
140 fb->width, fb->height,
141 obj->gtt_offset, obj);
142
143 DRM_UNLOCK(dev);
144#if 1
145 KIB_NOTYET();
146#else
147 vga_switcheroo_client_fb_set(dev->pdev, info);
148#endif

--- 125 unchanged lines hidden ---