diff options
author | Dave Airlie <airlied@redhat.com> | 2009-08-28 01:46:53 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-08-30 19:09:31 -0400 |
commit | 785b93ef8c309730c2de84ce9c229e40e2d01480 (patch) | |
tree | ea1b26781fc49cef92d439fdaffa41af8c165778 /drivers/gpu/drm/i915 | |
parent | 7dc482dfeeeefcfd000d4271c4626937406756d7 (diff) |
drm/kms: move driver specific fb common code to helper functions (v2)
Initially I always meant this code to be shared, but things
ran away from me before I got to it.
This refactors the i915 and radeon kms fbdev interaction layers
out into generic helpers + driver specific pieces.
It moves all the panic/sysrq enhancements to the core file,
and stores a linked list of kernel fbs. This could possibly be
improved to only store the fb which has fbcon on it for panics
etc.
radeon retains some specific codes used for a big endian
workaround.
changes:
fix oops in v1
fix freeing path for crtc_info
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/i915')
-rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 12 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_fb.c | 737 |
4 files changed, 30 insertions, 725 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 544d889b9b16..c628c3671394 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include "drmP.h" | 29 | #include "drmP.h" |
30 | #include "drm.h" | 30 | #include "drm.h" |
31 | #include "drm_crtc_helper.h" | 31 | #include "drm_crtc_helper.h" |
32 | #include "drm_fb_helper.h" | ||
32 | #include "intel_drv.h" | 33 | #include "intel_drv.h" |
33 | #include "i915_drm.h" | 34 | #include "i915_drm.h" |
34 | #include "i915_drv.h" | 35 | #include "i915_drv.h" |
@@ -1347,7 +1348,7 @@ void i915_driver_lastclose(struct drm_device * dev) | |||
1347 | drm_i915_private_t *dev_priv = dev->dev_private; | 1348 | drm_i915_private_t *dev_priv = dev->dev_private; |
1348 | 1349 | ||
1349 | if (!dev_priv || drm_core_check_feature(dev, DRIVER_MODESET)) { | 1350 | if (!dev_priv || drm_core_check_feature(dev, DRIVER_MODESET)) { |
1350 | intelfb_restore(); | 1351 | drm_fb_helper_restore(); |
1351 | return; | 1352 | return; |
1352 | } | 1353 | } |
1353 | 1354 | ||
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index d6fce2133413..5fb7a4f4a427 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -3060,8 +3060,6 @@ static void intel_crtc_destroy(struct drm_crtc *crtc) | |||
3060 | { | 3060 | { |
3061 | struct intel_crtc *intel_crtc = to_intel_crtc(crtc); | 3061 | struct intel_crtc *intel_crtc = to_intel_crtc(crtc); |
3062 | 3062 | ||
3063 | if (intel_crtc->mode_set.mode) | ||
3064 | drm_mode_destroy(crtc->dev, intel_crtc->mode_set.mode); | ||
3065 | drm_crtc_cleanup(crtc); | 3063 | drm_crtc_cleanup(crtc); |
3066 | kfree(intel_crtc); | 3064 | kfree(intel_crtc); |
3067 | } | 3065 | } |
@@ -3107,16 +3105,6 @@ static void intel_crtc_init(struct drm_device *dev, int pipe) | |||
3107 | intel_crtc->cursor_addr = 0; | 3105 | intel_crtc->cursor_addr = 0; |
3108 | intel_crtc->dpms_mode = DRM_MODE_DPMS_OFF; | 3106 | intel_crtc->dpms_mode = DRM_MODE_DPMS_OFF; |
3109 | drm_crtc_helper_add(&intel_crtc->base, &intel_helper_funcs); | 3107 | drm_crtc_helper_add(&intel_crtc->base, &intel_helper_funcs); |
3110 | |||
3111 | intel_crtc->mode_set.crtc = &intel_crtc->base; | ||
3112 | intel_crtc->mode_set.connectors = (struct drm_connector **)(intel_crtc + 1); | ||
3113 | intel_crtc->mode_set.num_connectors = 0; | ||
3114 | |||
3115 | if (i915_fbpercrtc) { | ||
3116 | |||
3117 | |||
3118 | |||
3119 | } | ||
3120 | } | 3108 | } |
3121 | 3109 | ||
3122 | int intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data, | 3110 | int intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data, |
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index d6f92ea1b553..38910f8f30ed 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h | |||
@@ -96,9 +96,6 @@ struct intel_crtc { | |||
96 | uint32_t cursor_addr; | 96 | uint32_t cursor_addr; |
97 | u8 lut_r[256], lut_g[256], lut_b[256]; | 97 | u8 lut_r[256], lut_g[256], lut_b[256]; |
98 | int dpms_mode; | 98 | int dpms_mode; |
99 | struct intel_framebuffer *fbdev_fb; | ||
100 | /* a mode_set for fbdev users on this crtc */ | ||
101 | struct drm_mode_set mode_set; | ||
102 | }; | 99 | }; |
103 | 100 | ||
104 | #define to_intel_crtc(x) container_of(x, struct intel_crtc, base) | 101 | #define to_intel_crtc(x) container_of(x, struct intel_crtc, base) |
diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c index 1d30802e773e..3041530c3673 100644 --- a/drivers/gpu/drm/i915/intel_fb.c +++ b/drivers/gpu/drm/i915/intel_fb.c | |||
@@ -39,339 +39,34 @@ | |||
39 | #include "drmP.h" | 39 | #include "drmP.h" |
40 | #include "drm.h" | 40 | #include "drm.h" |
41 | #include "drm_crtc.h" | 41 | #include "drm_crtc.h" |
42 | #include "drm_fb_helper.h" | ||
42 | #include "intel_drv.h" | 43 | #include "intel_drv.h" |
43 | #include "i915_drm.h" | 44 | #include "i915_drm.h" |
44 | #include "i915_drv.h" | 45 | #include "i915_drv.h" |
45 | 46 | ||
46 | struct intelfb_par { | 47 | struct intelfb_par { |
47 | struct drm_device *dev; | 48 | struct drm_fb_helper helper; |
48 | struct drm_display_mode *our_mode; | ||
49 | struct intel_framebuffer *intel_fb; | 49 | struct intel_framebuffer *intel_fb; |
50 | int crtc_count; | 50 | struct drm_display_mode *our_mode; |
51 | /* crtc currently bound to this */ | ||
52 | uint32_t crtc_ids[2]; | ||
53 | }; | 51 | }; |
54 | 52 | ||
55 | static int intelfb_setcolreg(unsigned regno, unsigned red, unsigned green, | ||
56 | unsigned blue, unsigned transp, | ||
57 | struct fb_info *info) | ||
58 | { | ||
59 | struct intelfb_par *par = info->par; | ||
60 | struct drm_device *dev = par->dev; | ||
61 | struct drm_crtc *crtc; | ||
62 | int i; | ||
63 | |||
64 | list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { | ||
65 | struct intel_crtc *intel_crtc = to_intel_crtc(crtc); | ||
66 | struct drm_mode_set *modeset = &intel_crtc->mode_set; | ||
67 | struct drm_framebuffer *fb = modeset->fb; | ||
68 | |||
69 | for (i = 0; i < par->crtc_count; i++) | ||
70 | if (crtc->base.id == par->crtc_ids[i]) | ||
71 | break; | ||
72 | |||
73 | if (i == par->crtc_count) | ||
74 | continue; | ||
75 | |||
76 | |||
77 | if (regno > 255) | ||
78 | return 1; | ||
79 | |||
80 | if (fb->depth == 8) { | ||
81 | intel_crtc_fb_gamma_set(crtc, red, green, blue, regno); | ||
82 | return 0; | ||
83 | } | ||
84 | |||
85 | if (regno < 16) { | ||
86 | switch (fb->depth) { | ||
87 | case 15: | ||
88 | fb->pseudo_palette[regno] = ((red & 0xf800) >> 1) | | ||
89 | ((green & 0xf800) >> 6) | | ||
90 | ((blue & 0xf800) >> 11); | ||
91 | break; | ||
92 | case 16: | ||
93 | fb->pseudo_palette[regno] = (red & 0xf800) | | ||
94 | ((green & 0xfc00) >> 5) | | ||
95 | ((blue & 0xf800) >> 11); | ||
96 | break; | ||
97 | case 24: | ||
98 | case 32: | ||
99 | fb->pseudo_palette[regno] = ((red & 0xff00) << 8) | | ||
100 | (green & 0xff00) | | ||
101 | ((blue & 0xff00) >> 8); | ||
102 | break; | ||
103 | } | ||
104 | } | ||
105 | } | ||
106 | return 0; | ||
107 | } | ||
108 | |||
109 | static int intelfb_check_var(struct fb_var_screeninfo *var, | ||
110 | struct fb_info *info) | ||
111 | { | ||
112 | struct intelfb_par *par = info->par; | ||
113 | struct intel_framebuffer *intel_fb = par->intel_fb; | ||
114 | struct drm_framebuffer *fb = &intel_fb->base; | ||
115 | int depth; | ||
116 | |||
117 | if (var->pixclock == -1 || !var->pixclock) | ||
118 | return -EINVAL; | ||
119 | |||
120 | /* Need to resize the fb object !!! */ | ||
121 | if (var->xres > fb->width || var->yres > fb->height) { | ||
122 | DRM_ERROR("Requested width/height is greater than current fb object %dx%d > %dx%d\n",var->xres,var->yres,fb->width,fb->height); | ||
123 | DRM_ERROR("Need resizing code.\n"); | ||
124 | return -EINVAL; | ||
125 | } | ||
126 | |||
127 | switch (var->bits_per_pixel) { | ||
128 | case 16: | ||
129 | depth = (var->green.length == 6) ? 16 : 15; | ||
130 | break; | ||
131 | case 32: | ||
132 | depth = (var->transp.length > 0) ? 32 : 24; | ||
133 | break; | ||
134 | default: | ||
135 | depth = var->bits_per_pixel; | ||
136 | break; | ||
137 | } | ||
138 | |||
139 | switch (depth) { | ||
140 | case 8: | ||
141 | var->red.offset = 0; | ||
142 | var->green.offset = 0; | ||
143 | var->blue.offset = 0; | ||
144 | var->red.length = 8; | ||
145 | var->green.length = 8; | ||
146 | var->blue.length = 8; | ||
147 | var->transp.length = 0; | ||
148 | var->transp.offset = 0; | ||
149 | break; | ||
150 | case 15: | ||
151 | var->red.offset = 10; | ||
152 | var->green.offset = 5; | ||
153 | var->blue.offset = 0; | ||
154 | var->red.length = 5; | ||
155 | var->green.length = 5; | ||
156 | var->blue.length = 5; | ||
157 | var->transp.length = 1; | ||
158 | var->transp.offset = 15; | ||
159 | break; | ||
160 | case 16: | ||
161 | var->red.offset = 11; | ||
162 | var->green.offset = 5; | ||
163 | var->blue.offset = 0; | ||
164 | var->red.length = 5; | ||
165 | var->green.length = 6; | ||
166 | var->blue.length = 5; | ||
167 | var->transp.length = 0; | ||
168 | var->transp.offset = 0; | ||
169 | break; | ||
170 | case 24: | ||
171 | var->red.offset = 16; | ||
172 | var->green.offset = 8; | ||
173 | var->blue.offset = 0; | ||
174 | var->red.length = 8; | ||
175 | var->green.length = 8; | ||
176 | var->blue.length = 8; | ||
177 | var->transp.length = 0; | ||
178 | var->transp.offset = 0; | ||
179 | break; | ||
180 | case 32: | ||
181 | var->red.offset = 16; | ||
182 | var->green.offset = 8; | ||
183 | var->blue.offset = 0; | ||
184 | var->red.length = 8; | ||
185 | var->green.length = 8; | ||
186 | var->blue.length = 8; | ||
187 | var->transp.length = 8; | ||
188 | var->transp.offset = 24; | ||
189 | break; | ||
190 | default: | ||
191 | return -EINVAL; | ||
192 | } | ||
193 | |||
194 | return 0; | ||
195 | } | ||
196 | |||
197 | /* this will let fbcon do the mode init */ | ||
198 | /* FIXME: take mode config lock? */ | ||
199 | static int intelfb_set_par(struct fb_info *info) | ||
200 | { | ||
201 | struct intelfb_par *par = info->par; | ||
202 | struct drm_device *dev = par->dev; | ||
203 | struct fb_var_screeninfo *var = &info->var; | ||
204 | int i; | ||
205 | |||
206 | DRM_DEBUG("%d %d\n", var->xres, var->pixclock); | ||
207 | |||
208 | if (var->pixclock != -1) { | ||
209 | |||
210 | DRM_ERROR("PIXEL CLOCK SET\n"); | ||
211 | return -EINVAL; | ||
212 | } else { | ||
213 | struct drm_crtc *crtc; | ||
214 | int ret; | ||
215 | |||
216 | list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { | ||
217 | struct intel_crtc *intel_crtc = to_intel_crtc(crtc); | ||
218 | |||
219 | for (i = 0; i < par->crtc_count; i++) | ||
220 | if (crtc->base.id == par->crtc_ids[i]) | ||
221 | break; | ||
222 | |||
223 | if (i == par->crtc_count) | ||
224 | continue; | ||
225 | |||
226 | if (crtc->fb == intel_crtc->mode_set.fb) { | ||
227 | mutex_lock(&dev->mode_config.mutex); | ||
228 | ret = crtc->funcs->set_config(&intel_crtc->mode_set); | ||
229 | mutex_unlock(&dev->mode_config.mutex); | ||
230 | if (ret) | ||
231 | return ret; | ||
232 | } | ||
233 | } | ||
234 | return 0; | ||
235 | } | ||
236 | } | ||
237 | |||
238 | static int intelfb_pan_display(struct fb_var_screeninfo *var, | ||
239 | struct fb_info *info) | ||
240 | { | ||
241 | struct intelfb_par *par = info->par; | ||
242 | struct drm_device *dev = par->dev; | ||
243 | struct drm_mode_set *modeset; | ||
244 | struct drm_crtc *crtc; | ||
245 | struct intel_crtc *intel_crtc; | ||
246 | int ret = 0; | ||
247 | int i; | ||
248 | |||
249 | list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { | ||
250 | for (i = 0; i < par->crtc_count; i++) | ||
251 | if (crtc->base.id == par->crtc_ids[i]) | ||
252 | break; | ||
253 | |||
254 | if (i == par->crtc_count) | ||
255 | continue; | ||
256 | |||
257 | intel_crtc = to_intel_crtc(crtc); | ||
258 | modeset = &intel_crtc->mode_set; | ||
259 | |||
260 | modeset->x = var->xoffset; | ||
261 | modeset->y = var->yoffset; | ||
262 | |||
263 | if (modeset->num_connectors) { | ||
264 | mutex_lock(&dev->mode_config.mutex); | ||
265 | ret = crtc->funcs->set_config(modeset); | ||
266 | mutex_unlock(&dev->mode_config.mutex); | ||
267 | if (!ret) { | ||
268 | info->var.xoffset = var->xoffset; | ||
269 | info->var.yoffset = var->yoffset; | ||
270 | } | ||
271 | } | ||
272 | } | ||
273 | |||
274 | return ret; | ||
275 | } | ||
276 | |||
277 | static void intelfb_on(struct fb_info *info) | ||
278 | { | ||
279 | struct intelfb_par *par = info->par; | ||
280 | struct drm_device *dev = par->dev; | ||
281 | struct drm_crtc *crtc; | ||
282 | struct drm_encoder *encoder; | ||
283 | int i; | ||
284 | |||
285 | /* | ||
286 | * For each CRTC in this fb, find all associated encoders | ||
287 | * and turn them off, then turn off the CRTC. | ||
288 | */ | ||
289 | list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { | ||
290 | struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; | ||
291 | |||
292 | for (i = 0; i < par->crtc_count; i++) | ||
293 | if (crtc->base.id == par->crtc_ids[i]) | ||
294 | break; | ||
295 | |||
296 | crtc_funcs->dpms(crtc, DRM_MODE_DPMS_ON); | ||
297 | |||
298 | /* Found a CRTC on this fb, now find encoders */ | ||
299 | list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) { | ||
300 | if (encoder->crtc == crtc) { | ||
301 | struct drm_encoder_helper_funcs *encoder_funcs; | ||
302 | encoder_funcs = encoder->helper_private; | ||
303 | encoder_funcs->dpms(encoder, DRM_MODE_DPMS_ON); | ||
304 | } | ||
305 | } | ||
306 | } | ||
307 | } | ||
308 | |||
309 | static void intelfb_off(struct fb_info *info, int dpms_mode) | ||
310 | { | ||
311 | struct intelfb_par *par = info->par; | ||
312 | struct drm_device *dev = par->dev; | ||
313 | struct drm_crtc *crtc; | ||
314 | struct drm_encoder *encoder; | ||
315 | int i; | ||
316 | |||
317 | /* | ||
318 | * For each CRTC in this fb, find all associated encoders | ||
319 | * and turn them off, then turn off the CRTC. | ||
320 | */ | ||
321 | list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { | ||
322 | struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; | ||
323 | |||
324 | for (i = 0; i < par->crtc_count; i++) | ||
325 | if (crtc->base.id == par->crtc_ids[i]) | ||
326 | break; | ||
327 | |||
328 | /* Found a CRTC on this fb, now find encoders */ | ||
329 | list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) { | ||
330 | if (encoder->crtc == crtc) { | ||
331 | struct drm_encoder_helper_funcs *encoder_funcs; | ||
332 | encoder_funcs = encoder->helper_private; | ||
333 | encoder_funcs->dpms(encoder, dpms_mode); | ||
334 | } | ||
335 | } | ||
336 | if (dpms_mode == DRM_MODE_DPMS_OFF) | ||
337 | crtc_funcs->dpms(crtc, dpms_mode); | ||
338 | } | ||
339 | } | ||
340 | |||
341 | static int intelfb_blank(int blank, struct fb_info *info) | ||
342 | { | ||
343 | switch (blank) { | ||
344 | case FB_BLANK_UNBLANK: | ||
345 | intelfb_on(info); | ||
346 | break; | ||
347 | case FB_BLANK_NORMAL: | ||
348 | intelfb_off(info, DRM_MODE_DPMS_STANDBY); | ||
349 | break; | ||
350 | case FB_BLANK_HSYNC_SUSPEND: | ||
351 | intelfb_off(info, DRM_MODE_DPMS_STANDBY); | ||
352 | break; | ||
353 | case FB_BLANK_VSYNC_SUSPEND: | ||
354 | intelfb_off(info, DRM_MODE_DPMS_SUSPEND); | ||
355 | break; | ||
356 | case FB_BLANK_POWERDOWN: | ||
357 | intelfb_off(info, DRM_MODE_DPMS_OFF); | ||
358 | break; | ||
359 | } | ||
360 | return 0; | ||
361 | } | ||
362 | |||
363 | static struct fb_ops intelfb_ops = { | 53 | static struct fb_ops intelfb_ops = { |
364 | .owner = THIS_MODULE, | 54 | .owner = THIS_MODULE, |
365 | .fb_check_var = intelfb_check_var, | 55 | .fb_check_var = drm_fb_helper_check_var, |
366 | .fb_set_par = intelfb_set_par, | 56 | .fb_set_par = drm_fb_helper_set_par, |
367 | .fb_setcolreg = intelfb_setcolreg, | 57 | .fb_setcolreg = drm_fb_helper_setcolreg, |
368 | .fb_fillrect = cfb_fillrect, | 58 | .fb_fillrect = cfb_fillrect, |
369 | .fb_copyarea = cfb_copyarea, | 59 | .fb_copyarea = cfb_copyarea, |
370 | .fb_imageblit = cfb_imageblit, | 60 | .fb_imageblit = cfb_imageblit, |
371 | .fb_pan_display = intelfb_pan_display, | 61 | .fb_pan_display = drm_fb_helper_pan_display, |
372 | .fb_blank = intelfb_blank, | 62 | .fb_blank = drm_fb_helper_blank, |
373 | }; | 63 | }; |
374 | 64 | ||
65 | static struct drm_fb_helper_funcs intel_fb_helper_funcs = { | ||
66 | .gamma_set = intel_crtc_fb_gamma_set, | ||
67 | }; | ||
68 | |||
69 | |||
375 | /** | 70 | /** |
376 | * Curretly it is assumed that the old framebuffer is reused. | 71 | * Curretly it is assumed that the old framebuffer is reused. |
377 | * | 72 | * |
@@ -412,25 +107,10 @@ int intelfb_resize(struct drm_device *dev, struct drm_crtc *crtc) | |||
412 | } | 107 | } |
413 | EXPORT_SYMBOL(intelfb_resize); | 108 | EXPORT_SYMBOL(intelfb_resize); |
414 | 109 | ||
415 | static struct drm_mode_set kernelfb_mode; | ||
416 | |||
417 | static int intelfb_panic(struct notifier_block *n, unsigned long ununsed, | ||
418 | void *panic_str) | ||
419 | { | ||
420 | DRM_ERROR("panic occurred, switching back to text console\n"); | ||
421 | |||
422 | intelfb_restore(); | ||
423 | return 0; | ||
424 | } | ||
425 | |||
426 | static struct notifier_block paniced = { | ||
427 | .notifier_call = intelfb_panic, | ||
428 | }; | ||
429 | |||
430 | static int intelfb_create(struct drm_device *dev, uint32_t fb_width, | 110 | static int intelfb_create(struct drm_device *dev, uint32_t fb_width, |
431 | uint32_t fb_height, uint32_t surface_width, | 111 | uint32_t fb_height, uint32_t surface_width, |
432 | uint32_t surface_height, | 112 | uint32_t surface_height, |
433 | struct intel_framebuffer **intel_fb_p) | 113 | struct drm_framebuffer **fb_p) |
434 | { | 114 | { |
435 | struct fb_info *info; | 115 | struct fb_info *info; |
436 | struct intelfb_par *par; | 116 | struct intelfb_par *par; |
@@ -479,7 +159,7 @@ static int intelfb_create(struct drm_device *dev, uint32_t fb_width, | |||
479 | list_add(&fb->filp_head, &dev->mode_config.fb_kernel_list); | 159 | list_add(&fb->filp_head, &dev->mode_config.fb_kernel_list); |
480 | 160 | ||
481 | intel_fb = to_intel_framebuffer(fb); | 161 | intel_fb = to_intel_framebuffer(fb); |
482 | *intel_fb_p = intel_fb; | 162 | *fb_p = fb; |
483 | 163 | ||
484 | info = framebuffer_alloc(sizeof(struct intelfb_par), device); | 164 | info = framebuffer_alloc(sizeof(struct intelfb_par), device); |
485 | if (!info) { | 165 | if (!info) { |
@@ -489,21 +169,19 @@ static int intelfb_create(struct drm_device *dev, uint32_t fb_width, | |||
489 | 169 | ||
490 | par = info->par; | 170 | par = info->par; |
491 | 171 | ||
172 | par->helper.funcs = &intel_fb_helper_funcs; | ||
173 | par->helper.dev = dev; | ||
174 | ret = drm_fb_helper_init_crtc_count(&par->helper, 2, | ||
175 | INTELFB_CONN_LIMIT); | ||
176 | if (ret) | ||
177 | goto out_unref; | ||
178 | |||
492 | strcpy(info->fix.id, "inteldrmfb"); | 179 | strcpy(info->fix.id, "inteldrmfb"); |
493 | info->fix.type = FB_TYPE_PACKED_PIXELS; | ||
494 | info->fix.visual = FB_VISUAL_TRUECOLOR; | ||
495 | info->fix.type_aux = 0; | ||
496 | info->fix.xpanstep = 1; /* doing it in hw */ | ||
497 | info->fix.ypanstep = 1; /* doing it in hw */ | ||
498 | info->fix.ywrapstep = 0; | ||
499 | info->fix.accel = FB_ACCEL_I830; | ||
500 | info->fix.type_aux = 0; | ||
501 | 180 | ||
502 | info->flags = FBINFO_DEFAULT; | 181 | info->flags = FBINFO_DEFAULT; |
503 | 182 | ||
504 | info->fbops = &intelfb_ops; | 183 | info->fbops = &intelfb_ops; |
505 | 184 | ||
506 | info->fix.line_length = fb->pitch; | ||
507 | 185 | ||
508 | /* setup aperture base/size for vesafb takeover */ | 186 | /* setup aperture base/size for vesafb takeover */ |
509 | info->aperture_base = dev->mode_config.fb_base; | 187 | info->aperture_base = dev->mode_config.fb_base; |
@@ -527,18 +205,8 @@ static int intelfb_create(struct drm_device *dev, uint32_t fb_width, | |||
527 | 205 | ||
528 | // memset(info->screen_base, 0, size); | 206 | // memset(info->screen_base, 0, size); |
529 | 207 | ||
530 | info->pseudo_palette = fb->pseudo_palette; | 208 | drm_fb_helper_fill_fix(info, fb->depth); |
531 | info->var.xres_virtual = fb->width; | 209 | drm_fb_helper_fill_var(info, fb, fb_width, fb_height); |
532 | info->var.yres_virtual = fb->height; | ||
533 | info->var.bits_per_pixel = fb->bits_per_pixel; | ||
534 | info->var.xoffset = 0; | ||
535 | info->var.yoffset = 0; | ||
536 | info->var.activate = FB_ACTIVATE_NOW; | ||
537 | info->var.height = -1; | ||
538 | info->var.width = -1; | ||
539 | |||
540 | info->var.xres = fb_width; | ||
541 | info->var.yres = fb_height; | ||
542 | 210 | ||
543 | /* FIXME: we really shouldn't expose mmio space at all */ | 211 | /* FIXME: we really shouldn't expose mmio space at all */ |
544 | info->fix.mmio_start = pci_resource_start(dev->pdev, mmio_bar); | 212 | info->fix.mmio_start = pci_resource_start(dev->pdev, mmio_bar); |
@@ -550,64 +218,9 @@ static int intelfb_create(struct drm_device *dev, uint32_t fb_width, | |||
550 | info->pixmap.flags = FB_PIXMAP_SYSTEM; | 218 | info->pixmap.flags = FB_PIXMAP_SYSTEM; |
551 | info->pixmap.scan_align = 1; | 219 | info->pixmap.scan_align = 1; |
552 | 220 | ||
553 | switch(fb->depth) { | ||
554 | case 8: | ||
555 | info->var.red.offset = 0; | ||
556 | info->var.green.offset = 0; | ||
557 | info->var.blue.offset = 0; | ||
558 | info->var.red.length = 8; /* 8bit DAC */ | ||
559 | info->var.green.length = 8; | ||
560 | info->var.blue.length = 8; | ||
561 | info->var.transp.offset = 0; | ||
562 | info->var.transp.length = 0; | ||
563 | break; | ||
564 | case 15: | ||
565 | info->var.red.offset = 10; | ||
566 | info->var.green.offset = 5; | ||
567 | info->var.blue.offset = 0; | ||
568 | info->var.red.length = 5; | ||
569 | info->var.green.length = 5; | ||
570 | info->var.blue.length = 5; | ||
571 | info->var.transp.offset = 15; | ||
572 | info->var.transp.length = 1; | ||
573 | break; | ||
574 | case 16: | ||
575 | info->var.red.offset = 11; | ||
576 | info->var.green.offset = 5; | ||
577 | info->var.blue.offset = 0; | ||
578 | info->var.red.length = 5; | ||
579 | info->var.green.length = 6; | ||
580 | info->var.blue.length = 5; | ||
581 | info->var.transp.offset = 0; | ||
582 | break; | ||
583 | case 24: | ||
584 | info->var.red.offset = 16; | ||
585 | info->var.green.offset = 8; | ||
586 | info->var.blue.offset = 0; | ||
587 | info->var.red.length = 8; | ||
588 | info->var.green.length = 8; | ||
589 | info->var.blue.length = 8; | ||
590 | info->var.transp.offset = 0; | ||
591 | info->var.transp.length = 0; | ||
592 | break; | ||
593 | case 32: | ||
594 | info->var.red.offset = 16; | ||
595 | info->var.green.offset = 8; | ||
596 | info->var.blue.offset = 0; | ||
597 | info->var.red.length = 8; | ||
598 | info->var.green.length = 8; | ||
599 | info->var.blue.length = 8; | ||
600 | info->var.transp.offset = 24; | ||
601 | info->var.transp.length = 8; | ||
602 | break; | ||
603 | default: | ||
604 | break; | ||
605 | } | ||
606 | |||
607 | fb->fbdev = info; | 221 | fb->fbdev = info; |
608 | 222 | ||
609 | par->intel_fb = intel_fb; | 223 | par->intel_fb = intel_fb; |
610 | par->dev = dev; | ||
611 | 224 | ||
612 | /* To allow resizeing without swapping buffers */ | 225 | /* To allow resizeing without swapping buffers */ |
613 | DRM_DEBUG("allocated %dx%d fb: 0x%08x, bo %p\n", intel_fb->base.width, | 226 | DRM_DEBUG("allocated %dx%d fb: 0x%08x, bo %p\n", intel_fb->base.width, |
@@ -625,307 +238,12 @@ out: | |||
625 | return ret; | 238 | return ret; |
626 | } | 239 | } |
627 | 240 | ||
628 | static int intelfb_multi_fb_probe_crtc(struct drm_device *dev, struct drm_crtc *crtc) | ||
629 | { | ||
630 | struct intel_crtc *intel_crtc = to_intel_crtc(crtc); | ||
631 | struct intel_framebuffer *intel_fb; | ||
632 | struct drm_framebuffer *fb; | ||
633 | struct drm_connector *connector; | ||
634 | struct fb_info *info; | ||
635 | struct intelfb_par *par; | ||
636 | struct drm_mode_set *modeset; | ||
637 | unsigned int width, height; | ||
638 | int new_fb = 0; | ||
639 | int ret, i, conn_count; | ||
640 | |||
641 | if (!drm_helper_crtc_in_use(crtc)) | ||
642 | return 0; | ||
643 | |||
644 | if (!crtc->desired_mode) | ||
645 | return 0; | ||
646 | |||
647 | width = crtc->desired_mode->hdisplay; | ||
648 | height = crtc->desired_mode->vdisplay; | ||
649 | |||
650 | /* is there an fb bound to this crtc already */ | ||
651 | if (!intel_crtc->mode_set.fb) { | ||
652 | ret = intelfb_create(dev, width, height, width, height, &intel_fb); | ||
653 | if (ret) | ||
654 | return -EINVAL; | ||
655 | new_fb = 1; | ||
656 | } else { | ||
657 | fb = intel_crtc->mode_set.fb; | ||
658 | intel_fb = to_intel_framebuffer(fb); | ||
659 | if ((intel_fb->base.width < width) || (intel_fb->base.height < height)) | ||
660 | return -EINVAL; | ||
661 | } | ||
662 | |||
663 | info = intel_fb->base.fbdev; | ||
664 | par = info->par; | ||
665 | |||
666 | modeset = &intel_crtc->mode_set; | ||
667 | modeset->fb = &intel_fb->base; | ||
668 | conn_count = 0; | ||
669 | list_for_each_entry(connector, &dev->mode_config.connector_list, head) { | ||
670 | if (connector->encoder) | ||
671 | if (connector->encoder->crtc == modeset->crtc) { | ||
672 | modeset->connectors[conn_count] = connector; | ||
673 | conn_count++; | ||
674 | if (conn_count > INTELFB_CONN_LIMIT) | ||
675 | BUG(); | ||
676 | } | ||
677 | } | ||
678 | |||
679 | for (i = conn_count; i < INTELFB_CONN_LIMIT; i++) | ||
680 | modeset->connectors[i] = NULL; | ||
681 | |||
682 | par->crtc_ids[0] = crtc->base.id; | ||
683 | |||
684 | modeset->num_connectors = conn_count; | ||
685 | if (modeset->crtc->desired_mode) { | ||
686 | if (modeset->mode) | ||
687 | drm_mode_destroy(dev, modeset->mode); | ||
688 | modeset->mode = drm_mode_duplicate(dev, | ||
689 | modeset->crtc->desired_mode); | ||
690 | } | ||
691 | |||
692 | par->crtc_count = 1; | ||
693 | |||
694 | if (new_fb) { | ||
695 | info->var.pixclock = -1; | ||
696 | if (register_framebuffer(info) < 0) | ||
697 | return -EINVAL; | ||
698 | } else | ||
699 | intelfb_set_par(info); | ||
700 | |||
701 | DRM_INFO("fb%d: %s frame buffer device\n", info->node, | ||
702 | info->fix.id); | ||
703 | |||
704 | /* Switch back to kernel console on panic */ | ||
705 | kernelfb_mode = *modeset; | ||
706 | atomic_notifier_chain_register(&panic_notifier_list, &paniced); | ||
707 | DRM_DEBUG("registered panic notifier\n"); | ||
708 | |||
709 | return 0; | ||
710 | } | ||
711 | |||
712 | static int intelfb_multi_fb_probe(struct drm_device *dev) | ||
713 | { | ||
714 | |||
715 | struct drm_crtc *crtc; | ||
716 | int ret = 0; | ||
717 | |||
718 | list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { | ||
719 | ret = intelfb_multi_fb_probe_crtc(dev, crtc); | ||
720 | if (ret) | ||
721 | return ret; | ||
722 | } | ||
723 | return ret; | ||
724 | } | ||
725 | |||
726 | static int intelfb_single_fb_probe(struct drm_device *dev) | ||
727 | { | ||
728 | struct drm_crtc *crtc; | ||
729 | struct drm_connector *connector; | ||
730 | unsigned int fb_width = (unsigned)-1, fb_height = (unsigned)-1; | ||
731 | unsigned int surface_width = 0, surface_height = 0; | ||
732 | int new_fb = 0; | ||
733 | int crtc_count = 0; | ||
734 | int ret, i, conn_count = 0; | ||
735 | struct intel_framebuffer *intel_fb; | ||
736 | struct fb_info *info; | ||
737 | struct intelfb_par *par; | ||
738 | struct drm_mode_set *modeset = NULL; | ||
739 | |||
740 | DRM_DEBUG("\n"); | ||
741 | |||
742 | /* Get a count of crtcs now in use and new min/maxes width/heights */ | ||
743 | list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { | ||
744 | if (!drm_helper_crtc_in_use(crtc)) | ||
745 | continue; | ||
746 | |||
747 | crtc_count++; | ||
748 | if (!crtc->desired_mode) | ||
749 | continue; | ||
750 | |||
751 | /* Smallest mode determines console size... */ | ||
752 | if (crtc->desired_mode->hdisplay < fb_width) | ||
753 | fb_width = crtc->desired_mode->hdisplay; | ||
754 | |||
755 | if (crtc->desired_mode->vdisplay < fb_height) | ||
756 | fb_height = crtc->desired_mode->vdisplay; | ||
757 | |||
758 | /* ... but largest for memory allocation dimensions */ | ||
759 | if (crtc->desired_mode->hdisplay > surface_width) | ||
760 | surface_width = crtc->desired_mode->hdisplay; | ||
761 | |||
762 | if (crtc->desired_mode->vdisplay > surface_height) | ||
763 | surface_height = crtc->desired_mode->vdisplay; | ||
764 | } | ||
765 | |||
766 | if (crtc_count == 0 || fb_width == -1 || fb_height == -1) { | ||
767 | /* hmm everyone went away - assume VGA cable just fell out | ||
768 | and will come back later. */ | ||
769 | DRM_DEBUG("no CRTCs available?\n"); | ||
770 | return 0; | ||
771 | } | ||
772 | |||
773 | //fail | ||
774 | /* Find the fb for our new config */ | ||
775 | if (list_empty(&dev->mode_config.fb_kernel_list)) { | ||
776 | DRM_DEBUG("creating new fb (console size %dx%d, " | ||
777 | "buffer size %dx%d)\n", fb_width, fb_height, | ||
778 | surface_width, surface_height); | ||
779 | ret = intelfb_create(dev, fb_width, fb_height, surface_width, | ||
780 | surface_height, &intel_fb); | ||
781 | if (ret) | ||
782 | return -EINVAL; | ||
783 | new_fb = 1; | ||
784 | } else { | ||
785 | struct drm_framebuffer *fb; | ||
786 | |||
787 | fb = list_first_entry(&dev->mode_config.fb_kernel_list, | ||
788 | struct drm_framebuffer, filp_head); | ||
789 | intel_fb = to_intel_framebuffer(fb); | ||
790 | |||
791 | /* if someone hotplugs something bigger than we have already | ||
792 | * allocated, we are pwned. As really we can't resize an | ||
793 | * fbdev that is in the wild currently due to fbdev not really | ||
794 | * being designed for the lower layers moving stuff around | ||
795 | * under it. | ||
796 | * - so in the grand style of things - punt. | ||
797 | */ | ||
798 | if ((fb->width < surface_width) || | ||
799 | (fb->height < surface_height)) { | ||
800 | DRM_ERROR("fb not large enough for console\n"); | ||
801 | return -EINVAL; | ||
802 | } | ||
803 | } | ||
804 | // fail | ||
805 | |||
806 | info = intel_fb->base.fbdev; | ||
807 | par = info->par; | ||
808 | |||
809 | crtc_count = 0; | ||
810 | /* | ||
811 | * For each CRTC, set up the connector list for the CRTC's mode | ||
812 | * set configuration. | ||
813 | */ | ||
814 | list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { | ||
815 | struct intel_crtc *intel_crtc = to_intel_crtc(crtc); | ||
816 | |||
817 | modeset = &intel_crtc->mode_set; | ||
818 | modeset->fb = &intel_fb->base; | ||
819 | conn_count = 0; | ||
820 | list_for_each_entry(connector, &dev->mode_config.connector_list, | ||
821 | head) { | ||
822 | if (!connector->encoder) | ||
823 | continue; | ||
824 | |||
825 | if(connector->encoder->crtc == modeset->crtc) { | ||
826 | modeset->connectors[conn_count++] = connector; | ||
827 | if (conn_count > INTELFB_CONN_LIMIT) | ||
828 | BUG(); | ||
829 | } | ||
830 | } | ||
831 | |||
832 | /* Zero out remaining connector pointers */ | ||
833 | for (i = conn_count; i < INTELFB_CONN_LIMIT; i++) | ||
834 | modeset->connectors[i] = NULL; | ||
835 | |||
836 | par->crtc_ids[crtc_count++] = crtc->base.id; | ||
837 | |||
838 | modeset->num_connectors = conn_count; | ||
839 | if (modeset->crtc->desired_mode) { | ||
840 | if (modeset->mode) | ||
841 | drm_mode_destroy(dev, modeset->mode); | ||
842 | modeset->mode = drm_mode_duplicate(dev, | ||
843 | modeset->crtc->desired_mode); | ||
844 | } | ||
845 | } | ||
846 | par->crtc_count = crtc_count; | ||
847 | |||
848 | if (new_fb) { | ||
849 | info->var.pixclock = -1; | ||
850 | if (register_framebuffer(info) < 0) | ||
851 | return -EINVAL; | ||
852 | } else | ||
853 | intelfb_set_par(info); | ||
854 | |||
855 | DRM_INFO("fb%d: %s frame buffer device\n", info->node, | ||
856 | info->fix.id); | ||
857 | |||
858 | /* Switch back to kernel console on panic */ | ||
859 | kernelfb_mode = *modeset; | ||
860 | atomic_notifier_chain_register(&panic_notifier_list, &paniced); | ||
861 | DRM_DEBUG("registered panic notifier\n"); | ||
862 | |||
863 | return 0; | ||
864 | } | ||
865 | |||
866 | /** | ||
867 | * intelfb_restore - restore the framebuffer console (kernel) config | ||
868 | * | ||
869 | * Restore's the kernel's fbcon mode, used for lastclose & panic paths. | ||
870 | */ | ||
871 | void intelfb_restore(void) | ||
872 | { | ||
873 | int ret; | ||
874 | if ((ret = drm_crtc_helper_set_config(&kernelfb_mode)) != 0) { | ||
875 | DRM_ERROR("Failed to restore crtc configuration: %d\n", | ||
876 | ret); | ||
877 | } | ||
878 | } | ||
879 | |||
880 | static void intelfb_restore_work_fn(struct work_struct *ignored) | ||
881 | { | ||
882 | intelfb_restore(); | ||
883 | } | ||
884 | static DECLARE_WORK(intelfb_restore_work, intelfb_restore_work_fn); | ||
885 | |||
886 | static void intelfb_sysrq(int dummy1, struct tty_struct *dummy3) | ||
887 | { | ||
888 | schedule_work(&intelfb_restore_work); | ||
889 | } | ||
890 | |||
891 | static struct sysrq_key_op sysrq_intelfb_restore_op = { | ||
892 | .handler = intelfb_sysrq, | ||
893 | .help_msg = "force-fb(V)", | ||
894 | .action_msg = "Restore framebuffer console", | ||
895 | }; | ||
896 | |||
897 | int intelfb_probe(struct drm_device *dev) | 241 | int intelfb_probe(struct drm_device *dev) |
898 | { | 242 | { |
899 | int ret; | 243 | int ret; |
900 | 244 | ||
901 | DRM_DEBUG("\n"); | 245 | DRM_DEBUG("\n"); |
902 | 246 | ret = drm_fb_helper_single_fb_probe(dev, intelfb_create); | |
903 | /* something has changed in the lower levels of hell - deal with it | ||
904 | here */ | ||
905 | |||
906 | /* two modes : a) 1 fb to rule all crtcs. | ||
907 | b) one fb per crtc. | ||
908 | two actions 1) new connected device | ||
909 | 2) device removed. | ||
910 | case a/1 : if the fb surface isn't big enough - resize the surface fb. | ||
911 | if the fb size isn't big enough - resize fb into surface. | ||
912 | if everything big enough configure the new crtc/etc. | ||
913 | case a/2 : undo the configuration | ||
914 | possibly resize down the fb to fit the new configuration. | ||
915 | case b/1 : see if it is on a new crtc - setup a new fb and add it. | ||
916 | case b/2 : teardown the new fb. | ||
917 | */ | ||
918 | |||
919 | /* mode a first */ | ||
920 | /* search for an fb */ | ||
921 | if (i915_fbpercrtc == 1) { | ||
922 | ret = intelfb_multi_fb_probe(dev); | ||
923 | } else { | ||
924 | ret = intelfb_single_fb_probe(dev); | ||
925 | } | ||
926 | |||
927 | register_sysrq_key('v', &sysrq_intelfb_restore_op); | ||
928 | |||
929 | return ret; | 247 | return ret; |
930 | } | 248 | } |
931 | EXPORT_SYMBOL(intelfb_probe); | 249 | EXPORT_SYMBOL(intelfb_probe); |
@@ -940,13 +258,14 @@ int intelfb_remove(struct drm_device *dev, struct drm_framebuffer *fb) | |||
940 | info = fb->fbdev; | 258 | info = fb->fbdev; |
941 | 259 | ||
942 | if (info) { | 260 | if (info) { |
261 | struct intelfb_par *par = info->par; | ||
943 | unregister_framebuffer(info); | 262 | unregister_framebuffer(info); |
944 | iounmap(info->screen_base); | 263 | iounmap(info->screen_base); |
264 | if (info->par) | ||
265 | drm_fb_helper_free(&par->helper); | ||
945 | framebuffer_release(info); | 266 | framebuffer_release(info); |
946 | } | 267 | } |
947 | 268 | ||
948 | atomic_notifier_chain_unregister(&panic_notifier_list, &paniced); | ||
949 | memset(&kernelfb_mode, 0, sizeof(struct drm_mode_set)); | ||
950 | return 0; | 269 | return 0; |
951 | } | 270 | } |
952 | EXPORT_SYMBOL(intelfb_remove); | 271 | EXPORT_SYMBOL(intelfb_remove); |