Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 199604
b: refs/heads/master
c: a939406
h: refs/heads/master
v: v3
  • Loading branch information
Chris Wilson authored and Eric Anholt committed May 28, 2010
1 parent 6e05620 commit 74215e1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 808b24d6ed8b155aac17007788390ebfde263f30
refs/heads/master: a939406fda8ddc7de69ee9186356d09dc6daaa2c
5 changes: 3 additions & 2 deletions trunk/drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -1248,10 +1248,11 @@ static void intel_update_fbc(struct drm_crtc *crtc,
return;

out_disable:
DRM_DEBUG_KMS("unsupported config, disabling FBC\n");
/* Multiple disables should be harmless */
if (intel_fbc_enabled(dev))
if (intel_fbc_enabled(dev)) {
DRM_DEBUG_KMS("unsupported config, disabling FBC\n");
intel_disable_fbc(dev);
}
}

static int
Expand Down

0 comments on commit 74215e1

Please sign in to comment.