Rev 2342 | Rev 2351 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 2342 | Rev 2344 | ||
|---|---|---|---|
| Line 2004... | Line 2004... | ||
| 2004 | 2004 | ||
| 2005 | dev_priv->mm.interruptible = true; |
2005 | dev_priv->mm.interruptible = true; |
| Line 2006... | Line 2006... | ||
| 2006 | return 0; |
2006 | return 0; |
| 2007 | 2007 | ||
| 2008 | err_unpin: |
2008 | err_unpin: |
| 2009 | // i915_gem_object_unpin(obj); |
2009 | i915_gem_object_unpin(obj); |
| 2010 | err_interruptible: |
2010 | err_interruptible: |
| 2011 | dev_priv->mm.interruptible = true; |
2011 | dev_priv->mm.interruptible = true; |
| Line 2221... | Line 2221... | ||
| 2221 | mutex_lock(&dev->struct_mutex); |
2221 | mutex_lock(&dev->struct_mutex); |
| Line 2222... | Line 2222... | ||
| 2222 | 2222 | ||
| 2223 | ret = intel_pipe_set_base_atomic(crtc, crtc->fb, x, y, |
2223 | ret = intel_pipe_set_base_atomic(crtc, crtc->fb, x, y, |
| 2224 | LEAVE_ATOMIC_MODE_SET); |
2224 | LEAVE_ATOMIC_MODE_SET); |
| 2225 | if (ret) { |
2225 | if (ret) { |
| 2226 | // i915_gem_object_unpin(to_intel_framebuffer(crtc->fb)->obj); |
2226 | i915_gem_object_unpin(to_intel_framebuffer(crtc->fb)->obj); |
| 2227 | mutex_unlock(&dev->struct_mutex); |
2227 | mutex_unlock(&dev->struct_mutex); |
| 2228 | DRM_ERROR("failed to update base address\n"); |
2228 | DRM_ERROR("failed to update base address\n"); |
| 2229 | LEAVE(); |
2229 | LEAVE(); |
| 2230 | return ret; |
2230 | return ret; |
| Line 3308... | Line 3308... | ||
| 3308 | 3308 | ||
| Line 3309... | Line 3309... | ||
| 3309 | crtc_funcs->dpms(crtc, DRM_MODE_DPMS_OFF); |
3309 | crtc_funcs->dpms(crtc, DRM_MODE_DPMS_OFF); |
| 3310 | 3310 | ||
| 3311 | if (crtc->fb) { |
3311 | if (crtc->fb) { |
| 3312 | mutex_lock(&dev->struct_mutex); |
3312 | mutex_lock(&dev->struct_mutex); |
| 3313 | // i915_gem_object_unpin(to_intel_framebuffer(crtc->fb)->obj); |
3313 | i915_gem_object_unpin(to_intel_framebuffer(crtc->fb)->obj); |
| 3314 | mutex_unlock(&dev->struct_mutex); |
3314 | mutex_unlock(&dev->struct_mutex); |
| Line 3315... | Line 3315... | ||
| 3315 | } |
3315 | } |
| Line 6297... | Line 6297... | ||
| 6297 | intel_framebuffer_create_for_mode(struct drm_device *dev, |
6297 | intel_framebuffer_create_for_mode(struct drm_device *dev, |
| 6298 | struct drm_display_mode *mode, |
6298 | struct drm_display_mode *mode, |
| 6299 | int depth, int bpp) |
6299 | int depth, int bpp) |
| 6300 | { |
6300 | { |
| 6301 | struct drm_i915_gem_object *obj; |
6301 | struct drm_i915_gem_object *obj; |
| 6302 | struct drm_mode_fb_cmd mode_cmd; |
6302 | struct drm_mode_fb_cmd2 mode_cmd; |
| Line 6303... | Line 6303... | ||
| 6303 | 6303 | ||
| 6304 | // obj = i915_gem_alloc_object(dev, |
6304 | // obj = i915_gem_alloc_object(dev, |
| 6305 | // intel_framebuffer_size_for_mode(mode, bpp)); |
6305 | // intel_framebuffer_size_for_mode(mode, bpp)); |
| 6306 | // if (obj == NULL) |
6306 | // if (obj == NULL) |
| Line 6656... | Line 6656... | ||
| 6656 | } |
6656 | } |
| Line 6657... | Line 6657... | ||
| 6657 | 6657 | ||
| Line 6658... | Line 6658... | ||
| 6658 | LEAVE(); |
6658 | LEAVE(); |
| 6659 | - | ||
| 6660 | /* Schedule downclock */ |
- | |
| 6661 | // mod_timer(&intel_crtc->idle_timer, jiffies + |
6659 | |
| Line 6890... | Line 6888... | ||
| 6890 | 6888 | ||
| Line 6891... | Line 6889... | ||
| 6891 | drm_crtc_helper_add(&intel_crtc->base, &intel_helper_funcs); |
6889 | drm_crtc_helper_add(&intel_crtc->base, &intel_helper_funcs); |
| Line 6892... | Line -... | ||
| 6892 | - | ||
| 6893 | intel_crtc->busy = false; |
- | |
| 6894 | 6890 | ||