| 252,8 → 252,6 |
|---|
| u32 adpa; |
| bool ret; |
| |
| ENTER(); |
| |
| /* The first time through, trigger an explicit detection cycle */ |
| if (crt->force_hotplug_required) { |
| bool turn_off_dac = HAS_PCH_SPLIT(dev); |
| 288,8 → 286,6 |
|---|
| ret = false; |
| DRM_DEBUG_KMS("ironlake hotplug adpa=0x%x, result %d\n", adpa, ret); |
| |
| LEAVE(); |
| |
| return ret; |
| } |
| |
| 302,8 → 298,6 |
|---|
| bool ret; |
| u32 save_adpa; |
| |
| ENTER(); |
| |
| save_adpa = adpa = I915_READ(crt->adpa_reg); |
| DRM_DEBUG_KMS("trigger hotplug detect cycle: adpa=0x%x\n", adpa); |
| |
| 329,8 → 323,6 |
|---|
| /* FIXME: debug force function and remove */ |
| ret = true; |
| |
| LEAVE(); |
| |
| return ret; |
| } |
| |
| 350,8 → 342,6 |
|---|
| bool ret = false; |
| int i, tries = 0; |
| |
| ENTER(); |
| |
| if (HAS_PCH_SPLIT(dev)) |
| return intel_ironlake_crt_detect_hotplug(connector); |
| |
| 390,8 → 380,6 |
|---|
| /* and put the bits back */ |
| I915_WRITE(PORT_HOTPLUG_EN, orig); |
| |
| LEAVE(); |
| |
| return ret; |
| } |
| |
| 400,8 → 388,6 |
|---|
| { |
| struct edid *edid; |
| |
| ENTER(); |
| |
| edid = drm_get_edid(connector, i2c); |
| |
| if (!edid && !intel_gmbus_is_forced_bit(i2c)) { |
| 411,8 → 397,6 |
|---|
| intel_gmbus_force_bit(i2c, false); |
| } |
| |
| LEAVE(); |
| |
| return edid; |
| } |
| |