[v1,3/3] Revert "drm/amd/display: Expose connector VRR range via debugfs"
diff mbox series

Message ID 20200622142519.16214-4-bhanuprakash.modem@intel.com
State New
Headers show
Series
  • VRR capable attach prop in i915, VRR debugfs
Related show

Commit Message

Bhanuprakash Modem June 22, 2020, 2:25 p.m. UTC
As both VRR min and max are already part of drm_display_info,
drm can expose this VRR range for each connector.

Hence this logic should move to core DRM.

This reverts commit 727962f030c23422a01e8b22d0f463815fb15ec4.

Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
Cc: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Manasi Navare <manasi.d.navare@intel.com>
Cc: AMD gfx <amd-gfx@lists.freedesktop.org>
---
 .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 20 -------------------
 1 file changed, 20 deletions(-)

Comments

Kazlauskas, Nicholas June 22, 2020, 2:57 p.m. UTC | #1
On 2020-06-22 10:25 a.m., Bhanuprakash Modem wrote:
> As both VRR min and max are already part of drm_display_info,
> drm can expose this VRR range for each connector.
> 
> Hence this logic should move to core DRM.
> 
> This reverts commit 727962f030c23422a01e8b22d0f463815fb15ec4.
> 
> Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
> Cc: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
> Cc: Harry Wentland <harry.wentland@amd.com>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: Manasi Navare <manasi.d.navare@intel.com>
> Cc: AMD gfx <amd-gfx@lists.freedesktop.org>


Looks good to me with Patch 2 part of the series.

Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>

Thanks,
Nicholas Kazlauskas

