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 E4586C4707B for ; Thu, 18 Jan 2024 11:53:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 52A8110E799; Thu, 18 Jan 2024 11:53:47 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9506710E799 for ; Thu, 18 Jan 2024 11:53: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=1705578827; x=1737114827; h=from:to:subject:in-reply-to:references:date:message-id: mime-version:content-transfer-encoding; bh=HCRXbY1p4d869n01FREcSxDHA9REkniZ14UouyNDh7Q=; b=ZbWxTLZc/wkuk2HVZATfsNd13ovCJ2QFmAMc6eQcE54qdKqsMW6V8a8p WZBEEkfsYnh6KOSyIvRPB/Firl8RSxZMYkEg+Bd3pzfRNFtadcZ3c/ZJH ZAEFnOJK2xiAM6SWTB57tkDBAiFNAVIaqRdgcOiN9AaMUL84GMAm2vsj/ p30A7LL1dxNFJrU3qmicDflt81EZGPD4Xm3qk/AzBtq7VkvAfoPJnSZQu FkaFYFvP8BdV1olhd5HieOrdVLJhFq6pwZjAf15s2AD+NgIopmWMk2IQG nzGVcQS2yp6h9SWbBR2s74tYro5OmqF3kbb9aqKkAH+3er8NEc1/BnSnn A==; X-IronPort-AV: E=McAfee;i="6600,9927,10956"; a="13941034" X-IronPort-AV: E=Sophos;i="6.05,201,1701158400"; d="scan'208";a="13941034" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jan 2024 03:53:46 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.05,201,1701158400"; d="scan'208";a="26750316" Received: from amilburn-mobl.ger.corp.intel.com (HELO localhost) ([10.252.57.18]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jan 2024 03:53:43 -0800 From: Jani Nikula To: Stanislav Lisovskiy , intel-gfx@lists.freedesktop.org Subject: Re: [PATCH 1/3] drm/i915: Add bigjoiner force enable option to debugfs In-Reply-To: <20240118110205.15787-1-stanislav.lisovskiy@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20240108120725.20057-2-stanislav.lisovskiy@intel.com> <20240118110205.15787-1-stanislav.lisovskiy@intel.com> Date: Thu, 18 Jan 2024 13:53:41 +0200 Message-ID: <87h6jaq2m2.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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 Thu, 18 Jan 2024, Stanislav Lisovskiy wr= ote: > For validation purposes, it might be useful to be able to > force Bigjoiner mode, even if current dotclock/resolution > do not require that. > Lets add such to option to debugfs. > > v2: - Apparently intel_dp_need_bigjoiner can't be used, when > debugfs entry is created so lets just check manually > the DISPLAY_VER. > > v3: - Switch to intel_connector from drm_connector(Jani Nikula) > - Remove redundant modeset lock(Jani Nikula) > - Use kstrtobool_from_user for boolean value(Jani Nikula) > > v4: - Apply the changes to proper function(Jani Nikula) > > v5: - Removed unnecessary check from i915_bigjoiner_enable_show > (Ville Syrj=C3=A4l=C3=A4) > - Added eDP connector check to intel_connector_debugfs_add > (Ville Syrj=C3=A4l=C3=A4) > - Removed debug message in order to prevent dmesg flooding > (Ville Syrj=C3=A4l=C3=A4) > > v6: - Assume now always that m->private is intel_connector > - Fixed other similar conflicts > > v7: - Move bigjoiner force option to intel_connector(Ville Syrj=C3=A4l=C3= =A4) > - Use DEFINE_SHOW_STORE_ATTRIBUTE instead of defining fops > manually.(Ville Syrj=C3=A4l=C3=A4) > > Signed-off-by: Stanislav Lisovskiy > --- > .../drm/i915/display/intel_display_debugfs.c | 47 +++++++++++++++++++ > .../drm/i915/display/intel_display_types.h | 2 + > drivers/gpu/drm/i915/display/intel_dp.c | 4 +- > 3 files changed, 52 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drive= rs/gpu/drm/i915/display/intel_display_debugfs.c > index d951edb366871..ff0c7dfae89a3 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c > +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > @@ -1413,6 +1413,20 @@ out: drm_modeset_unlock(&i915->drm.mode_config.con= nection_mutex); > return ret; > } >=20=20 > +static int i915_bigjoiner_enable_show(struct seq_file *m, void *data) > +{ > + struct intel_connector *connector =3D m->private; > + struct drm_crtc *crtc; > + > + crtc =3D connector->base.state->crtc; > + if (connector->base.status !=3D connector_status_connected || !crtc) > + return -ENODEV; > + > + seq_printf(m, "Bigjoiner enable: %d\n", connector->force_bigjoiner_enab= le); > + > + return 0; > +} > + > static ssize_t i915_dsc_output_format_write(struct file *file, > const char __user *ubuf, > size_t len, loff_t *offp) > @@ -1434,6 +1448,30 @@ static ssize_t i915_dsc_output_format_write(struct= file *file, > return len; > } >=20=20 > +static ssize_t i915_bigjoiner_enable_write(struct file *file, > + const char __user *ubuf, > + size_t len, loff_t *offp) > +{ > + struct seq_file *m =3D file->private_data; > + struct intel_connector *connector =3D m->private; > + struct drm_crtc *crtc; > + bool bigjoiner_en =3D 0; > + int ret; > + > + crtc =3D connector->base.state->crtc; > + if (connector->base.status !=3D connector_status_connected || !crtc) > + return -ENODEV; > + > + ret =3D kstrtobool_from_user(ubuf, len, &bigjoiner_en); > + if (ret < 0) > + return ret; > + > + connector->force_bigjoiner_enable =3D bigjoiner_en; > + *offp +=3D len; > + > + return len; > +} > + > static int i915_dsc_output_format_open(struct inode *inode, > struct file *file) > { > @@ -1527,6 +1565,8 @@ static const struct file_operations i915_dsc_fracti= onal_bpp_fops =3D { > .write =3D i915_dsc_fractional_bpp_write > }; >=20=20 > +DEFINE_SHOW_STORE_ATTRIBUTE(i915_bigjoiner_enable); > + > /* > * Returns the Current CRTC's bpc. > * Example usage: cat /sys/kernel/debug/dri/0/crtc-0/i915_current_bpc > @@ -1608,6 +1648,13 @@ void intel_connector_debugfs_add(struct intel_conn= ector *connector) > connector, &i915_dsc_fractional_bpp_fops); > } >=20=20 > + if (DISPLAY_VER(i915) >=3D 11 && > + (connector_type =3D=3D DRM_MODE_CONNECTOR_DisplayPort || > + connector_type =3D=3D DRM_MODE_CONNECTOR_eDP)) { > + debugfs_create_file("i915_bigjoiner_force_enable", 0644, root, > + &connector->base, &i915_bigjoiner_enable_fops); I've replied to an earlier version of this patch telling you to pass struct intel_connector * to debugfs_create_file() when your show/write hooks expect that. This only works because offset of base member is 0, and the private pointer is void *. BR, Jani. > + } > + > if (connector_type =3D=3D DRM_MODE_CONNECTOR_DSI || > connector_type =3D=3D DRM_MODE_CONNECTOR_eDP || > connector_type =3D=3D DRM_MODE_CONNECTOR_DisplayPort || > diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers= /gpu/drm/i915/display/intel_display_types.h > index ae2e8cff9d691..db38f2b8178a8 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > @@ -626,6 +626,8 @@ struct intel_connector { >=20=20 > struct intel_dp *mst_port; >=20=20 > + bool force_bigjoiner_enable; > + > struct { > struct drm_dp_aux *dsc_decompression_aux; > u8 dsc_dpcd[DP_DSC_RECEIVER_CAP_SIZE]; > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i9= 15/display/intel_dp.c > index ab415f41924d7..d70890ca2b47d 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -1205,11 +1205,13 @@ bool intel_dp_need_bigjoiner(struct intel_dp *int= el_dp, > int hdisplay, int clock) > { > struct drm_i915_private *i915 =3D dp_to_i915(intel_dp); > + struct intel_connector *connector =3D intel_dp->attached_connector; >=20=20 > if (!intel_dp_can_bigjoiner(intel_dp)) > return false; >=20=20 > - return clock > i915->max_dotclk_freq || hdisplay > 5120; > + return clock > i915->max_dotclk_freq || hdisplay > 5120 || > + connector->force_bigjoiner_enable; > } >=20=20 > static enum drm_mode_status --=20 Jani Nikula, Intel