From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2B222C433E0 for ; Thu, 25 Jun 2020 10:47:10 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0DF9720706 for ; Thu, 25 Jun 2020 10:47:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0DF9720706 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2F84F6EA4A; Thu, 25 Jun 2020 10:47:07 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0A7356EA49; Thu, 25 Jun 2020 10:47:05 +0000 (UTC) IronPort-SDR: iGOfyL34zG25t9/35F7GZGvu3aczrRRi/qBAU+ihlScSM/C1w74721ih/S+uV4M9nKUtfX+4UG 0B3yl7dpuJaQ== X-IronPort-AV: E=McAfee;i="6000,8403,9662"; a="143930611" X-IronPort-AV: E=Sophos;i="5.75,279,1589266800"; d="scan'208";a="143930611" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jun 2020 03:47:05 -0700 IronPort-SDR: btF6jUho8XetpiafJLLh8GGSORHeTir2fWMA8jwCoLnV/fAo0k7Ipqf2W6ib6oAmTfYQol0R+g EbkPwdJ4kNLA== X-IronPort-AV: E=Sophos;i="5.75,279,1589266800"; d="scan'208";a="301949687" Received: from slisovsk-lenovo-ideapad-720s-13ikb.fi.intel.com (HELO intel.com) ([10.237.72.190]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jun 2020 03:47:03 -0700 Date: Thu, 25 Jun 2020 13:46:24 +0300 From: "Lisovskiy, Stanislav" To: Maarten Lankhorst Subject: Re: [PATCH v6 3/3] drm/i915: Send hotplug event if edid had changed Message-ID: <20200625104624.GA29687@intel.com> References: <20200623185756.19502-1-kunal1.joshi@intel.com> <20200623185756.19502-4-kunal1.joshi@intel.com> <61952a12-bd15-92ce-fd81-88a35ed88acb@linux.intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <61952a12-bd15-92ce-fd81-88a35ed88acb@linux.intel.com> User-Agent: Mutt/1.9.4 (2018-02-28) X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kunal Joshi , dri-devel@lists.freedesktop.org, daniel.vetter@intel.com, arkadiusz.hiler@intel.com, Intel-gfx@lists.freedesktop.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Thu, Jun 25, 2020 at 10:36:28AM +0200, Maarten Lankhorst wrote: > Op 23-06-2020 om 20:57 schreef Kunal Joshi: > > From: Stanislav Lisovskiy > > > > Added epoch counter checking to intel_encoder_hotplug > > in order to be able process all the connector changes, > > besides connection status. Also now any change in connector > > would result in epoch counter change, so no multiple checks > > are needed. > > > > v2: Renamed change counter to epoch counter. Fixed type name. > > > > v3: Fixed rebase conflict > > > > v4: Remove duplicate drm_edid_equal checks from hdmi and dp, > > lets use only once edid property is getting updated and > > increment epoch counter from there. > > Also lets now call drm_connector_update_edid_property > > right after we get edid always to make sure there is a > > unified way to handle edid change, without having to > > change tons of source code as currently > > drm_connector_update_edid_property is called only in > > certain cases like reprobing and not right after edid is > > actually updated. > > > > v5: Fixed const modifiers, removed blank line > > > > v6: Removed drm specific part from this patch, leaving only > > i915 specific changes here. > > > > Signed-off-by: Stanislav Lisovskiy > > --- > > Much better! > > Reviewed-by: Maarten Lankhorst > > for whole series I think it had been for year in that state already :) At some point I was just distracted by some other things. Stan > > > drivers/gpu/drm/i915/display/intel_hotplug.c | 26 +++++++++++--------- > > 1 file changed, 15 insertions(+), 11 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_hotplug.c b/drivers/gpu/drm/i915/display/intel_hotplug.c > > index 2e94c1413c02..393813494523 100644 > > --- a/drivers/gpu/drm/i915/display/intel_hotplug.c > > +++ b/drivers/gpu/drm/i915/display/intel_hotplug.c > > @@ -283,6 +283,8 @@ intel_encoder_hotplug(struct intel_encoder *encoder, > > { > > struct drm_device *dev = connector->base.dev; > > enum drm_connector_status old_status; > > + u64 old_epoch_counter; > > + bool ret = false; > > > > drm_WARN_ON(dev, !mutex_is_locked(&dev->mode_config.mutex)); > > old_status = connector->base.status; > > @@ -290,17 +292,19 @@ intel_encoder_hotplug(struct intel_encoder *encoder, > > connector->base.status = > > drm_helper_probe_detect(&connector->base, NULL, false); > > > > - if (old_status == connector->base.status) > > - return INTEL_HOTPLUG_UNCHANGED; > > - > > - drm_dbg_kms(&to_i915(dev)->drm, > > - "[CONNECTOR:%d:%s] status updated from %s to %s\n", > > - connector->base.base.id, > > - connector->base.name, > > - drm_get_connector_status_name(old_status), > > - drm_get_connector_status_name(connector->base.status)); > > - > > - return INTEL_HOTPLUG_CHANGED; > > + if (old_epoch_counter != connector->base.epoch_counter) > > + ret = true; > > + > > + if(ret) { > > + DRM_DEBUG_KMS("[CONNECTOR:%d:%s] status updated from %s to %s(epoch counter %llu)\n", > > + connector->base.base.id, > > + connector->base.name, > > + drm_get_connector_status_name(old_status), > > + drm_get_connector_status_name(connector->base.status), > > + connector->base.epoch_counter); > > + return INTEL_HOTPLUG_CHANGED; > > + } > > + return INTEL_HOTPLUG_UNCHANGED; > > } > > > > static bool intel_encoder_has_hpd_pulse(struct intel_encoder *encoder) > > _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel