From mboxrd@z Thu Jan 1 00:00:00 1970 From: clinton.a.taylor@intel.com Subject: [PATCH] drm/i915: revert intel_dp_probe_oui call during HPD interrupt handler Date: Wed, 4 Jun 2014 15:29:41 -0700 Message-ID: <1401920981-3137-1-git-send-email-clinton.a.taylor@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 25FAC6E87F for ; Wed, 4 Jun 2014 15:30:35 -0700 (PDT) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org From: Clint Taylor Remove OUI read function from the lower half interrupt handler. Upon closing the eDP panel lid an HPD interrupt is generated. The lower half handler calls intel_dp_probe_oui() as part of intel_dp_detect(). intel_dp_probe_oui() enables eDP VDD and subsequently disables eDP VDD causing another HPD interrupt. This cycle repeats every 3.6 seconds with VDD asserted for 3.5 of those seconds until the lid is opened again. Revert of 0d198328538276c4459ef5de081e68ae60e6c4c2 Revert of 351cfc34db8decb0c5cc1aac7cf1780a0e45c8b1 Signed-off-by: Clint Taylor --- drivers/gpu/drm/i915/intel_dp.c | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 2a00cb8..246d2c1 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -2867,27 +2867,6 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) return true; } -static void -intel_dp_probe_oui(struct intel_dp *intel_dp) -{ - u8 buf[3]; - - if (!(intel_dp->dpcd[DP_DOWN_STREAM_PORT_COUNT] & DP_OUI_SUPPORT)) - return; - - intel_edp_panel_vdd_on(intel_dp); - - if (intel_dp_dpcd_read_wake(&intel_dp->aux, DP_SINK_OUI, buf, 3) == 3) - DRM_DEBUG_KMS("Sink OUI: %02hx%02hx%02hx\n", - buf[0], buf[1], buf[2]); - - if (intel_dp_dpcd_read_wake(&intel_dp->aux, DP_BRANCH_OUI, buf, 3) == 3) - DRM_DEBUG_KMS("Branch OUI: %02hx%02hx%02hx\n", - buf[0], buf[1], buf[2]); - - edp_panel_vdd_off(intel_dp, false); -} - int intel_dp_sink_crc(struct intel_dp *intel_dp, u8 *crc) { struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); @@ -3178,8 +3157,6 @@ intel_dp_detect(struct drm_connector *connector, bool force) if (status != connector_status_connected) goto out; - intel_dp_probe_oui(intel_dp); - if (intel_dp->force_audio != HDMI_AUDIO_AUTO) { intel_dp->has_audio = (intel_dp->force_audio == HDMI_AUDIO_ON); } else { -- 1.7.9.5