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 00583C636CC for ; Wed, 15 Feb 2023 10:02:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7D0AE10EA86; Wed, 15 Feb 2023 10:02:48 +0000 (UTC) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7180610EA86 for ; Wed, 15 Feb 2023 10:02:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1676455366; x=1707991366; h=from:to:subject:in-reply-to:references:date:message-id: mime-version:content-transfer-encoding; bh=1Szywpf8be66boEhOEytor12fGpu4wlWdBB7PM/K+qM=; b=ME1nYEyiIrqgadxg7TqAxA1XGdwk6iP7N4bJFLBEAPXKqhHRWwQI5Bax iww/P89qjegXfuX/7m8zVNuIp0EwSua1bFcd2M/en+6N6Mh6RpgdGeusx liLSaRIUC0k7ziZsxaDkI8HEsTA1/3wDA2k3pEzUXTHtOgkFhyyI//65b uvTy7H3sp0z8q7xxFYr4lnN9+BAnLq3rF/QidLRz0dGtYNHgkrG3/WP5G zuDa5wwTrcBe32EV+eCQk1wXYmO1P35qZljsfOzYxxb6CQEn4jCh9Ue54 EhAKSZc4jTExqOLGPIe+MryOH3Wkju05ev0oe9YrSRbaJRM0ZwJkYjMlx w==; X-IronPort-AV: E=McAfee;i="6500,9779,10621"; a="396012282" X-IronPort-AV: E=Sophos;i="5.97,299,1669104000"; d="scan'208";a="396012282" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2023 02:02:45 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10621"; a="662863297" X-IronPort-AV: E=Sophos;i="5.97,299,1669104000"; d="scan'208";a="662863297" Received: from gchung-mobl.gar.corp.intel.com (HELO localhost) ([10.252.51.244]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2023 02:02:43 -0800 From: Jani Nikula To: Ville Syrjala , intel-gfx@lists.freedesktop.org In-Reply-To: <20230214231925.26535-1-ville.syrjala@linux.intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20230214231925.26535-1-ville.syrjala@linux.intel.com> Date: Wed, 15 Feb 2023 12:02:41 +0200 Message-ID: <875yc3s0u6.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Intel-gfx] [PATCH 1/3] drm/i915: Use encoder->devdata more 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 Wed, 15 Feb 2023, Ville Syrjala wrote: > From: Ville Syrj=C3=A4l=C3=A4 > > Switch a lot of the intel_bios_foo() stuff to just accept the > devdata (VBT child device info) directly, instead of taking > detours via vbt.ports[]. > > Also unify the function naming scheme. > > TODO: is intel_bios_encoder_{dp,hdmi}_ too much? Or should we > shorten to just intel_bios_{dp,hdmi}_ ? I think I added encoder in the name to distinguish from the old stuff, but if everything's going to be based on encoder->devdata, I don't see what the point is. Could just shorten it I guess? BR, Jani. > > Signed-off-by: Ville Syrj=C3=A4l=C3=A4 > --- > drivers/gpu/drm/i915/display/intel_bios.c | 54 +++++------------------ > drivers/gpu/drm/i915/display/intel_bios.h | 15 ++++--- > drivers/gpu/drm/i915/display/intel_ddi.c | 2 +- > drivers/gpu/drm/i915/display/intel_dp.c | 4 +- > drivers/gpu/drm/i915/display/intel_hdmi.c | 4 +- > 5 files changed, 23 insertions(+), 56 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/= i915/display/intel_bios.c > index 229f9782e226..22bbbca171dc 100644 > --- a/drivers/gpu/drm/i915/display/intel_bios.c > +++ b/drivers/gpu/drm/i915/display/intel_bios.c > @@ -2520,7 +2520,7 @@ static int parse_bdb_216_dp_max_link_rate(const int= vbt_max_link_rate) > } > } >=20=20 > -static int _intel_bios_dp_max_link_rate(const struct intel_bios_encoder_= data *devdata) > +int intel_bios_encoder_dp_max_link_rate(const struct intel_bios_encoder_= data *devdata) > { > if (!devdata || devdata->i915->display.vbt.version < 216) > return 0; > @@ -2531,7 +2531,7 @@ static int _intel_bios_dp_max_link_rate(const struc= t intel_bios_encoder_data *de > return parse_bdb_216_dp_max_link_rate(devdata->child.dp_max_link_rate); > } >=20=20 > -static int _intel_bios_dp_max_lane_count(const struct intel_bios_encoder= _data *devdata) > +int intel_bios_encoder_dp_max_lane_count(const struct intel_bios_encoder= _data *devdata) > { > if (!devdata || devdata->i915->display.vbt.version < 244) > return 0; > @@ -2604,7 +2604,8 @@ intel_bios_encoder_is_lspcon(const struct intel_bio= s_encoder_data *devdata) > return devdata && HAS_LSPCON(devdata->i915) && devdata->child.lspcon; > } >=20=20 > -static int _intel_bios_hdmi_level_shift(const struct intel_bios_encoder_= data *devdata) > +/* This is an index in the HDMI/DVI DDI buffer translation table, or -1 = */ > +int intel_bios_encoder_hdmi_level_shift(const struct intel_bios_encoder_= data *devdata) > { > if (!devdata || devdata->i915->display.vbt.version < 158) > return -1; > @@ -2612,7 +2613,7 @@ static int _intel_bios_hdmi_level_shift(const struc= t intel_bios_encoder_data *de > return devdata->child.hdmi_level_shifter_value; > } >=20=20 > -static int _intel_bios_max_tmds_clock(const struct intel_bios_encoder_da= ta *devdata) > +int intel_bios_encoder_hdmi_max_tmds_clock(const struct intel_bios_encod= er_data *devdata) > { > if (!devdata || devdata->i915->display.vbt.version < 204) > return 0; > @@ -2674,14 +2675,14 @@ static void print_ddi_port(const struct intel_bio= s_encoder_data *devdata, > supports_typec_usb, supports_tbt, > devdata->dsc !=3D NULL); >=20=20 > - hdmi_level_shift =3D _intel_bios_hdmi_level_shift(devdata); > + hdmi_level_shift =3D intel_bios_encoder_hdmi_level_shift(devdata); > if (hdmi_level_shift >=3D 0) { > drm_dbg_kms(&i915->drm, > "Port %c VBT HDMI level shift: %d\n", > port_name(port), hdmi_level_shift); > } >=20=20 > - max_tmds_clock =3D _intel_bios_max_tmds_clock(devdata); > + max_tmds_clock =3D intel_bios_encoder_hdmi_max_tmds_clock(devdata); > if (max_tmds_clock) > drm_dbg_kms(&i915->drm, > "Port %c VBT HDMI max TMDS clock: %d kHz\n", > @@ -2700,7 +2701,7 @@ static void print_ddi_port(const struct intel_bios_= encoder_data *devdata, > "Port %c VBT HDMI boost level: %d\n", > port_name(port), hdmi_boost_level); >=20=20 > - dp_max_link_rate =3D _intel_bios_dp_max_link_rate(devdata); > + dp_max_link_rate =3D intel_bios_encoder_dp_max_link_rate(devdata); > if (dp_max_link_rate) > drm_dbg_kms(&i915->drm, > "Port %c VBT DP max link rate: %d\n", > @@ -3665,22 +3666,6 @@ enum aux_ch intel_bios_port_aux_ch(struct drm_i915= _private *i915, > return aux_ch; > } >=20=20 > -int intel_bios_max_tmds_clock(struct intel_encoder *encoder) > -{ > - struct drm_i915_private *i915 =3D to_i915(encoder->base.dev); > - const struct intel_bios_encoder_data *devdata =3D i915->display.vbt.por= ts[encoder->port]; > - > - return _intel_bios_max_tmds_clock(devdata); > -} > - > -/* This is an index in the HDMI/DVI DDI buffer translation table, or -1 = */ > -int intel_bios_hdmi_level_shift(struct intel_encoder *encoder) > -{ > - struct drm_i915_private *i915 =3D to_i915(encoder->base.dev); > - const struct intel_bios_encoder_data *devdata =3D i915->display.vbt.por= ts[encoder->port]; > - > - return _intel_bios_hdmi_level_shift(devdata); > -} >=20=20 > int intel_bios_encoder_dp_boost_level(const struct intel_bios_encoder_da= ta *devdata) > { > @@ -3698,31 +3683,12 @@ int intel_bios_encoder_hdmi_boost_level(const str= uct intel_bios_encoder_data *de > return translate_iboost(devdata->child.hdmi_iboost_level); > } >=20=20 > -int intel_bios_dp_max_link_rate(struct intel_encoder *encoder) > +int intel_bios_encoder_hdmi_ddc_pin(const struct intel_bios_encoder_data= *devdata) > { > - struct drm_i915_private *i915 =3D to_i915(encoder->base.dev); > - const struct intel_bios_encoder_data *devdata =3D i915->display.vbt.por= ts[encoder->port]; > - > - return _intel_bios_dp_max_link_rate(devdata); > -} > - > -int intel_bios_dp_max_lane_count(struct intel_encoder *encoder) > -{ > - struct drm_i915_private *i915 =3D to_i915(encoder->base.dev); > - const struct intel_bios_encoder_data *devdata =3D i915->display.vbt.por= ts[encoder->port]; > - > - return _intel_bios_dp_max_lane_count(devdata); > -} > - > -int intel_bios_alternate_ddc_pin(struct intel_encoder *encoder) > -{ > - struct drm_i915_private *i915 =3D to_i915(encoder->base.dev); > - const struct intel_bios_encoder_data *devdata =3D i915->display.vbt.por= ts[encoder->port]; > - > if (!devdata || !devdata->child.ddc_pin) > return 0; >=20=20 > - return map_ddc_pin(i915, devdata->child.ddc_pin); > + return map_ddc_pin(devdata->i915, devdata->child.ddc_pin); > } >=20=20 > bool intel_bios_encoder_supports_typec_usb(const struct intel_bios_encod= er_data *devdata) > diff --git a/drivers/gpu/drm/i915/display/intel_bios.h b/drivers/gpu/drm/= i915/display/intel_bios.h > index 1a6ae38bd4f6..0ce7ed7f28c9 100644 > --- a/drivers/gpu/drm/i915/display/intel_bios.h > +++ b/drivers/gpu/drm/i915/display/intel_bios.h > @@ -254,11 +254,6 @@ enum aux_ch intel_bios_port_aux_ch(struct drm_i915_p= rivate *i915, > bool intel_bios_get_dsc_params(struct intel_encoder *encoder, > struct intel_crtc_state *crtc_state, > int dsc_max_bpc); > -int intel_bios_max_tmds_clock(struct intel_encoder *encoder); > -int intel_bios_hdmi_level_shift(struct intel_encoder *encoder); > -int intel_bios_dp_max_link_rate(struct intel_encoder *encoder); > -int intel_bios_dp_max_lane_count(struct intel_encoder *encoder); > -int intel_bios_alternate_ddc_pin(struct intel_encoder *encoder); > bool intel_bios_port_supports_typec_usb(struct drm_i915_private *i915, e= num port port); > bool intel_bios_port_supports_tbt(struct drm_i915_private *i915, enum po= rt port); >=20=20 > @@ -272,9 +267,15 @@ bool intel_bios_encoder_supports_edp(const struct in= tel_bios_encoder_data *devda > bool intel_bios_encoder_supports_typec_usb(const struct intel_bios_encod= er_data *devdata); > bool intel_bios_encoder_supports_tbt(const struct intel_bios_encoder_dat= a *devdata); > bool intel_bios_encoder_is_lspcon(const struct intel_bios_encoder_data *= devdata); > -int intel_bios_encoder_dp_boost_level(const struct intel_bios_encoder_da= ta *devdata); > -int intel_bios_encoder_hdmi_boost_level(const struct intel_bios_encoder_= data *devdata); > bool intel_bios_encoder_lane_reversal(const struct intel_bios_encoder_da= ta *devdata); > bool intel_bios_encoder_hpd_invert(const struct intel_bios_encoder_data = *devdata); > +int intel_bios_encoder_dp_boost_level(const struct intel_bios_encoder_da= ta *devdata); > +int intel_bios_encoder_dp_max_link_rate(const struct intel_bios_encoder_= data *devdata); > +int intel_bios_encoder_dp_max_lane_count(const struct intel_bios_encoder= _data *devdata); > +int intel_bios_encoder_hdmi_boost_level(const struct intel_bios_encoder_= data *devdata); > +int intel_bios_encoder_hdmi_max_tmds_clock(const struct intel_bios_encod= er_data *devdata); > +int intel_bios_encoder_hdmi_boost_level(const struct intel_bios_encoder_= data *devdata); > +int intel_bios_encoder_hdmi_level_shift(const struct intel_bios_encoder_= data *devdata); > +int intel_bios_encoder_hdmi_ddc_pin(const struct intel_bios_encoder_data= *devdata); >=20=20 > #endif /* _INTEL_BIOS_H_ */ > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i= 915/display/intel_ddi.c > index bfd1e30a27b4..655309ff5b55 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > @@ -89,7 +89,7 @@ static int intel_ddi_hdmi_level(struct intel_encoder *e= ncoder, > { > int level; >=20=20 > - level =3D intel_bios_hdmi_level_shift(encoder); > + level =3D intel_bios_encoder_hdmi_level_shift(encoder->devdata); > if (level < 0) > level =3D trans->hdmi_default_entry; >=20=20 > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i9= 15/display/intel_dp.c > index b92e0b0f5369..7fd4c5ccf7e5 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -288,7 +288,7 @@ static int intel_dp_max_common_rate(struct intel_dp *= intel_dp) >=20=20 > static int intel_dp_max_source_lane_count(struct intel_digital_port *dig= _port) > { > - int vbt_max_lanes =3D intel_bios_dp_max_lane_count(&dig_port->base); > + int vbt_max_lanes =3D intel_bios_encoder_dp_max_lane_count(dig_port->ba= se.devdata); > int max_lanes =3D dig_port->max_lanes; >=20=20 > if (vbt_max_lanes) > @@ -425,7 +425,7 @@ static int vbt_max_link_rate(struct intel_dp *intel_d= p) > struct intel_encoder *encoder =3D &dp_to_dig_port(intel_dp)->base; > int max_rate; >=20=20 > - max_rate =3D intel_bios_dp_max_link_rate(encoder); > + max_rate =3D intel_bios_encoder_dp_max_link_rate(encoder->devdata); >=20=20 > if (intel_dp_is_edp(intel_dp)) { > struct intel_connector *connector =3D intel_dp->attached_connector; > diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/= i915/display/intel_hdmi.c > index 619865b45eca..07a1495bd55f 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdmi.c > +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c > @@ -1795,7 +1795,7 @@ static int intel_hdmi_source_max_tmds_clock(struct = intel_encoder *encoder) > else > max_tmds_clock =3D 165000; >=20=20 > - vbt_max_tmds_clock =3D intel_bios_max_tmds_clock(encoder); > + vbt_max_tmds_clock =3D intel_bios_encoder_hdmi_max_tmds_clock(encoder->= devdata); > if (vbt_max_tmds_clock) > max_tmds_clock =3D min(max_tmds_clock, vbt_max_tmds_clock); >=20=20 > @@ -2871,7 +2871,7 @@ static u8 intel_hdmi_ddc_pin(struct intel_encoder *= encoder) > enum port port =3D encoder->port; > u8 ddc_pin; >=20=20 > - ddc_pin =3D intel_bios_alternate_ddc_pin(encoder); > + ddc_pin =3D intel_bios_encoder_hdmi_ddc_pin(encoder->devdata); > if (ddc_pin) { > drm_dbg_kms(&dev_priv->drm, > "Using DDC pin 0x%x for port %c (VBT)\n", --=20 Jani Nikula, Intel Open Source Graphics Center