From patchwork Thu Mar 17 04:00:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sharma, Shashank" X-Patchwork-Id: 8607051 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6AEA0C0553 for ; Thu, 17 Mar 2016 04:00:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9696D20219 for ; Thu, 17 Mar 2016 04:00:20 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 7C05E20218 for ; Thu, 17 Mar 2016 04:00:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E473D6E2DD; Thu, 17 Mar 2016 04:00:13 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 656CC6E2DD for ; Thu, 17 Mar 2016 04:00:11 +0000 (UTC) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga101.fm.intel.com with ESMTP; 16 Mar 2016 21:00:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,348,1455004800"; d="scan'208";a="765801088" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by orsmga003.jf.intel.com with ESMTP; 16 Mar 2016 21:00:07 -0700 Received: from fmsmsx102.amr.corp.intel.com (10.18.124.200) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.248.2; Wed, 16 Mar 2016 21:00:07 -0700 Received: from bgsmsx154.gar.corp.intel.com (10.224.48.47) by FMSMSX102.amr.corp.intel.com (10.18.124.200) with Microsoft SMTP Server (TLS) id 14.3.248.2; Wed, 16 Mar 2016 21:00:07 -0700 Received: from bgsmsx101.gar.corp.intel.com ([169.254.1.90]) by BGSMSX154.gar.corp.intel.com ([169.254.7.223]) with mapi id 14.03.0248.002; Thu, 17 Mar 2016 09:30:05 +0530 From: "Sharma, Shashank" To: "intel-gfx@lists.freedesktop.org" Thread-Topic: [PATCH] drm/i915: Restrict usage of live status check Thread-Index: AQHRgAEnlVOZ4XbJF0G4F/EHW1VRhp9dAtFA Date: Thu, 17 Mar 2016 04:00:03 +0000 Message-ID: References: <8760wp8sg9.fsf@intel.com> <1458187616-8521-1-git-send-email-shashank.sharma@intel.com> In-Reply-To: <1458187616-8521-1-git-send-email-shashank.sharma@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_IC x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYmE2NTAxZGYtNzA5ZC00YzZlLWJmY2ItODU3ODQxNmQ3OWZjIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE1LjkuNi42IiwiVHJ1c3RlZExhYmVsSGFzaCI6IkFvUHlXWm53YTNkXC9VMzYrWVwvVFoxWjRvU3FjbjQxK3g3RGhYRytTS2VpND0ifQ== x-originating-ip: [10.223.10.10] MIME-Version: 1.0 Subject: [Intel-gfx] FW: [PATCH] drm/i915: Restrict usage of live status check X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP +intel-gfx Regards Shashank -----Original Message----- From: Sharma, Shashank Sent: Thursday, March 17, 2016 9:37 AM To: Jindal, Sonika; Vetter, Daniel; ville.syrjala@linux.intel.com; jani.nikula@linux.intel.com Cc: Sharma, Shashank Subject: [PATCH] drm/i915: Restrict usage of live status check This patch restricts usage of live status check for HDMI detection. While testing certain (monitor + cable) combinations with various intel platforms, it seems that live status register is not reliable on some older devices. So limit the live_status check from VLV onwards. This fixes a regression introduced in: commit: 237ed86 "drm/i915: Check live status" Author: Sonika Jindal Date: Tue Sep 15 09:44:20 2015 +0530 Signed-off-by: Shashank Sharma --- drivers/gpu/drm/i915/intel_hdmi.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) -- 1.9.1 diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index e2dab48..d24d18a 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -1397,7 +1397,8 @@ intel_hdmi_detect(struct drm_connector *connector, bool force) enum drm_connector_status status; struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector); struct drm_i915_private *dev_priv = to_i915(connector->dev); - bool live_status = false; + struct drm_device *dev = connector->dev; + bool live_status = true; unsigned int try; DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", @@ -1405,16 +1406,21 @@ intel_hdmi_detect(struct drm_connector *connector, bool force) intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS); - for (try = 0; !live_status && try < 9; try++) { - if (try) - msleep(10); - live_status = intel_digital_port_connected(dev_priv, + /* + * Live status check for HDMI detection is not very + * reliable on older platforms. So insist the live + * status check for EDID read from VLV onwards. + */ + if (INTEL_INFO(dev)->gen >= 7 && !IS_IVYBRIDGE(dev)) { + for (try = 0; !live_status && try < 9; try++) { + if (try) + msleep(10); + live_status = intel_digital_port_connected(dev_priv, hdmi_to_dig_port(intel_hdmi)); + } + DRM_DEBUG_KMS("Live status %s\n", live_status ? "up" : "down"); } - if (!live_status) - DRM_DEBUG_KMS("Live status not up!"); - intel_hdmi_unset_edid(connector); if (intel_hdmi_set_edid(connector, live_status)) {