Rev 4371 | Rev 4398 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 4371 | Rev 4389 | ||
|---|---|---|---|
| Line 317... | Line 317... | ||
| 317 | struct drm_display_mode *mode; |
317 | struct drm_display_mode *mode; |
| 318 | 318 | ||
| Line 319... | Line 319... | ||
| 319 | list_for_each_entry(mode, &connector->modes, head) |
319 | list_for_each_entry(mode, &connector->modes, head) |
| 320 | { |
320 | { |
| 321 | dbgprintf("check mode w:%d h:%d %dHz\n", |
321 | DRM_DEBUG_KMS("check mode w:%d h:%d %dHz\n", |
| 322 | drm_mode_width(mode), drm_mode_height(mode), |
322 | drm_mode_width(mode), drm_mode_height(mode), |
| 323 | drm_mode_vrefresh(mode)); |
323 | drm_mode_vrefresh(mode)); |
| Line 324... | Line 324... | ||
| 324 | 324 | ||
| 325 | if( os_display->width == drm_mode_width(mode) && |
325 | if( os_display->width == drm_mode_width(mode) && |
| Line 346... | Line 346... | ||
| 346 | cursor_t *cursor; |
346 | cursor_t *cursor; |
| 347 | u32_t ifl; |
347 | u32_t ifl; |
| 348 | int err; |
348 | int err; |
| Line 349... | Line -... | ||
| 349 | - | ||
| 350 | ENTER(); |
- | |
| 351 | 349 | ||
| Line 352... | Line 350... | ||
| 352 | mutex_lock(&dev->mode_config.mutex); |
350 | mutex_lock(&dev->mode_config.mutex); |
| 353 | 351 | ||
| 354 | connector = get_active_connector(dev) ; |
352 | connector = get_active_connector(dev) ; |
| Line 364... | Line 362... | ||
| 364 | 362 | ||
| Line 365... | Line 363... | ||
| 365 | if(crtc == NULL) |
363 | if(crtc == NULL) |
| 366 | crtc = get_possible_crtc(dev, encoder); |
364 | crtc = get_possible_crtc(dev, encoder); |
| Line 367... | Line -... | ||
| 367 | - | ||
| 368 | dbgprintf("CRTC %p\n", crtc); |
- | |
| 369 | 365 | ||
| 370 | if(crtc == NULL) |
366 | if(crtc == NULL) |
| 371 | { |
367 | { |
| 372 | DRM_DEBUG_KMS("No CRTC for encoder %d\n", encoder->base.id); |
368 | DRM_DEBUG_KMS("No CRTC for encoder %d\n", encoder->base.id); |
| 373 | mutex_unlock(&dev->mode_config.mutex); |
369 | mutex_unlock(&dev->mode_config.mutex); |
| Line 699... | Line 695... | ||
| 699 | }; |
695 | }; |
| 700 | 696 | ||
| Line 701... | Line 697... | ||
| 701 | int i915_fbinfo(struct drm_i915_fb_info *fb) |
697 | int i915_fbinfo(struct drm_i915_fb_info *fb) |
| 702 | { |
698 | { |
| - | 699 | struct drm_i915_private *dev_priv = os_display->ddev->dev_private; |
|
| - | 700 | struct intel_crtc *crtc = to_intel_crtc(os_display->crtc); |
|
| - | 701 | ||
| 703 | struct drm_i915_gem_object *obj = get_fb_obj(); |
702 | struct drm_i915_gem_object *obj = get_fb_obj(); |
| Line 704... | Line 703... | ||
| 704 | 703 | ||
| 705 | fb->name = obj->base.name; |
704 | fb->name = obj->base.name; |
| 706 | fb->width = os_display->width; |
705 | fb->width = os_display->width; |
| 707 | fb->height = os_display->height; |
706 | fb->height = os_display->height; |
| 708 | fb->pitch = obj->stride; |
707 | fb->pitch = obj->stride; |
| - | 708 | fb->tiling = obj->tiling_mode; |
|
| - | 709 | fb->crtc = crtc->base.base.id; |
|
| Line 709... | Line 710... | ||
| 709 | fb->tiling = obj->tiling_mode; |
710 | fb->pipe = crtc->pipe; |
| 710 | 711 | ||