Rev 3031 | Rev 3120 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 3031 | Rev 3037 | ||
|---|---|---|---|
| Line 1819... | Line 1819... | ||
| 1819 | if ((val & PIPECONF_ENABLE) == 0) |
1819 | if ((val & PIPECONF_ENABLE) == 0) |
| 1820 | return; |
1820 | return; |
| Line 1821... | Line 1821... | ||
| 1821 | 1821 | ||
| 1822 | I915_WRITE(reg, val & ~PIPECONF_ENABLE); |
1822 | I915_WRITE(reg, val & ~PIPECONF_ENABLE); |
| 1823 | intel_wait_for_pipe_off(dev_priv->dev, pipe); |
- | |
| 1824 | 1823 | intel_wait_for_pipe_off(dev_priv->dev, pipe); |
|
| Line 1825... | Line 1824... | ||
| 1825 | } |
1824 | } |
| 1826 | 1825 | ||
| 1827 | /* |
1826 | /* |
| Line 2214... | Line 2213... | ||
| 2214 | ret = dev_priv->display.update_plane(crtc, fb, x, y); |
2213 | ret = dev_priv->display.update_plane(crtc, fb, x, y); |
| 2215 | if (ret) { |
2214 | if (ret) { |
| 2216 | intel_unpin_fb_obj(to_intel_framebuffer(fb)->obj); |
2215 | intel_unpin_fb_obj(to_intel_framebuffer(fb)->obj); |
| 2217 | mutex_unlock(&dev->struct_mutex); |
2216 | mutex_unlock(&dev->struct_mutex); |
| 2218 | DRM_ERROR("failed to update base address\n"); |
2217 | DRM_ERROR("failed to update base address\n"); |
| 2219 | LEAVE(); |
- | |
| 2220 | return ret; |
2218 | return ret; |
| 2221 | } |
2219 | } |
| Line 2222... | Line 2220... | ||
| 2222 | 2220 | ||
| 2223 | old_fb = crtc->fb; |
2221 | old_fb = crtc->fb; |
| Line 3355... | Line 3353... | ||
| 3355 | intel_update_watermarks(dev); |
3353 | intel_update_watermarks(dev); |
| Line 3356... | Line 3354... | ||
| 3356 | 3354 | ||
| 3357 | mutex_lock(&dev->struct_mutex); |
3355 | mutex_lock(&dev->struct_mutex); |
| 3358 | intel_update_fbc(dev); |
3356 | intel_update_fbc(dev); |
| 3359 | mutex_unlock(&dev->struct_mutex); |
- | |
| 3360 | 3357 | mutex_unlock(&dev->struct_mutex); |
|
| Line 3361... | Line 3358... | ||
| 3361 | } |
3358 | } |
| 3362 | 3359 | ||
| 3363 | static void ironlake_crtc_off(struct drm_crtc *crtc) |
3360 | static void ironlake_crtc_off(struct drm_crtc *crtc) |
| Line 7484... | Line 7481... | ||
| 7484 | 7481 | ||
| Line 7485... | Line 7482... | ||
| 7485 | intel_crtc->bpp = 24; /* default for pre-Ironlake */ |
7482 | intel_crtc->bpp = 24; /* default for pre-Ironlake */ |
| Line 7486... | Line 7483... | ||
| 7486 | 7483 | ||
| 7487 | drm_crtc_helper_add(&intel_crtc->base, &intel_helper_funcs); |
7484 | drm_crtc_helper_add(&intel_crtc->base, &intel_helper_funcs); |
| 7488 | 7485 | ||
| Line 7489... | Line 7486... | ||
| 7489 | dbgprintf("CRTC %d mode %x FB %x enable %d\n", |
7486 | DRM_DEBUG_KMS("CRTC %d mode %x FB %x enable %d\n", |