Re: [PATCH v4] Revert "drm/amd/display: Expose connector VRR range via debugfs"

2020-07-21 Thread Alex Deucher
On Fri, Jun 26, 2020 at 7:11 PM Manasi Navare  wrote:
>
> From: Bhanuprakash Modem 
>
> v3:
> * Rebase (Manasi)
> v2:
> * Rebase (Manasi)
>
> 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 
> Cc: Nicholas Kazlauskas 
> Cc: Harry Wentland 
> Cc: Alex Deucher 
> Cc: Manasi Navare 
> Cc: AMD gfx 
> Reviewed-by: Nicholas Kazlauskas 

Applied.  Thanks!

Alex

> ---
>  .../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 1d692f4f42f3..b246354967bc 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
> @@ -1058,7 +1039,6 @@ static const struct {
> {"link_settings", _link_settings_debugfs_fops},
> {"phy_settings", _phy_settings_debugfs_fop},
> {"test_pattern", _phy_test_pattern_fops},
> -   {"vrr_range", _range_fops},
>  #ifdef CONFIG_DRM_AMD_DC_HDCP
> {"hdcp_sink_capability", _sink_capability_fops},
>  #endif
> --
> 2.19.1
>
> ___
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel


[PATCH v4] Revert "drm/amd/display: Expose connector VRR range via debugfs"

2020-06-26 Thread Manasi Navare
From: Bhanuprakash Modem 

v3:
* Rebase (Manasi)
v2:
* Rebase (Manasi)

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 
Cc: Nicholas Kazlauskas 
Cc: Harry Wentland 
Cc: Alex Deucher 
Cc: Manasi Navare 
Cc: AMD gfx 
Reviewed-by: 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 1d692f4f42f3..b246354967bc 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
@@ -1058,7 +1039,6 @@ static const struct {
{"link_settings", _link_settings_debugfs_fops},
{"phy_settings", _phy_settings_debugfs_fop},
{"test_pattern", _phy_test_pattern_fops},
-   {"vrr_range", _range_fops},
 #ifdef CONFIG_DRM_AMD_DC_HDCP
{"hdcp_sink_capability", _sink_capability_fops},
 #endif
-- 
2.19.1

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel