* [v6 1/3] drm/i915/dp: Attach and set drm connector VRR property
2020-06-22 14:25 [v6 0/3] VRR capable attach prop in i915, VRR debugfs Bhanuprakash Modem
@ 2020-06-22 14:25 ` Bhanuprakash Modem
2020-06-22 14:25 ` [v9 2/3] drm/debug: Expose connector VRR monitor range via debugfs Bhanuprakash Modem
2020-06-22 14:25 ` [v1 3/3] Revert "drm/amd/display: Expose connector VRR range via debugfs" Bhanuprakash Modem
2 siblings, 0 replies; 9+ messages in thread
From: Bhanuprakash Modem @ 2020-06-22 14:25 UTC (permalink / raw)
To: bhanuprakash.modem, dri-devel, intel-gfx
From: Aditya Swarup <aditya.swarup@intel.com>
This function sets the VRR property for connector based
on the platform support, EDID monitor range and DP sink
DPCD capability of outputing video without msa
timing information.
v5:
* Fix the vrr prop not being set in kernel (Manasi)
* Unset the prop on connector disconnect (Manasi)
v4:
* Rebase (Mansi)
v3:
* intel_dp_is_vrr_capable can be used for debugfs, make it
non static (Manasi)
v2:
* Just set this in intel_dp_get_modes instead of new hook (Jani)
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Signed-off-by: Aditya Swarup <aditya.swarup@intel.com>
Signed-off-by: Manasi Navare <manasi.d.navare@intel.com>
---
drivers/gpu/drm/i915/display/intel_dp.c | 27 +++++++++++++++++++++++++
drivers/gpu/drm/i915/display/intel_dp.h | 2 ++
2 files changed, 29 insertions(+)
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 42589cae766d..d0dba81cfb07 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -6149,6 +6149,9 @@ intel_dp_detect(struct drm_connector *connector,
if (status == connector_status_disconnected) {
memset(&intel_dp->compliance, 0, sizeof(intel_dp->compliance));
memset(intel_dp->dsc_dpcd, 0, sizeof(intel_dp->dsc_dpcd));
+ /*Reset the immutable VRR Capable property */
+ drm_connector_set_vrr_capable_property(connector,
+ false);
if (intel_dp->is_mst) {
drm_dbg_kms(&dev_priv->drm,
@@ -6256,6 +6259,23 @@ intel_dp_force(struct drm_connector *connector)
intel_display_power_put(dev_priv, aux_domain, wakeref);
}
+bool intel_dp_is_vrr_capable(struct drm_connector *connector)
+{
+ struct intel_dp *intel_dp = intel_attached_dp(to_intel_connector(connector));
+ const struct drm_display_info *info = &connector->display_info;
+ struct drm_i915_private *dev_priv = to_i915(connector->dev);
+
+ /*
+ * DP Sink is capable of Variable refresh video timings if
+ * Ignore MSA bit is set in DPCD.
+ * EDID monitor range also should be atleast 10 for reasonable
+ * Adaptive sync/ VRR end user experience.
+ */
+ return INTEL_GEN(dev_priv) >= 12 &&
+ drm_dp_sink_can_do_video_without_timing_msa(intel_dp->dpcd) &&
+ info->monitor_range.max_vfreq - info->monitor_range.min_vfreq > 10;
+}
+
static int intel_dp_get_modes(struct drm_connector *connector)
{
struct intel_connector *intel_connector = to_intel_connector(connector);
@@ -6264,6 +6284,10 @@ static int intel_dp_get_modes(struct drm_connector *connector)
edid = intel_connector->detect_edid;
if (edid) {
int ret = intel_connector_update_modes(connector, edid);
+
+ if (intel_dp_is_vrr_capable(connector))
+ drm_connector_set_vrr_capable_property(connector,
+ true);
if (ret)
return ret;
}
@@ -7325,6 +7349,9 @@ intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connect
connector->state->scaling_mode = DRM_MODE_SCALE_ASPECT;
}
+
+ if (INTEL_GEN(dev_priv) >= 12)
+ drm_connector_attach_vrr_capable_property(connector);
}
static void intel_dp_init_panel_power_timestamps(struct intel_dp *intel_dp)
diff --git a/drivers/gpu/drm/i915/display/intel_dp.h b/drivers/gpu/drm/i915/display/intel_dp.h
index 0a8950f744f6..db895a3cd93f 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.h
+++ b/drivers/gpu/drm/i915/display/intel_dp.h
@@ -14,6 +14,7 @@ enum pipe;
enum port;
struct drm_connector_state;
struct drm_encoder;
+struct drm_connector;
struct drm_i915_private;
struct drm_modeset_acquire_ctx;
struct drm_dp_vsc_sdp;
@@ -120,6 +121,7 @@ void intel_read_dp_sdp(struct intel_encoder *encoder,
unsigned int type);
bool intel_digital_port_connected(struct intel_encoder *encoder);
void intel_dp_process_phy_request(struct intel_dp *intel_dp);
+bool intel_dp_is_vrr_capable(struct drm_connector *connector);
static inline unsigned int intel_dp_unused_lane_mask(int lane_count)
{
--
2.20.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [v9 2/3] drm/debug: Expose connector VRR monitor range via debugfs
2020-06-22 14:25 [v6 0/3] VRR capable attach prop in i915, VRR debugfs Bhanuprakash Modem
2020-06-22 14:25 ` [v6 1/3] drm/i915/dp: Attach and set drm connector VRR property Bhanuprakash Modem
@ 2020-06-22 14:25 ` Bhanuprakash Modem
2020-06-22 19:02 ` Manasi Navare
2020-06-25 22:55 ` Manasi Navare
2020-06-22 14:25 ` [v1 3/3] Revert "drm/amd/display: Expose connector VRR range via debugfs" Bhanuprakash Modem
2 siblings, 2 replies; 9+ messages in thread
From: Bhanuprakash Modem @ 2020-06-22 14:25 UTC (permalink / raw)
To: bhanuprakash.modem, dri-devel, intel-gfx
[Why]
It's useful to know the min and max vrr range for IGT testing.
[How]
Expose the min and max vfreq for the connector via a debugfs file
on the connector, "vrr_range".
Example usage: cat /sys/kernel/debug/dri/0/DP-1/vrr_range
v2:
* Fix the typo in max_vfreq (Manasi)
* Change the name of node to i915_vrr_info so we can add
other vrr info for more debug info (Manasi)
* Change the VRR capable to display Yes or No (Manasi)
* Fix indentation checkpatch errors (Manasi)
v3:
* Remove the unnecessary debug print (Manasi)
v4:
* Rebase
v5:
* Rename to vrr_range to match AMD debugfs
v6:
* Rebase (manasi)
v7:
* Fix cmpilation due to rebase
v8:
* Move debugfs node creation logic to DRM (Emil)
* Remove AMD specific logic (Emil)
v9:
* Seperate patch for removal of AMD specific logic (Manasi)
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
Signed-off-by: Manasi Navare <manasi.d.navare@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Harry Wentland <harry.wentland@amd.com>
CC: Emil Velikov <emil.l.velikov@gmail.com>
---
drivers/gpu/drm/drm_debugfs.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c
index bfe4602f206b..3d7182001004 100644
--- a/drivers/gpu/drm/drm_debugfs.c
+++ b/drivers/gpu/drm/drm_debugfs.c
@@ -376,6 +376,24 @@ static ssize_t edid_write(struct file *file, const char __user *ubuf,
return (ret) ? ret : len;
}
+/*
+ * 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;
+
+ if (connector->status != connector_status_connected)
+ return -ENODEV;
+
+ seq_printf(m, "Min: %u\n", (u8)connector->display_info.monitor_range.min_vfreq);
+ seq_printf(m, "Max: %u\n", (u8)connector->display_info.monitor_range.max_vfreq);
+
+ return 0;
+}
+DEFINE_SHOW_ATTRIBUTE(vrr_range);
+
static const struct file_operations drm_edid_fops = {
.owner = THIS_MODULE,
.open = edid_open,
@@ -413,6 +431,10 @@ void drm_debugfs_connector_add(struct drm_connector *connector)
/* edid */
debugfs_create_file("edid_override", S_IRUGO | S_IWUSR, root, connector,
&drm_edid_fops);
+
+ /* vrr range */
+ debugfs_create_file("vrr_range", S_IRUGO, root, connector,
+ &vrr_range_fops);
}
void drm_debugfs_connector_remove(struct drm_connector *connector)
--
2.20.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [v9 2/3] drm/debug: Expose connector VRR monitor range via debugfs
2020-06-22 14:25 ` [v9 2/3] drm/debug: Expose connector VRR monitor range via debugfs Bhanuprakash Modem
@ 2020-06-22 19:02 ` Manasi Navare
2020-06-25 22:55 ` Manasi Navare
1 sibling, 0 replies; 9+ messages in thread
From: Manasi Navare @ 2020-06-22 19:02 UTC (permalink / raw)
To: Bhanuprakash Modem; +Cc: intel-gfx, dri-devel
On Mon, Jun 22, 2020 at 07:55:18PM +0530, Bhanuprakash Modem wrote:
> [Why]
> It's useful to know the min and max vrr range for IGT testing.
>
> [How]
> Expose the min and max vfreq for the connector via a debugfs file
> on the connector, "vrr_range".
>
> Example usage: cat /sys/kernel/debug/dri/0/DP-1/vrr_range
>
> v2:
> * Fix the typo in max_vfreq (Manasi)
> * Change the name of node to i915_vrr_info so we can add
> other vrr info for more debug info (Manasi)
> * Change the VRR capable to display Yes or No (Manasi)
> * Fix indentation checkpatch errors (Manasi)
> v3:
> * Remove the unnecessary debug print (Manasi)
> v4:
> * Rebase
> v5:
> * Rename to vrr_range to match AMD debugfs
> v6:
> * Rebase (manasi)
> v7:
> * Fix cmpilation due to rebase
> v8:
> * Move debugfs node creation logic to DRM (Emil)
> * Remove AMD specific logic (Emil)
> v9:
> * Seperate patch for removal of AMD specific logic (Manasi)
>
> Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
> Signed-off-by: Manasi Navare <manasi.d.navare@intel.com>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Cc: Harry Wentland <harry.wentland@amd.com>
> CC: Emil Velikov <emil.l.velikov@gmail.com>
Looks good to me,
Reviewed-by: Manasi Navare <manasi.d.navare@intel.com>
Manasi
> ---
> drivers/gpu/drm/drm_debugfs.c | 22 ++++++++++++++++++++++
> 1 file changed, 22 insertions(+)
>
> diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c
> index bfe4602f206b..3d7182001004 100644
> --- a/drivers/gpu/drm/drm_debugfs.c
> +++ b/drivers/gpu/drm/drm_debugfs.c
> @@ -376,6 +376,24 @@ static ssize_t edid_write(struct file *file, const char __user *ubuf,
> return (ret) ? ret : len;
> }
>
> +/*
> + * 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;
> +
> + if (connector->status != connector_status_connected)
> + return -ENODEV;
> +
> + seq_printf(m, "Min: %u\n", (u8)connector->display_info.monitor_range.min_vfreq);
> + seq_printf(m, "Max: %u\n", (u8)connector->display_info.monitor_range.max_vfreq);
> +
> + return 0;
> +}
> +DEFINE_SHOW_ATTRIBUTE(vrr_range);
> +
> static const struct file_operations drm_edid_fops = {
> .owner = THIS_MODULE,
> .open = edid_open,
> @@ -413,6 +431,10 @@ void drm_debugfs_connector_add(struct drm_connector *connector)
> /* edid */
> debugfs_create_file("edid_override", S_IRUGO | S_IWUSR, root, connector,
> &drm_edid_fops);
> +
> + /* vrr range */
> + debugfs_create_file("vrr_range", S_IRUGO, root, connector,
> + &vrr_range_fops);
> }
>
> void drm_debugfs_connector_remove(struct drm_connector *connector)
> --
> 2.20.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
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [v9 2/3] drm/debug: Expose connector VRR monitor range via debugfs
2020-06-22 14:25 ` [v9 2/3] drm/debug: Expose connector VRR monitor range via debugfs Bhanuprakash Modem
2020-06-22 19:02 ` Manasi Navare
@ 2020-06-25 22:55 ` Manasi Navare
1 sibling, 0 replies; 9+ messages in thread
From: Manasi Navare @ 2020-06-25 22:55 UTC (permalink / raw)
To: Bhanuprakash Modem; +Cc: intel-gfx, dri-devel
Thanks Bhanu for the patch, merged to drm-misc
Manasi
On Mon, Jun 22, 2020 at 07:55:18PM +0530, Bhanuprakash Modem wrote:
> [Why]
> It's useful to know the min and max vrr range for IGT testing.
>
> [How]
> Expose the min and max vfreq for the connector via a debugfs file
> on the connector, "vrr_range".
>
> Example usage: cat /sys/kernel/debug/dri/0/DP-1/vrr_range
>
> v2:
> * Fix the typo in max_vfreq (Manasi)
> * Change the name of node to i915_vrr_info so we can add
> other vrr info for more debug info (Manasi)
> * Change the VRR capable to display Yes or No (Manasi)
> * Fix indentation checkpatch errors (Manasi)
> v3:
> * Remove the unnecessary debug print (Manasi)
> v4:
> * Rebase
> v5:
> * Rename to vrr_range to match AMD debugfs
> v6:
> * Rebase (manasi)
> v7:
> * Fix cmpilation due to rebase
> v8:
> * Move debugfs node creation logic to DRM (Emil)
> * Remove AMD specific logic (Emil)
> v9:
> * Seperate patch for removal of AMD specific logic (Manasi)
>
> Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
> Signed-off-by: Manasi Navare <manasi.d.navare@intel.com>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Cc: Harry Wentland <harry.wentland@amd.com>
> CC: Emil Velikov <emil.l.velikov@gmail.com>
> ---
> drivers/gpu/drm/drm_debugfs.c | 22 ++++++++++++++++++++++
> 1 file changed, 22 insertions(+)
>
> diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c
> index bfe4602f206b..3d7182001004 100644
> --- a/drivers/gpu/drm/drm_debugfs.c
> +++ b/drivers/gpu/drm/drm_debugfs.c
> @@ -376,6 +376,24 @@ static ssize_t edid_write(struct file *file, const char __user *ubuf,
> return (ret) ? ret : len;
> }
>
> +/*
> + * 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;
> +
> + if (connector->status != connector_status_connected)
> + return -ENODEV;
> +
> + seq_printf(m, "Min: %u\n", (u8)connector->display_info.monitor_range.min_vfreq);
> + seq_printf(m, "Max: %u\n", (u8)connector->display_info.monitor_range.max_vfreq);
> +
> + return 0;
> +}
> +DEFINE_SHOW_ATTRIBUTE(vrr_range);
> +
> static const struct file_operations drm_edid_fops = {
> .owner = THIS_MODULE,
> .open = edid_open,
> @@ -413,6 +431,10 @@ void drm_debugfs_connector_add(struct drm_connector *connector)
> /* edid */
> debugfs_create_file("edid_override", S_IRUGO | S_IWUSR, root, connector,
> &drm_edid_fops);
> +
> + /* vrr range */
> + debugfs_create_file("vrr_range", S_IRUGO, root, connector,
> + &vrr_range_fops);
> }
>
> void drm_debugfs_connector_remove(struct drm_connector *connector)
> --
> 2.20.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
^ permalink raw reply [flat|nested] 9+ messages in thread
* [v1 3/3] Revert "drm/amd/display: Expose connector VRR range via debugfs"
2020-06-22 14:25 [v6 0/3] VRR capable attach prop in i915, VRR debugfs Bhanuprakash Modem
2020-06-22 14:25 ` [v6 1/3] drm/i915/dp: Attach and set drm connector VRR property Bhanuprakash Modem
2020-06-22 14:25 ` [v9 2/3] drm/debug: Expose connector VRR monitor range via debugfs Bhanuprakash Modem
@ 2020-06-22 14:25 ` Bhanuprakash Modem
2020-06-22 14:57 ` Kazlauskas, Nicholas
2020-06-24 22:48 ` [PATCH v2 " Manasi Navare
2 siblings, 2 replies; 9+ messages in thread
From: Bhanuprakash Modem @ 2020-06-22 14:25 UTC (permalink / raw)
To: bhanuprakash.modem, dri-devel, intel-gfx
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(-)
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
--
2.20.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [v1 3/3] Revert "drm/amd/display: Expose connector VRR range via debugfs"
2020-06-22 14:25 ` [v1 3/3] Revert "drm/amd/display: Expose connector VRR range via debugfs" Bhanuprakash Modem
@ 2020-06-22 14:57 ` Kazlauskas, Nicholas
2020-06-22 19:00 ` [Intel-gfx] " Manasi Navare
2020-06-24 22:48 ` [PATCH v2 " Manasi Navare
1 sibling, 1 reply; 9+ messages in thread
From: Kazlauskas, Nicholas @ 2020-06-22 14:57 UTC (permalink / raw)
To: Bhanuprakash Modem, dri-devel, intel-gfx
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
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Intel-gfx] [v1 3/3] Revert "drm/amd/display: Expose connector VRR range via debugfs"
2020-06-22 14:57 ` Kazlauskas, Nicholas
@ 2020-06-22 19:00 ` Manasi Navare
0 siblings, 0 replies; 9+ messages in thread
From: Manasi Navare @ 2020-06-22 19:00 UTC (permalink / raw)
To: Kazlauskas, Nicholas; +Cc: intel-gfx, dri-devel, Bhanuprakash Modem
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
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2 3/3] Revert "drm/amd/display: Expose connector VRR range via debugfs"
2020-06-22 14:25 ` [v1 3/3] Revert "drm/amd/display: Expose connector VRR range via debugfs" Bhanuprakash Modem
2020-06-22 14:57 ` Kazlauskas, Nicholas
@ 2020-06-24 22:48 ` Manasi Navare
1 sibling, 0 replies; 9+ messages in thread
From: Manasi Navare @ 2020-06-24 22:48 UTC (permalink / raw)
To: intel-gfx, dri-devel
Cc: AMD gfx, Manasi Navare, Bhanuprakash Modem, Alex Deucher,
Nicholas Kazlauskas
From: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
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 <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>
Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
---
.../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
--
2.19.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 9+ messages in thread