Rev 5354 | Rev 6084 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 5354 | Rev 5367 | ||
|---|---|---|---|
| Line 2347... | Line 2347... | ||
| 2347 | obj = i915_gem_object_create_stolen_for_preallocated(dev, base, base, |
2347 | obj = i915_gem_object_create_stolen_for_preallocated(dev, base, base, |
| 2348 | plane_config->size); |
2348 | plane_config->size); |
| 2349 | if (!obj) |
2349 | if (!obj) |
| 2350 | return false; |
2350 | return false; |
| Line -... | Line 2351... | ||
| - | 2351 | ||
| 2351 | 2352 | obj->map_and_fenceable=true; |
|
| Line 2352... | Line 2353... | ||
| 2352 | main_fb_obj = obj; |
2353 | main_fb_obj = obj; |
| 2353 | 2354 | ||
| 2354 | if (plane_config->tiled) { |
2355 | if (plane_config->tiled) { |
| Line 6636... | Line 6637... | ||
| 6636 | crtc->base.primary->fb->pitches[0] = val & 0xffffffc0; |
6637 | crtc->base.primary->fb->pitches[0] = val & 0xffffffc0; |
| Line 6637... | Line 6638... | ||
| 6637 | 6638 | ||
| 6638 | aligned_height = intel_align_height(dev, crtc->base.primary->fb->height, |
6639 | aligned_height = intel_align_height(dev, crtc->base.primary->fb->height, |
| Line 6639... | Line 6640... | ||
| 6639 | plane_config->tiled); |
6640 | plane_config->tiled); |
| 6640 | - | ||
| - | 6641 | ||
| Line 6641... | Line 6642... | ||
| 6641 | plane_config->size = 16*1024*1024; |
6642 | plane_config->size = PAGE_ALIGN(crtc->base.primary->fb->pitches[0] * |
| 6642 | 6643 | aligned_height); |
|
| 6643 | 6644 | ||
| 6644 | DRM_DEBUG_KMS("pipe/plane %d/%d with fb: size=%dx%d@%d, offset=%x, pitch %d, size 0x%x\n", |
6645 | DRM_DEBUG_KMS("pipe/plane %d/%d with fb: size=%dx%d@%d, offset=%x, pitch %d, size 0x%x\n", |
| Line 12664... | Line 12665... | ||
| 12664 | { 0x2592, 0x1179, 0x0001, quirk_pipea_force }, |
12665 | { 0x2592, 0x1179, 0x0001, quirk_pipea_force }, |
| Line 12665... | Line 12666... | ||
| 12665 | 12666 | ||
| 12666 | /* ThinkPad T60 needs pipe A force quirk (bug #16494) */ |
12667 | /* ThinkPad T60 needs pipe A force quirk (bug #16494) */ |
| Line -... | Line 12668... | ||
| - | 12668 | { 0x2782, 0x17aa, 0x201a, quirk_pipea_force }, |
|
| - | 12669 | ||
| - | 12670 | /* 830 needs to leave pipe A & dpll A up */ |
|
| - | 12671 | { 0x3577, PCI_ANY_ID, PCI_ANY_ID, quirk_pipea_force }, |
|
| - | 12672 | ||
| - | 12673 | /* 830 needs to leave pipe B & dpll B up */ |
|
| 12667 | { 0x2782, 0x17aa, 0x201a, quirk_pipea_force }, |
12674 | { 0x3577, PCI_ANY_ID, PCI_ANY_ID, quirk_pipeb_force }, |
| 12668 | 12675 | ||
| Line 12669... | Line 12676... | ||
| 12669 | /* Lenovo U160 cannot use SSC on LVDS */ |
12676 | /* Lenovo U160 cannot use SSC on LVDS */ |
| 12670 | { 0x0046, 0x17aa, 0x3920, quirk_ssc_force_disable }, |
12677 | { 0x0046, 0x17aa, 0x3920, quirk_ssc_force_disable }, |
| Line 12855... | Line 12862... | ||
| 12855 | &crtc->plane_config); |
12862 | &crtc->plane_config); |
| 12856 | /* |
12863 | /* |
| 12857 | * If the fb is shared between multiple heads, we'll |
12864 | * If the fb is shared between multiple heads, we'll |
| 12858 | * just get the first one. |
12865 | * just get the first one. |
| 12859 | */ |
12866 | */ |
| - | 12867 | crtc->plane_config.size = 16*1024*1024; |
|
| 12860 | intel_find_plane_obj(crtc, &crtc->plane_config); |
12868 | intel_find_plane_obj(crtc, &crtc->plane_config); |
| 12861 | } |
12869 | } |
| 12862 | } |
12870 | } |
| 12863 | } |
12871 | } |