Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 318520
b: refs/heads/master
c: eeafaac
h: refs/heads/master
v: v3
  • Loading branch information
Chris Wilson authored and Daniel Vetter committed May 25, 2012
1 parent c9c0e2e commit 4100887
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 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: 199b2bc25ba587f666a712e9d8475d691d9cec4c
refs/heads/master: eeafaaca763408c099d2ade3a69e0716f296a97b
7 changes: 2 additions & 5 deletions trunk/drivers/gpu/drm/i915/intel_hdmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -459,15 +459,12 @@ static bool g4x_hdmi_connected(struct intel_hdmi *intel_hdmi)
uint32_t bit;

switch (intel_hdmi->sdvox_reg) {
case HDMIB:
case SDVOB:
bit = HDMIB_HOTPLUG_LIVE_STATUS;
break;
case HDMIC:
case SDVOC:
bit = HDMIC_HOTPLUG_LIVE_STATUS;
break;
case HDMID:
bit = HDMID_HOTPLUG_LIVE_STATUS;
break;
default:
bit = 0;
break;
Expand Down

0 comments on commit 4100887

Please sign in to comment.