> ---
>   .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 20 -------------------
>   1 file changed, 20 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
> index 076af267b488..71387d2af2ed 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
> @@ -820,24 +820,6 @@ static int output_bpc_show(struct seq_file *m, void *data)
>   	return res;
>   }
>   
> -/*
> - * Returns the min and max vrr vfreq through the connector's debugfs file.
> - * Example usage: cat /sys/kernel/debug/dri/0/DP-1/vrr_range
> - */
> -static int vrr_range_show(struct seq_file *m, void *data)
> -{
> -	struct drm_connector *connector = m->private;
> -	struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);
> -
> -	if (connector->status != connector_status_connected)
> -		return -ENODEV;
> -
> -	seq_printf(m, "Min: %u\n", (unsigned int)aconnector->min_vfreq);
> -	seq_printf(m, "Max: %u\n", (unsigned int)aconnector->max_vfreq);
> -
> -	return 0;
> -}
> -
>   #ifdef CONFIG_DRM_AMD_DC_HDCP
>   /*
>    * Returns the HDCP capability of the Display (1.4 for now).
> @@ -1001,7 +983,6 @@ static ssize_t dp_dpcd_data_read(struct file *f, char __user *buf,
>   DEFINE_SHOW_ATTRIBUTE(dmub_fw_state);
>   DEFINE_SHOW_ATTRIBUTE(dmub_tracebuffer);
>   DEFINE_SHOW_ATTRIBUTE(output_bpc);
> -DEFINE_SHOW_ATTRIBUTE(vrr_range);
>   #ifdef CONFIG_DRM_AMD_DC_HDCP
>   DEFINE_SHOW_ATTRIBUTE(hdcp_sink_capability);
>   #endif
> @@ -1059,7 +1040,6 @@ static const struct {
>   		{"phy_settings", &dp_phy_settings_debugfs_fop},
>   		{"test_pattern", &dp_phy_test_pattern_fops},
>   		{"output_bpc", &output_bpc_fops},
> -		{"vrr_range", &vrr_range_fops},
>   #ifdef CONFIG_DRM_AMD_DC_HDCP
>   		{"hdcp_sink_capability", &hdcp_sink_capability_fops},
>   #endif
>
Manasi Navare June 22, 2020, 7 p.m. UTC | #2
On Mon, Jun 22, 2020 at 10:57:02AM -0400, Kazlauskas, Nicholas wrote:
> On 2020-06-22 10:25 a.m., Bhanuprakash Modem wrote:
> >As both VRR min and max are already part of drm_display_info,
> >drm can expose this VRR range for each connector.
> >
> >Hence this logic should move to core DRM.
> >
> >This reverts commit 727962f030c23422a01e8b22d0f463815fb15ec4.
> >
> >Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
> >Cc: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
> >Cc: Harry Wentland <harry.wentland@amd.com>
> >Cc: Alex Deucher <alexander.deucher@amd.com>
> >Cc: Manasi Navare <manasi.d.navare@intel.com>
> >Cc: AMD gfx <amd-gfx@lists.freedesktop.org>
> 
> 
> Looks good to me with Patch 2 part of the series.
> 
> Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
> 

Thanks for your review, do we have your r-b on patch 2/3 also?
In that case, how do you think we should merge the patches?
Patch 2/3 will be merged through drm-misc, how about this one?

Manasi

> Thanks,
> Nicholas Kazlauskas
> 
> >---
> >  .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 20 -------------------
> >  1 file changed, 20 deletions(-)
> >
> >diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
> >index 076af267b488..71387d2af2ed 100644
> >--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
> >+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
> >@@ -820,24 +820,6 @@ static int output_bpc_show(struct seq_file *m, void *data)
> >  	return res;
> >  }
> >-/*
> >- * Returns the min and max vrr vfreq through the connector's debugfs file.
> >- * Example usage: cat /sys/kernel/debug/dri/0/DP-1/vrr_range
> >- */
> >-static int vrr_range_show(struct seq_file *m, void *data)
> >-{
> >-	struct drm_connector *connector = m->private;
> >-	struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);
> >-
> >-	if (connector->status != connector_status_connected)
> >-		return -ENODEV;
> >-
> >-	seq_printf(m, "Min: %u\n", (unsigned int)aconnector->min_vfreq);
> >-	seq_printf(m, "Max: %u\n", (unsigned int)aconnector->max_vfreq);
> >-
> >-	return 0;
> >-}
> >-
> >  #ifdef CONFIG_DRM_AMD_DC_HDCP
> >  /*
> >   * Returns the HDCP capability of the Display (1.4 for now).
> >@@ -1001,7 +983,6 @@ static ssize_t dp_dpcd_data_read(struct file *f, char __user *buf,
> >  DEFINE_SHOW_ATTRIBUTE(dmub_fw_state);
> >  DEFINE_SHOW_ATTRIBUTE(dmub_tracebuffer);
> >  DEFINE_SHOW_ATTRIBUTE(output_bpc);
> >-DEFINE_SHOW_ATTRIBUTE(vrr_range);
> >  #ifdef CONFIG_DRM_AMD_DC_HDCP
> >  DEFINE_SHOW_ATTRIBUTE(hdcp_sink_capability);
> >  #endif
> >@@ -1059,7 +1040,6 @@ static const struct {
> >  		{"phy_settings", &dp_phy_settings_debugfs_fop},
> >  		{"test_pattern", &dp_phy_test_pattern_fops},
> >  		{"output_bpc", &output_bpc_fops},
> >-		{"vrr_range", &vrr_range_fops},
> >  #ifdef CONFIG_DRM_AMD_DC_HDCP
> >  		{"hdcp_sink_capability", &hdcp_sink_capability_fops},
> >  #endif
> >
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Patch
diff mbox series

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
index 076af267b488..71387d2af2ed 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
@@ -820,24 +820,6 @@  static int output_bpc_show(struct seq_file *m, void *data)
 	return res;
 }
 
-/*
- * Returns the min and max vrr vfreq through the connector's debugfs file.
- * Example usage: cat /sys/kernel/debug/dri/0/DP-1/vrr_range
- */
-static int vrr_range_show(struct seq_file *m, void *data)
-{
-	struct drm_connector *connector = m->private;
-	struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);
-
-	if (connector->status != connector_status_connected)
-		return -ENODEV;
-
-	seq_printf(m, "Min: %u\n", (unsigned int)aconnector->min_vfreq);
-	seq_printf(m, "Max: %u\n", (unsigned int)aconnector->max_vfreq);
-
-	return 0;
-}
-
 #ifdef CONFIG_DRM_AMD_DC_HDCP
 /*
  * Returns the HDCP capability of the Display (1.4 for now).
@@ -1001,7 +983,6 @@  static ssize_t dp_dpcd_data_read(struct file *f, char __user *buf,
 DEFINE_SHOW_ATTRIBUTE(dmub_fw_state);
 DEFINE_SHOW_ATTRIBUTE(dmub_tracebuffer);
 DEFINE_SHOW_ATTRIBUTE(output_bpc);
-DEFINE_SHOW_ATTRIBUTE(vrr_range);
 #ifdef CONFIG_DRM_AMD_DC_HDCP
 DEFINE_SHOW_ATTRIBUTE(hdcp_sink_capability);
 #endif
@@ -1059,7 +1040,6 @@  static const struct {
 		{"phy_settings", &dp_phy_settings_debugfs_fop},
 		{"test_pattern", &dp_phy_test_pattern_fops},
 		{"output_bpc", &output_bpc_fops},
-		{"vrr_range", &vrr_range_fops},
 #ifdef CONFIG_DRM_AMD_DC_HDCP
 		{"hdcp_sink_capability", &hdcp_sink_capability_fops},
 #endif