Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp2974589imm; Mon, 13 Aug 2018 03:57:12 -0700 (PDT) X-Google-Smtp-Source: AA+uWPzid2zHgc8C9TpvivxjGJg4gUQCXC8BI7w/jsJuhk99uGEMf0uNIamclNwDLiegFbO9NwUH X-Received: by 2002:a62:11c4:: with SMTP id 65-v6mr18540643pfr.54.1534157832262; Mon, 13 Aug 2018 03:57:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534157832; cv=none; d=google.com; s=arc-20160816; b=wN6J6sa2tHGHWogP4Ptvsqi0MgcN+wPCWPDdjVuoEId6dYirB9TZlLdeI+y1eza0Xz ByB8p+iNgl+7euRUxYOOEHL7mnoeejv02JGmzayCzZvNBWDVFcGpIrn3rQtQ2R9j//bk fum/AHSTSbLS8uzhIZXF6Zwr2sEjuI3ybez5VcJ4EfhOxbkqxKkw6f0Yc+dul1QM1C7K OaTK6tSESGC1L72evF1d3H/IhL8ZbEuVdbWBUCwok8oyOtnc4Kzk+u+Y+hlx4OSWeKYZ e0O7muBzZn9M7qjRpUvCdjKvooTTYWL0EH5Kj0a1E7UwBdCuyxmtKc9C8/aIpslBP44g dfSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :organization:references:in-reply-to:date:cc:to:reply-to:from :subject:message-id:arc-authentication-results; bh=9Uu8K3KrNJUNqabHVoMmIrM1x4juu77rvhxQxAl8qmE=; b=vvX6dbxzLCjsp4J5sOX3mL7hIvQCjhwhtaoY4b7aDaZonHR3oE54oqrKiZpuFKbCRX Ss2BXtcoMVY8OMXI6ZOE+lIBghvv/wlEnyYgQ5ghvHCgG2Czf1+0Hx2UgqvgZGsQvkkH K0HSOLlyk/L3Fj2mQjixCUMHQzO+LcdX+0ZM7nSgJeuXGmGWwBMOG9BvaPLaP5eQXq5H KFL6ysadX/5QEsIMIAxv0g1b6/8XNgG/RM1SAcFZ4aqVXbC2b+ReC3NGQYo8RiAQIFGc pQqiIjluL1G71OsQPVtAQCERSOZz9NWxg0Z80XHzF8byyi5KNobx9Fks2NBVr2WHJNLI eF5Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m124-v6si18925577pfm.303.2018.08.13.03.56.56; Mon, 13 Aug 2018 03:57:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729175AbeHMNhj (ORCPT + 99 others); Mon, 13 Aug 2018 09:37:39 -0400 Received: from mga05.intel.com ([192.55.52.43]:44882 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728443AbeHMNhi (ORCPT ); Mon, 13 Aug 2018 09:37:38 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Aug 2018 03:55:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,233,1531810800"; d="scan'208";a="62741949" Received: from sorvi.fi.intel.com ([10.237.72.167]) by fmsmga008.fm.intel.com with ESMTP; 13 Aug 2018 03:55:47 -0700 Message-ID: <1534157747.30780.19.camel@intel.com> Subject: Re: [Intel-gfx] [v3] drm/i915: Add detection of changing of edid on between suspend and resume From: Mika Kahola Reply-To: mika.kahola@intel.com To: "Lisovskiy, Stanislav" , "Mun, Gwan-gyeong" , "jani.nikula@linux.intel.com" Cc: "airlied@linux.ie" , "intel-gfx@lists.freedesktop.org" , "linux-kernel@vger.kernel.org" , "dri-devel@lists.freedesktop.org" , "Vivi, Rodrigo" Date: Mon, 13 Aug 2018 13:55:47 +0300 In-Reply-To: <919efd746382923946f9f443909cec65590ffc37.camel@intel.com> References: <20180803163453.7760-1-gwan-gyeong.mun@intel.com> <20180809111330.5113-1-gwan-gyeong.mun@intel.com> <919efd746382923946f9f443909cec65590ffc37.camel@intel.com> Organization: Intel OTC Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.18.5.2-0ubuntu3.2 Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 2018-08-10 at 13:02 +0000, Lisovskiy, Stanislav wrote: > On Thu, 2018-08-09 at 14:13 +0300, Gwan-gyeong Mun wrote: > > > > The hotplug detection routine of i915 uses > > drm_helper_hpd_irq_event(). This > > helper can detect changing of status of connector, but it can not > > detect > > changing of edid. > > > > Following scenario requires detection of changing of edid. > > > >  1) plug display device to a connector > >  2) system suspend > >  3) unplug 1)'s display device and plug the other display device to > > a > > connector > >  4) system resume > > > > It adds edid check routine when a connector status still remains as > > "connector_status_connected". > > > > v2: Add NULL check before comparing of EDIDs. > > > > Testcase: igt/kms_chamelium/hdmi-edid-change-during-hibernate > > Testcase: igt/kms_chamelium/hdmi-edid-change-during-suspend > > Testcase: igt/kms_chamelium/dp-edid-change-during-hibernate > > Testcase: igt/kms_chamelium/dp-edid-change-during-suspend > > > > Signed-off-by: Gwan-gyeong Mun > > --- > >  drivers/gpu/drm/i915/intel_hotplug.c | 84 > > +++++++++++++++++++++++++++- > >  1 file changed, 83 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_hotplug.c > > b/drivers/gpu/drm/i915/intel_hotplug.c > > index 648a13c6043c..965f2d771fc0 100644 > > --- a/drivers/gpu/drm/i915/intel_hotplug.c > > +++ b/drivers/gpu/drm/i915/intel_hotplug.c > > @@ -507,6 +507,88 @@ void intel_hpd_init(struct drm_i915_private > > *dev_priv) > >   } > >  } > >   > > +/** > > + * intel_hpd_irq_event - hotplug processing > > + * @dev: drm_device > > + * > > + * Drivers can use this function to run a detect cycle on all > > connectors which > > + * have the DRM_CONNECTOR_POLL_HPD flag set in their &polled > > member. > > All other > > + * connectors are ignored, which is useful to avoid reprobing > > fixed > > panels. > > + * > > + * This function is useful for drivers which can't or don't track > > hotplug interrupts > > + * for each connector. This function is based on > > drm_helper_hpd_irq_event() helper > > + * function and besides it adds edid check routine when a > > connector > > status still > > + * remains as "connector_status_connected". > > + * > > + * Following scenario requires detection of changing of edid. > > + *  1) plug display device to a connector > > + *  2) system suspend > > + *  3) unplug 1)'s display device and plug the other display > > device > > to a connector > > + *  4) system resume > > + > > + * This function must be called from process context with no mode > > + * setting locks held. > > + * > > + * Note that a connector can be both polled and probed from the > > hotplug handler, > > + * in case the hotplug interrupt is known to be unreliable. > > + */ > > +static bool intel_hpd_irq_event(struct drm_device *dev) > > +{ > > + struct drm_connector *connector; > > + struct drm_connector_list_iter conn_iter; > > + enum drm_connector_status old_status, cur_status; > > + struct edid *old_edid; > > + bool changed = false; > > + > > + if (!dev->mode_config.poll_enabled) > > + return false; > > + > > + mutex_lock(&dev->mode_config.mutex); > > + drm_connector_list_iter_begin(dev, &conn_iter); > > + drm_for_each_connector_iter(connector, &conn_iter) { > > + /* Only handle HPD capable connectors. */ > > + if (!(connector->polled & DRM_CONNECTOR_POLL_HPD)) > > + continue; > > + > > + old_status = connector->status; > > + old_edid = to_intel_connector(connector)- > > > > > > detect_edid; > > + > > + cur_status = drm_helper_probe_detect(connector, > > NULL, false); > > + DRM_DEBUG_KMS("[CONNECTOR:%d:%s] status updated > > from > > %s to %s\n", > > +       connector->base.id, connector->name, > > +       drm_get_connector_status_name(old_st > > at > > us), > > +       drm_get_connector_status_name(cur_st > > at > > us)); > > + > > + if (old_status != cur_status) > > + changed = true; > > + > > + /* Check changing of edid when a connector status > > still remains > > +  * as "connector_status_connected". > > +  */ > > + if (old_status == cur_status && > > +     cur_status == connector_status_connected) { > > + struct edid *cur_edid = > > to_intel_connector(connector)->detect_edid; > > + > > + if (!old_edid || !cur_edid) > > + continue; > > + > > + if (memcmp(old_edid, cur_edid, > > sizeof(*cur_edid))) { > > + changed = true; > > + DRM_DEBUG_KMS("[CONNECTOR:%d:%s] > > edid updated\n", > > +       connector->base.id, > > +       connector->name); > > + } > > + } > > + } > > + drm_connector_list_iter_end(&conn_iter); > > + mutex_unlock(&dev->mode_config.mutex); > > + > > + if (changed) > > + drm_kms_helper_hotplug_event(dev); > > + > > + return changed; > > +} > > + > >  static void i915_hpd_poll_init_work(struct work_struct *work) > >  { > >   struct drm_i915_private *dev_priv = > > @@ -552,7 +634,7 @@ static void i915_hpd_poll_init_work(struct > > work_struct *work) > >    * in the middle of disabling polling > >    */ > >   if (!enabled) > > - drm_helper_hpd_irq_event(dev); > > + intel_hpd_irq_event(dev); > >  } > Just wondering, as I saw previously drm_helper_hpd_irq_event function > was used, which basically does the same thing, except doing memcmp > for detecting the edid change. Is it only Intel specific change? As > we > could just add this modification to existing helper function or add > another helper function to the drm (drm_probe_helper.c), so that it > is > also usable elsewhere.. I second Stanislav's proposal to add this feature as part of drm. This edid check could be part of existing drm_helper_hpd_irq_event() function. Other drivers might find this change useful. > > > > >   > >  /** > --  > Best Regards, > > Lisovskiy Stanislav > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Mika Kahola - Intel OTC