Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 262517
b: refs/heads/master
c: 1b9be9d
h: refs/heads/master
i:
  262515: 2c04938
v: v3
  • Loading branch information
Adam Jackson authored and Keith Packard committed Jul 25, 2011
1 parent d4e523d commit 9d8ce28
Show file tree
Hide file tree
Showing 2 changed files with 5 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: 97cdd7101079adc3c626d159c62d43de949516c8
refs/heads/master: 1b9be9d09d85b3697418dc444db30d069203ff7d
6 changes: 4 additions & 2 deletions trunk/drivers/gpu/drm/i915/intel_dp.c
Original file line number Diff line number Diff line change
Expand Up @@ -1615,8 +1615,6 @@ ironlake_dp_detect(struct intel_dp *intel_dp)
sizeof (intel_dp->dpcd));
if (ret && intel_dp->dpcd[DP_DPCD_REV] != 0)
status = connector_status_connected;
DRM_DEBUG_KMS("DPCD: %hx%hx%hx%hx\n", intel_dp->dpcd[0],
intel_dp->dpcd[1], intel_dp->dpcd[2], intel_dp->dpcd[3]);
return status;
}

Expand Down Expand Up @@ -1679,6 +1677,10 @@ intel_dp_detect(struct drm_connector *connector, bool force)
status = ironlake_dp_detect(intel_dp);
else
status = g4x_dp_detect(intel_dp);

DRM_DEBUG_KMS("DPCD: %hx%hx%hx%hx\n", intel_dp->dpcd[0],
intel_dp->dpcd[1], intel_dp->dpcd[2], intel_dp->dpcd[3]);

if (status != connector_status_connected)
return status;

Expand Down

0 comments on commit 9d8ce28

Please sign in to comment.