Rev 2342 | Rev 3031 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 2342 | Rev 2344 | ||
|---|---|---|---|
| Line 499... | Line 499... | ||
| 499 | if (old_obj != obj) { |
499 | if (old_obj != obj) { |
| 500 | mutex_unlock(&dev->struct_mutex); |
500 | mutex_unlock(&dev->struct_mutex); |
| 501 | intel_wait_for_vblank(dev, to_intel_crtc(crtc)->pipe); |
501 | intel_wait_for_vblank(dev, to_intel_crtc(crtc)->pipe); |
| 502 | mutex_lock(&dev->struct_mutex); |
502 | mutex_lock(&dev->struct_mutex); |
| 503 | } |
503 | } |
| 504 | // i915_gem_object_unpin(old_obj); |
504 | i915_gem_object_unpin(old_obj); |
| 505 | } |
505 | } |
| Line 506... | Line 506... | ||
| 506 | 506 | ||
| 507 | out_unlock: |
507 | out_unlock: |
| 508 | mutex_unlock(&dev->struct_mutex); |
508 | mutex_unlock(&dev->struct_mutex); |
| Line 526... | Line 526... | ||
| 526 | 526 | ||
| 527 | if (!intel_plane->obj) |
527 | if (!intel_plane->obj) |
| Line 528... | Line 528... | ||
| 528 | goto out; |
528 | goto out; |
| 529 | 529 | ||
| 530 | mutex_lock(&dev->struct_mutex); |
530 | mutex_lock(&dev->struct_mutex); |
| 531 | // i915_gem_object_unpin(intel_plane->obj); |
531 | i915_gem_object_unpin(intel_plane->obj); |
| 532 | intel_plane->obj = NULL; |
532 | intel_plane->obj = NULL; |
| Line 533... | Line 533... | ||
| 533 | mutex_unlock(&dev->struct_mutex); |
533 | mutex_unlock(&dev->struct_mutex); |