Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 293531
b: refs/heads/master
c: 1f182b2
h: refs/heads/master
i:
  293529: f42996d
  293527: cb8365a
v: v3
  • Loading branch information
Adam Jackson authored and Daniel Vetter committed Jan 17, 2012
1 parent ac70e19 commit e2a828a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition 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: 23c99e775d14f01ba45a5affd2fb51af4328359c
refs/heads/master: 1f182b27d50ae9f5efeb28be5b65302c8a81e711
2 changes: 0 additions & 2 deletions trunk/drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -5235,8 +5235,6 @@ static int i9xx_crtc_mode_set(struct drm_crtc *crtc,
/* Set up the display plane register */
dspcntr = DISPPLANE_GAMMA_ENABLE;

/* Ironlake's plane is forced to pipe, bit 24 is to
enable color space conversion */
if (pipe == 0)
dspcntr &= ~DISPPLANE_SEL_PIPE_MASK;
else
Expand Down

0 comments on commit e2a828a

Please sign in to comment.