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 56046CD6E42 for ; Wed, 11 Oct 2023 08:49:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 80D0410E5EB; Wed, 11 Oct 2023 08:49:45 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4DA3010E5CC for ; Wed, 11 Oct 2023 08:49:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697014183; x=1728550183; h=from:to:subject:in-reply-to:references:date:message-id: mime-version; bh=FfAM8FIqtyL9mpfvEshqMXGwqCQN7BFF4mav2RWXndg=; b=iGHAlwPeTheTZ5BO9FuE6+EfBsjTDa/RzIHDSWUGOUfmlyYqfxLqoFbb o6ngW44JVfJNzfHxCgOZyJhz/s/dyw7s9AjyZV0jAd985YFb23bjQdiWH 6TfWAEY4wctT+P8xoIFCjZOgo61Ku6GzbU0cAHLugFSB7vcsSjVsUdzW+ pK4sxDqOInTo8aiGXGIiTXXjUlBrIs/80afvDTggshICYkSy6fzkdgncX ZFmwOu6CNt/FwoJF6ZZnxis/PfXSWcqNnH75HEdA5SdAhHVeC69lQcYCG Im5nwBirM/Y80rR7ZxTGsRqJi1puAPsl2CjKFQM/9rgzgpK7cPsPl70pm g==; X-IronPort-AV: E=McAfee;i="6600,9927,10859"; a="470876422" X-IronPort-AV: E=Sophos;i="6.03,214,1694761200"; d="scan'208";a="470876422" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Oct 2023 01:49:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10859"; a="757472437" X-IronPort-AV: E=Sophos;i="6.03,214,1694761200"; d="scan'208";a="757472437" Received: from wprelogx-mobl.ger.corp.intel.com (HELO localhost) ([10.252.56.229]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Oct 2023 01:49:41 -0700 From: Jani Nikula To: Stanislav Lisovskiy , intel-gfx@lists.freedesktop.org In-Reply-To: <20231009133042.25516-1-stanislav.lisovskiy@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20231009133042.25516-1-stanislav.lisovskiy@intel.com> Date: Wed, 11 Oct 2023 11:49:38 +0300 Message-ID: <87r0m14k7x.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Intel-gfx] [PATCH] drm/i915: Add bigjoiner force enable option to debugfs 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 Mon, 09 Oct 2023, Stanislav Lisovskiy wrote: > 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. > > Signed-off-by: Stanislav Lisovskiy > --- > .../drm/i915/display/intel_display_debugfs.c | 71 +++++++++++++++++++ > .../drm/i915/display/intel_display_types.h | 2 + > drivers/gpu/drm/i915/display/intel_dp.c | 6 +- > 3 files changed, 78 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > index f6d7c4d45fae..c806957cb902 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c > +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > @@ -1399,6 +1399,35 @@ out: drm_modeset_unlock(&dev->mode_config.connection_mutex); > return ret; > } > > +static int i915_bigjoiner_enable_show(struct seq_file *m, void *data) > +{ > + struct drm_connector *connector = m->private; struct intel_connector *connector, please. Yeah, this is copy-paste from other files, but they should be changed too. > + struct drm_device *dev = connector->dev; struct drm_i915_private *i915, please. > + struct drm_crtc *crtc; > + struct intel_encoder *encoder = intel_attached_encoder(to_intel_connector(connector)); > + struct intel_dp *intel_dp = enc_to_intel_dp(encoder); > + int ret; > + > + if (!encoder) > + return -ENODEV; > + > + ret = drm_modeset_lock_single_interruptible(&dev->mode_config.connection_mutex); > + if (ret) > + return ret; Why does show need locking but write doesn't? > + > + crtc = connector->state->crtc; > + if (connector->status != connector_status_connected || !crtc) { > + ret = -ENODEV; > + goto out; > + } I guess because of the above, but... do we need it? Or is this just copy-pasted from some other debugfs files, which copy-pasted from other debugfs files, which... ;) > + > + seq_printf(m, "Bigjoiner enable: %d\n", intel_dp->force_bigjoiner_en); > + > +out: drm_modeset_unlock(&dev->mode_config.connection_mutex); > + > + return ret; > +} > + > static ssize_t i915_dsc_output_format_write(struct file *file, > const char __user *ubuf, > size_t len, loff_t *offp) > @@ -1420,12 +1449,39 @@ static ssize_t i915_dsc_output_format_write(struct file *file, > return len; > } > > +static ssize_t i915_bigjoiner_enable_fops_write(struct file *file, > + const char __user *ubuf, > + size_t len, loff_t *offp) > +{ > + struct drm_connector *connector = > + ((struct seq_file *)file->private_data)->private; I think this reads better with struct seq_file *m = file->private_data; struct intel_connector *connector = m->private; > + struct intel_encoder *encoder = intel_attached_encoder(to_intel_connector(connector)); > + struct intel_dp *intel_dp = enc_to_intel_dp(encoder); > + int bigjoiner_en = 0; > + int ret; > + > + ret = kstrtoint_from_user(ubuf, len, 0, &bigjoiner_en); > + if (ret < 0) > + return ret; If it's a bool, why kstrtoint? Yeah, because copy-paste, but why keep percolating the same mistakes? > + > + intel_dp->force_bigjoiner_en = bigjoiner_en; > + *offp += len; > + > + return len; > +} > + > static int i915_dsc_output_format_open(struct inode *inode, > struct file *file) > { > return single_open(file, i915_dsc_output_format_show, inode->i_private); > } > > +static int i915_bigjoiner_enable_open(struct inode *inode, > + struct file *file) > +{ > + return single_open(file, i915_bigjoiner_enable_show, inode->i_private); > +} > + > static const struct file_operations i915_dsc_output_format_fops = { > .owner = THIS_MODULE, > .open = i915_dsc_output_format_open, > @@ -1435,6 +1491,15 @@ static const struct file_operations i915_dsc_output_format_fops = { > .write = i915_dsc_output_format_write > }; > > +static const struct file_operations i915_bigjoiner_enable_fops = { > + .owner = THIS_MODULE, > + .open = i915_bigjoiner_enable_open, > + .read = seq_read, > + .llseek = seq_lseek, > + .release = single_release, > + .write = i915_bigjoiner_enable_fops_write > +}; > + > /* > * Returns the Current CRTC's bpc. > * Example usage: cat /sys/kernel/debug/dri/0/crtc-0/i915_current_bpc > @@ -1514,6 +1579,12 @@ void intel_connector_debugfs_add(struct intel_connector *intel_connector) > connector, &i915_dsc_output_format_fops); > } > > + if (DISPLAY_VER(dev_priv) >= 11 && > + connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort) { > + debugfs_create_file("i915_bigjoiner_force_enable", 0644, root, > + connector, &i915_bigjoiner_enable_fops); All of these should just pass struct intel_connector. > + } > + > if (connector->connector_type == DRM_MODE_CONNECTOR_DSI || > connector->connector_type == DRM_MODE_CONNECTOR_eDP || > connector->connector_type == 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 8d8b2f8d37a9..ecec8a25838e 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > @@ -1753,6 +1753,8 @@ struct intel_dp { > bool is_mst; > int active_mst_links; > > + bool force_bigjoiner_en; No need to try to shorten this, just spell out force_bigjoiner_enable. > + > /* connector directly attached - won't be use for modeset in mst world */ > struct intel_connector *attached_connector; > > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c > index f0f43aeabd21..7e553cb7ecbb 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -1153,7 +1153,11 @@ bool intel_dp_need_bigjoiner(struct intel_dp *intel_dp, > if (!intel_dp_can_bigjoiner(intel_dp)) > return false; > > - return clock > i915->max_dotclk_freq || hdisplay > 5120; > + if (intel_dp->force_bigjoiner_en) > + drm_dbg_kms(&i915->drm, "Forcing bigjoiner mode"); Missing \n. > + > + return clock > i915->max_dotclk_freq || hdisplay > 5120 || > + intel_dp->force_bigjoiner_en; > } > > static enum drm_mode_status -- Jani Nikula, Intel