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=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham 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 A829CC3F68F for ; Tue, 11 Feb 2020 13:55:52 +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 896522173E for ; Tue, 11 Feb 2020 13:55:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 896522173E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 031D26EA78; Tue, 11 Feb 2020 13:55:52 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8BF556EA78 for ; Tue, 11 Feb 2020 13:55:50 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Feb 2020 05:55:49 -0800 X-IronPort-AV: E=Sophos;i="5.70,428,1574150400"; d="scan'208";a="237401399" Received: from jnikula-mobl3.fi.intel.com (HELO localhost) ([10.237.66.161]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Feb 2020 05:55:47 -0800 From: Jani Nikula To: "Lisovskiy\, Stanislav" , "intel-gfx\@lists.freedesktop.org" In-Reply-To: <713d424e3ab55716b9f475ee0453dc3e4848e226.camel@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20200211114038.21035-1-stanislav.lisovskiy@intel.com> <87zhdpz35z.fsf@intel.com> <713d424e3ab55716b9f475ee0453dc3e4848e226.camel@intel.com> Date: Tue, 11 Feb 2020 15:55:45 +0200 Message-ID: <87r1z1z0ri.fsf@intel.com> MIME-Version: 1.0 Subject: Re: [Intel-gfx] [PATCH v1] drm/i915: Call intel_edp_init_connector only for eDP. X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Tue, 11 Feb 2020, "Lisovskiy, Stanislav" wrote: > On Tue, 2020-02-11 at 15:03 +0200, Jani Nikula wrote: >> On Tue, 11 Feb 2020, Stanislav Lisovskiy < >> stanislav.lisovskiy@intel.com> wrote: >> > I guess it would still be nice to make the code less confusing >> > and do not call eDP specific function, for non-eDP connectors >> > just to immediately return true(success) value as a hack. >> > >> > So simply extracted that check out from this function, >> > that we simply don't call it for non-eDP connectors. Bingo. >> >> Fair enough, I guess... >> >> Though I could be persuaded to take a patch for the reverse, because >> generally we prefer localized knowledge in the callee than in a >> potentially irrelevant place in the caller. >> >> Consider the intel_dp_mst_encoder_init() call in the context of this >> patch. We call it, and the function itself decides whether MST init >> is >> relevant or not. But I presume you wouldn't suggest pulling in all >> the >> conditions from there one level higher? >> >> Would your opinion on intel_edp_init_connector() be different if the >> conditions were more than just the single intel_dp_is_edp()? Or if we >> moved all of eDP support to a separate file? > > Well, to me at least intel_edp_init_connector means that we are going > to init an eDP connector, which already assumes that, we already should > know that this is an eDP connector :) > Otherwise it should have somewhat different name, not saying that this > is the best philosophy, but generally I would prefer the functions to > be solely responsible for a single thing so that that init function is > supposed to do only init, but not also some detection/checking or any > other side effects. > > So that there is a clear visibility what we are doing, if it's an init > then we really do only init or if we supposed to detect something > first, let it be a separate thing.. > > Also this uses a return value in confusing way, i.e returning "Success" > status for non-eDP from intel_edp_init_connector seems kind of > confusing. Again, how is this different from intel_dp_mst_encoder_init()? With the *exactly* same rationale you'd end up with this: if (HAS_DP_MST(i915) && !intel_dp_is_edp(intel_dp)) && !(INTEL_GEN(i915) < 12 && port == PORT_A) && !(INTEL_GEN(i915) < 11 && port == PORT_E)) intel_dp_mst_encoder_init(intel_dig_port, intel_connector->base.base.id); Surely the information is better localized in a SPOT in the MST code? BR, Jani. > > Stan > >> >> BR, >> Jani. >> >> >> > >> > Signed-off-by: Stanislav Lisovskiy >> > --- >> > drivers/gpu/drm/i915/display/intel_dp.c | 13 ++++++------- >> > 1 file changed, 6 insertions(+), 7 deletions(-) >> > >> > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c >> > b/drivers/gpu/drm/i915/display/intel_dp.c >> > index f4dede6253f8..9bd36197a43d 100644 >> > --- a/drivers/gpu/drm/i915/display/intel_dp.c >> > +++ b/drivers/gpu/drm/i915/display/intel_dp.c >> > @@ -7370,9 +7370,6 @@ static bool intel_edp_init_connector(struct >> > intel_dp *intel_dp, >> > intel_wakeref_t wakeref; >> > struct edid *edid; >> > >> > - if (!intel_dp_is_edp(intel_dp)) >> > - return true; >> > - >> > INIT_DELAYED_WORK(&intel_dp->panel_vdd_work, >> > edp_panel_vdd_work); >> > >> > /* >> > @@ -7590,10 +7587,12 @@ intel_dp_init_connector(struct >> > intel_digital_port *intel_dig_port, >> > intel_dp_mst_encoder_init(intel_dig_port, >> > intel_connector->base.base.id); >> > >> > - if (!intel_edp_init_connector(intel_dp, intel_connector)) { >> > - intel_dp_aux_fini(intel_dp); >> > - intel_dp_mst_encoder_cleanup(intel_dig_port); >> > - goto fail; >> > + if (intel_dp_is_edp(intel_dp)) { >> > + if (!intel_edp_init_connector(intel_dp, >> > intel_connector)) { >> > + intel_dp_aux_fini(intel_dp); >> > + intel_dp_mst_encoder_cleanup(intel_dig_port); >> > + goto fail; >> > + } >> > } >> > >> > intel_dp_add_properties(intel_dp, connector); >> >> -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx