diff mbox series

[22/22] drm/i915: Use debugfs_create_bool() for "i915_bigjoiner_force_enable"

Message ID 20240329011254.24160-23-ville.syrjala@linux.intel.com (mailing list archive)
State New, archived
Headers show
Series drm/i915: Bigjoiner modeset sequence redesign and MST support | expand

Commit Message

Ville Syrjälä March 29, 2024, 1:12 a.m. UTC 
From: Ville Syrjälä <ville.syrjala@linux.intel.com>

There is no reason to make this debugfs file for a simple
boolean so complicated. Just use debugfs_create_bool().

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 .../drm/i915/display/intel_display_debugfs.c  | 44 +------------------
 1 file changed, 2 insertions(+), 42 deletions(-)

Comments

Murthy, Arun R April 1, 2024, 5:08 a.m. UTC | #1 
> -----Original Message-----
> From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of Ville
> Syrjala
> Sent: Friday, March 29, 2024 6:43 AM
> To: intel-gfx@lists.freedesktop.org
> Subject: [PATCH 22/22] drm/i915: Use debugfs_create_bool() for
> "i915_bigjoiner_force_enable"
> 
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> There is no reason to make this debugfs file for a simple boolean so
> complicated. Just use debugfs_create_bool().
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Arun R Murthy <arun.r.murthy@intel.com>

Thanks and Regards,
Arun R Murthy
-------------------

> ---
>  .../drm/i915/display/intel_display_debugfs.c  | 44 +------------------
>  1 file changed, 2 insertions(+), 42 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> index b99c024b0934..3e364891dcd0 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> @@ -1402,20 +1402,6 @@ out:	drm_modeset_unlock(&i915-
> >drm.mode_config.connection_mutex);
>  	return ret;
>  }
> 
> -static int i915_bigjoiner_enable_show(struct seq_file *m, void *data) -{
> -	struct intel_connector *connector = m->private;
> -	struct drm_crtc *crtc;
> -
> -	crtc = connector->base.state->crtc;
> -	if (connector->base.status != connector_status_connected || !crtc)
> -		return -ENODEV;
> -
> -	seq_printf(m, "Bigjoiner enable: %d\n", connector-
> >force_bigjoiner_enable);
> -
> -	return 0;
> -}
> -
>  static ssize_t i915_dsc_output_format_write(struct file *file,
>  					    const char __user *ubuf,
>  					    size_t len, loff_t *offp)
> @@ -1437,30 +1423,6 @@ static ssize_t i915_dsc_output_format_write(struct
> file *file,
>  	return len;
>  }
> 
> -static ssize_t i915_bigjoiner_enable_write(struct file *file,
> -					   const char __user *ubuf,
> -					   size_t len, loff_t *offp)
> -{
> -	struct seq_file *m = file->private_data;
> -	struct intel_connector *connector = m->private;
> -	struct drm_crtc *crtc;
> -	bool bigjoiner_en = 0;
> -	int ret;
> -
> -	crtc = connector->base.state->crtc;
> -	if (connector->base.status != connector_status_connected || !crtc)
> -		return -ENODEV;
> -
> -	ret = kstrtobool_from_user(ubuf, len, &bigjoiner_en);
> -	if (ret < 0)
> -		return ret;
> -
> -	connector->force_bigjoiner_enable = bigjoiner_en;
> -	*offp += len;
> -
> -	return len;
> -}
> -
>  static int i915_dsc_output_format_open(struct inode *inode,
>  				       struct file *file)
>  {
> @@ -1554,8 +1516,6 @@ static const struct file_operations
> i915_dsc_fractional_bpp_fops = {
>  	.write = i915_dsc_fractional_bpp_write  };
> 
> -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
> @@ -1640,8 +1600,8 @@ void intel_connector_debugfs_add(struct
> intel_connector *connector)
>  	if (DISPLAY_VER(i915) >= 11 &&
>  	    (connector_type == DRM_MODE_CONNECTOR_DisplayPort ||
>  	     connector_type == DRM_MODE_CONNECTOR_eDP)) {
> -		debugfs_create_file("i915_bigjoiner_force_enable", 0644, root,
> -				    connector, &i915_bigjoiner_enable_fops);
> +		debugfs_create_bool("i915_bigjoiner_force_enable", 0644,
> root,
> +				    &connector->force_bigjoiner_enable);
>  	}
> 
>  	if (connector_type == DRM_MODE_CONNECTOR_DSI ||
> --
> 2.43.2
Srinivas, Vidya April 2, 2024, 7:37 a.m. UTC | #2 
Hello Ville, Thank you very much for the series. 6K detects fine and works.
Tested-by: Vidya Srinivas <vidya.srinivas@intel.com>

> -----Original Message-----
> From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of Ville
> Syrjala
> Sent: Friday, March 29, 2024 6:43 AM
> To: intel-gfx@lists.freedesktop.org
> Subject: [PATCH 22/22] drm/i915: Use debugfs_create_bool() for
> "i915_bigjoiner_force_enable"
> 
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> There is no reason to make this debugfs file for a simple boolean so
> complicated. Just use debugfs_create_bool().
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
>  .../drm/i915/display/intel_display_debugfs.c  | 44 +------------------
>  1 file changed, 2 insertions(+), 42 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> index b99c024b0934..3e364891dcd0 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> @@ -1402,20 +1402,6 @@ out:	drm_modeset_unlock(&i915-
> >drm.mode_config.connection_mutex);
>  	return ret;
>  }
> 
> -static int i915_bigjoiner_enable_show(struct seq_file *m, void *data) -{
> -	struct intel_connector *connector = m->private;
> -	struct drm_crtc *crtc;
> -
> -	crtc = connector->base.state->crtc;
> -	if (connector->base.status != connector_status_connected || !crtc)
> -		return -ENODEV;
> -
> -	seq_printf(m, "Bigjoiner enable: %d\n", connector-
> >force_bigjoiner_enable);
> -
> -	return 0;
> -}
> -
>  static ssize_t i915_dsc_output_format_write(struct file *file,
>  					    const char __user *ubuf,
>  					    size_t len, loff_t *offp)
> @@ -1437,30 +1423,6 @@ static ssize_t i915_dsc_output_format_write(struct
> file *file,
>  	return len;
>  }
> 
> -static ssize_t i915_bigjoiner_enable_write(struct file *file,
> -					   const char __user *ubuf,
> -					   size_t len, loff_t *offp)
> -{
> -	struct seq_file *m = file->private_data;
> -	struct intel_connector *connector = m->private;
> -	struct drm_crtc *crtc;
> -	bool bigjoiner_en = 0;
> -	int ret;
> -
> -	crtc = connector->base.state->crtc;
> -	if (connector->base.status != connector_status_connected || !crtc)
> -		return -ENODEV;
> -
> -	ret = kstrtobool_from_user(ubuf, len, &bigjoiner_en);
> -	if (ret < 0)
> -		return ret;
> -
> -	connector->force_bigjoiner_enable = bigjoiner_en;
> -	*offp += len;
> -
> -	return len;
> -}
> -
>  static int i915_dsc_output_format_open(struct inode *inode,
>  				       struct file *file)
>  {
> @@ -1554,8 +1516,6 @@ static const struct file_operations
> i915_dsc_fractional_bpp_fops = {
>  	.write = i915_dsc_fractional_bpp_write  };
> 
> -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
> @@ -1640,8 +1600,8 @@ void intel_connector_debugfs_add(struct
> intel_connector *connector)
>  	if (DISPLAY_VER(i915) >= 11 &&
>  	    (connector_type == DRM_MODE_CONNECTOR_DisplayPort ||
>  	     connector_type == DRM_MODE_CONNECTOR_eDP)) {
> -		debugfs_create_file("i915_bigjoiner_force_enable", 0644,
> root,
> -				    connector, &i915_bigjoiner_enable_fops);
> +		debugfs_create_bool("i915_bigjoiner_force_enable", 0644,
> root,
> +				    &connector->force_bigjoiner_enable);
>  	}
> 
>  	if (connector_type == DRM_MODE_CONNECTOR_DSI ||
> --
> 2.43.2
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
index b99c024b0934..3e364891dcd0 100644
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
@@ -1402,20 +1402,6 @@  out:	drm_modeset_unlock(&i915->drm.mode_config.connection_mutex);
 	return ret;
 }
 
-static int i915_bigjoiner_enable_show(struct seq_file *m, void *data)
-{
-	struct intel_connector *connector = m->private;
-	struct drm_crtc *crtc;
-
-	crtc = connector->base.state->crtc;
-	if (connector->base.status != connector_status_connected || !crtc)
-		return -ENODEV;
-
-	seq_printf(m, "Bigjoiner enable: %d\n", connector->force_bigjoiner_enable);
-
-	return 0;
-}
-
 static ssize_t i915_dsc_output_format_write(struct file *file,
 					    const char __user *ubuf,
 					    size_t len, loff_t *offp)
@@ -1437,30 +1423,6 @@  static ssize_t i915_dsc_output_format_write(struct file *file,
 	return len;
 }
 
-static ssize_t i915_bigjoiner_enable_write(struct file *file,
-					   const char __user *ubuf,
-					   size_t len, loff_t *offp)
-{
-	struct seq_file *m = file->private_data;
-	struct intel_connector *connector = m->private;
-	struct drm_crtc *crtc;
-	bool bigjoiner_en = 0;
-	int ret;
-
-	crtc = connector->base.state->crtc;
-	if (connector->base.status != connector_status_connected || !crtc)
-		return -ENODEV;
-
-	ret = kstrtobool_from_user(ubuf, len, &bigjoiner_en);
-	if (ret < 0)
-		return ret;
-
-	connector->force_bigjoiner_enable = bigjoiner_en;
-	*offp += len;
-
-	return len;
-}
-
 static int i915_dsc_output_format_open(struct inode *inode,
 				       struct file *file)
 {
@@ -1554,8 +1516,6 @@  static const struct file_operations i915_dsc_fractional_bpp_fops = {
 	.write = i915_dsc_fractional_bpp_write
 };
 
-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
@@ -1640,8 +1600,8 @@  void intel_connector_debugfs_add(struct intel_connector *connector)
 	if (DISPLAY_VER(i915) >= 11 &&
 	    (connector_type == DRM_MODE_CONNECTOR_DisplayPort ||
 	     connector_type == DRM_MODE_CONNECTOR_eDP)) {
-		debugfs_create_file("i915_bigjoiner_force_enable", 0644, root,
-				    connector, &i915_bigjoiner_enable_fops);
+		debugfs_create_bool("i915_bigjoiner_force_enable", 0644, root,
+				    &connector->force_bigjoiner_enable);
 	}
 
 	if (connector_type == DRM_MODE_CONNECTOR_DSI ||