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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 82103E7D270 for ; Tue, 26 Sep 2023 09:39:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 11EC110E386; Tue, 26 Sep 2023 09:39:54 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0CBCB10E386 for ; Tue, 26 Sep 2023 09:39:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695721192; x=1727257192; h=from:to:subject:in-reply-to:references:date:message-id: mime-version; bh=MK5VG6Il3l5XtUjrZ3NZCekxN4G/GjeSrpB5JNVoLzo=; b=bG+d0Sgdu1pOcRc/LXkJ3N9qRytOPHymfrWvUmTNNfuSyx0aBcm6yje3 1BOBm1UFKKvn3OQskeB7zQ+QzzURiZGd2OZYpAXLe0Zjeebyn++D9lk0p iXcC1Ivwm9ABxhOtpvecQZwk1vmmno+1MaSmIPlT9bLJuD++E/BpImcb+ MiDhPAGcSeKC4HHqlFnkF4iaBSuNV/7ybNqBGwZBLFyEiq53zKT+Gyt59 K3YW7FK8vTzr8RYCYtHitA8E7gQSC4XKegez9AOMr1RZHT0iYulzWZn1j eNwI5EJn+r+dpbRIgeonNhhF4adupmb2Z4/ScjJkkW4LnodAoLrBbqQj2 A==; X-IronPort-AV: E=McAfee;i="6600,9927,10843"; a="371862870" X-IronPort-AV: E=Sophos;i="6.03,177,1694761200"; d="scan'208";a="371862870" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Sep 2023 02:38:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.03,177,1694761200"; d="scan'208";a="89927" Received: from wagnert-mobl2.ger.corp.intel.com (HELO localhost) ([10.252.52.202]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Sep 2023 02:37:55 -0700 From: Jani Nikula To: Andrzej Hajda , intel-gfx@lists.freedesktop.org In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20230922105645.3991066-1-jani.nikula@intel.com> Date: Tue, 26 Sep 2023 12:38:22 +0300 Message-ID: <87sf71l1f5.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Intel-gfx] [PATCH] drm/i915/dp: refactor aux_ch_name() 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Tue, 26 Sep 2023, Andrzej Hajda wrote: > On 22.09.2023 12:56, Jani Nikula wrote: >> Convert aux_ch_name() to a helper that prints a string to a caller >> provided buffer, and use it to get more consistent aux channel >> debugs. Now that all users of aux_ch_name() are in intel_dp_aux.c, we >> can make it static too. >> >> Signed-off-by: Jani Nikula >> --- >> drivers/gpu/drm/i915/display/intel_display.h | 2 - >> drivers/gpu/drm/i915/display/intel_dp_aux.c | 41 ++++++++++++-------- >> 2 files changed, 25 insertions(+), 18 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h >> index 49ac8473b988..9f252d1f03a7 100644 >> --- a/drivers/gpu/drm/i915/display/intel_display.h >> +++ b/drivers/gpu/drm/i915/display/intel_display.h >> @@ -190,8 +190,6 @@ enum aux_ch { >> AUX_CH_E_XELPD, >> }; >> >> -#define aux_ch_name(a) ((a) + 'A') >> - >> enum phy { >> PHY_NONE = -1, >> >> diff --git a/drivers/gpu/drm/i915/display/intel_dp_aux.c b/drivers/gpu/drm/i915/display/intel_dp_aux.c >> index b90cad7f567b..4431b6290c4c 100644 >> --- a/drivers/gpu/drm/i915/display/intel_dp_aux.c >> +++ b/drivers/gpu/drm/i915/display/intel_dp_aux.c >> @@ -14,6 +14,21 @@ >> #include "intel_pps.h" >> #include "intel_tc.h" >> >> +#define AUX_CH_NAME_BUFSIZE 6 >> + >> +static const char *aux_ch_name(struct drm_i915_private *i915, >> + char *buf, int size, enum aux_ch aux_ch) >> +{ >> + if (DISPLAY_VER(i915) >= 13 && aux_ch >= AUX_CH_D_XELPD) >> + snprintf(buf, size, "%c", 'A' + aux_ch - AUX_CH_D_XELPD + AUX_CH_D); >> + else if (DISPLAY_VER(i915) >= 12 && aux_ch >= AUX_CH_USBC1) >> + snprintf(buf, size, "USBC%c", '1' + aux_ch - AUX_CH_USBC1); >> + else >> + snprintf(buf, size, "%c", 'A' + aux_ch); >> + >> + return buf; >> +} >> + >> u32 intel_dp_aux_pack(const u8 *src, int src_bytes) >> { >> int i; >> @@ -728,6 +743,7 @@ void intel_dp_aux_init(struct intel_dp *intel_dp) >> struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); >> struct intel_encoder *encoder = &dig_port->base; >> enum aux_ch aux_ch = dig_port->aux_ch; >> + char buf[AUX_CH_NAME_BUFSIZE]; >> >> if (DISPLAY_VER(dev_priv) >= 14) { >> intel_dp->aux_ch_ctl_reg = xelpdp_aux_ctl_reg; >> @@ -764,18 +780,9 @@ void intel_dp_aux_init(struct intel_dp *intel_dp) >> drm_dp_aux_init(&intel_dp->aux); >> >> /* Failure to allocate our preferred name is not critical */ >> - if (DISPLAY_VER(dev_priv) >= 13 && aux_ch >= AUX_CH_D_XELPD) >> - intel_dp->aux.name = kasprintf(GFP_KERNEL, "AUX %c/%s", >> - aux_ch_name(aux_ch - AUX_CH_D_XELPD + AUX_CH_D), >> - encoder->base.name); >> - else if (DISPLAY_VER(dev_priv) >= 12 && aux_ch >= AUX_CH_USBC1) >> - intel_dp->aux.name = kasprintf(GFP_KERNEL, "AUX USBC%c/%s", >> - aux_ch - AUX_CH_USBC1 + '1', >> - encoder->base.name); >> - else >> - intel_dp->aux.name = kasprintf(GFP_KERNEL, "AUX %c/%s", >> - aux_ch_name(aux_ch), >> - encoder->base.name); >> + intel_dp->aux.name = kasprintf(GFP_KERNEL, "AUX %s/%s", >> + aux_ch_name(dev_priv, buf, sizeof(buf), aux_ch), >> + encoder->base.name); > > With define like: > > #define aux_ch_name_smart(dev_priv, aux_ch) aux_ch_name(dev_priv, > (char[AUX_CH_NAME_BUFSIZE]){}, AUX_CH_NAME_BUFSIZE, aux_ch) > > you could get rid of local variable buf, and two extra arguments in > call. The price is gcc macro magic and maybe less visible life-time > constraints, no strong suggestion :) Thanks for the suggestion. If this was more widely used, I'd consider it, but I it's think too much magic for a simple localized thing here. > Reviewed-by: Andrzej Hajda Thanks, pushed to drm-intel-next. BR, Jani. > > Regards > Andrzej > > >> >> intel_dp->aux.transfer = intel_dp_aux_transfer; >> cpu_latency_qos_add_request(&intel_dp->pm_qos, PM_QOS_DEFAULT_VALUE); >> @@ -819,6 +826,7 @@ enum aux_ch intel_dp_aux_ch(struct intel_encoder *encoder) >> struct intel_encoder *other; >> const char *source; >> enum aux_ch aux_ch; >> + char buf[AUX_CH_NAME_BUFSIZE]; >> >> aux_ch = intel_bios_dp_aux_ch(encoder->devdata); >> source = "VBT"; >> @@ -836,16 +844,17 @@ enum aux_ch intel_dp_aux_ch(struct intel_encoder *encoder) >> other = get_encoder_by_aux_ch(encoder, aux_ch); >> if (other) { >> drm_dbg_kms(&i915->drm, >> - "[ENCODER:%d:%s] AUX CH %c already claimed by [ENCODER:%d:%s]\n", >> - encoder->base.base.id, encoder->base.name, aux_ch_name(aux_ch), >> + "[ENCODER:%d:%s] AUX CH %s already claimed by [ENCODER:%d:%s]\n", >> + encoder->base.base.id, encoder->base.name, >> + aux_ch_name(i915, buf, sizeof(buf), aux_ch), >> other->base.base.id, other->base.name); >> return AUX_CH_NONE; >> } >> >> drm_dbg_kms(&i915->drm, >> - "[ENCODER:%d:%s] Using AUX CH %c (%s)\n", >> + "[ENCODER:%d:%s] Using AUX CH %s (%s)\n", >> encoder->base.base.id, encoder->base.name, >> - aux_ch_name(aux_ch), source); >> + aux_ch_name(i915, buf, sizeof(buf), aux_ch), source); >> >> return aux_ch; >> } > -- Jani Nikula, Intel