* [Intel-gfx] [PATCH 0/2] HDCP minor refactoring
@ 2020-05-13 12:18 Anshuman Gupta
2020-05-13 12:18 ` [Intel-gfx] [PATCH 1/2] drm/i915/hdcp: Add update_pipe early return Anshuman Gupta
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Anshuman Gupta @ 2020-05-13 12:18 UTC (permalink / raw)
To: intel-gfx
No functional change.
Anshuman Gupta (2):
drm/i915/hdcp: Add update_pipe early return
drm/i915/hdcp: No direct access to power_well desc
drivers/gpu/drm/i915/display/intel_hdcp.c | 24 ++++++++++-------------
1 file changed, 10 insertions(+), 14 deletions(-)
--
2.26.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Intel-gfx] [PATCH 1/2] drm/i915/hdcp: Add update_pipe early return
2020-05-13 12:18 [Intel-gfx] [PATCH 0/2] HDCP minor refactoring Anshuman Gupta
@ 2020-05-13 12:18 ` Anshuman Gupta
2020-05-18 10:14 ` Shankar, Uma
2020-05-13 12:18 ` [Intel-gfx] [PATCH 2/2] drm/i915/hdcp: No direct access to power_well desc Anshuman Gupta
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Anshuman Gupta @ 2020-05-13 12:18 UTC (permalink / raw)
To: intel-gfx
Currently intel_hdcp_update_pipe() is also getting called for non-hdcp
connectors and got though its conditional code flow, which is completely
unnecessary for non-hdcp connectors, therefore it make sense to
have an early return. No functional change.
Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
---
drivers/gpu/drm/i915/display/intel_hdcp.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
index 2cbc4619b4ce..d0a2bee9035a 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -2079,11 +2079,15 @@ void intel_hdcp_update_pipe(struct intel_atomic_state *state,
struct intel_connector *connector =
to_intel_connector(conn_state->connector);
struct intel_hdcp *hdcp = &connector->hdcp;
- bool content_protection_type_changed =
+ bool content_protection_type_changed;
+
+ if (!connector->hdcp.shim)
+ return;
+
+ content_protection_type_changed =
(conn_state->hdcp_content_type != hdcp->content_type &&
conn_state->content_protection !=
DRM_MODE_CONTENT_PROTECTION_UNDESIRED);
-
/*
* During the HDCP encryption session if Type change is requested,
* disable the HDCP and reenable it with new TYPE value.
--
2.26.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Intel-gfx] [PATCH 2/2] drm/i915/hdcp: No direct access to power_well desc
2020-05-13 12:18 [Intel-gfx] [PATCH 0/2] HDCP minor refactoring Anshuman Gupta
2020-05-13 12:18 ` [Intel-gfx] [PATCH 1/2] drm/i915/hdcp: Add update_pipe early return Anshuman Gupta
@ 2020-05-13 12:18 ` Anshuman Gupta
2020-05-14 10:16 ` Jani Nikula
2020-05-13 15:03 ` [Intel-gfx] ✓ Fi.CI.BAT: success for HDCP minor refactoring Patchwork
2020-05-14 12:03 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
3 siblings, 1 reply; 8+ messages in thread
From: Anshuman Gupta @ 2020-05-13 12:18 UTC (permalink / raw)
To: intel-gfx; +Cc: Jani Nikula
HDCP code doesn't require to access power_well internal stuff,
instead it should use the intel_display_power_well_is_enabled()
to get the status of desired power_well.
No functional change.
Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
---
drivers/gpu/drm/i915/display/intel_hdcp.c | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
index d0a2bee9035a..409bd5d98a81 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -148,9 +148,8 @@ static int intel_hdcp_poll_ksv_fifo(struct intel_digital_port *intel_dig_port,
static bool hdcp_key_loadable(struct drm_i915_private *dev_priv)
{
- struct i915_power_domains *power_domains = &dev_priv->power_domains;
- struct i915_power_well *power_well;
enum i915_power_well_id id;
+ intel_wakeref_t wakeref;
bool enabled = false;
/*
@@ -162,17 +161,10 @@ static bool hdcp_key_loadable(struct drm_i915_private *dev_priv)
else
id = SKL_DISP_PW_1;
- mutex_lock(&power_domains->lock);
-
/* PG1 (power well #1) needs to be enabled */
- for_each_power_well(dev_priv, power_well) {
- if (power_well->desc->id == id) {
- enabled = power_well->desc->ops->is_enabled(dev_priv,
- power_well);
- break;
- }
- }
- mutex_unlock(&power_domains->lock);
+ wakeref = intel_runtime_pm_get(&dev_priv->runtime_pm);
+ enabled = intel_display_power_well_is_enabled(dev_priv, id);
+ intel_runtime_pm_put(&dev_priv->runtime_pm, wakeref);
/*
* Another req for hdcp key loadability is enabled state of pll for
--
2.26.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for HDCP minor refactoring
2020-05-13 12:18 [Intel-gfx] [PATCH 0/2] HDCP minor refactoring Anshuman Gupta
2020-05-13 12:18 ` [Intel-gfx] [PATCH 1/2] drm/i915/hdcp: Add update_pipe early return Anshuman Gupta
2020-05-13 12:18 ` [Intel-gfx] [PATCH 2/2] drm/i915/hdcp: No direct access to power_well desc Anshuman Gupta
@ 2020-05-13 15:03 ` Patchwork
2020-05-14 12:03 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
3 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2020-05-13 15:03 UTC (permalink / raw)
To: Anshuman Gupta; +Cc: intel-gfx
== Series Details ==
Series: HDCP minor refactoring
URL : https://patchwork.freedesktop.org/series/77224/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8474 -> Patchwork_17646
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17646/index.html
Known issues
------------
Here are the changes found in Patchwork_17646 that come from known issues:
### IGT changes ###
#### Possible fixes ####
* igt@i915_selftest@live@execlists:
- fi-kbl-soraka: [DMESG-FAIL][1] ([i915#656]) -> [PASS][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8474/fi-kbl-soraka/igt@i915_selftest@live@execlists.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17646/fi-kbl-soraka/igt@i915_selftest@live@execlists.html
[i915#656]: https://gitlab.freedesktop.org/drm/intel/issues/656
Participating hosts (50 -> 44)
------------------------------
Missing (6): fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-kbl-7560u fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_8474 -> Patchwork_17646
CI-20190529: 20190529
CI_DRM_8474: 2244df7018f329285893f900c738e7074e6ae1d5 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5651: e54e2642f1967ca3c488db32264607df670d1dfb @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_17646: 0d54075397ea83098db4fb9ed01c9469a88cc409 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
0d54075397ea drm/i915/hdcp: No direct access to power_well desc
2838263c0b41 drm/i915/hdcp: Add update_pipe early return
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17646/index.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Intel-gfx] [PATCH 2/2] drm/i915/hdcp: No direct access to power_well desc
2020-05-13 12:18 ` [Intel-gfx] [PATCH 2/2] drm/i915/hdcp: No direct access to power_well desc Anshuman Gupta
@ 2020-05-14 10:16 ` Jani Nikula
0 siblings, 0 replies; 8+ messages in thread
From: Jani Nikula @ 2020-05-14 10:16 UTC (permalink / raw)
To: Anshuman Gupta, intel-gfx
On Wed, 13 May 2020, Anshuman Gupta <anshuman.gupta@intel.com> wrote:
> HDCP code doesn't require to access power_well internal stuff,
> instead it should use the intel_display_power_well_is_enabled()
> to get the status of desired power_well.
> No functional change.
>
> Cc: Jani Nikula <jani.nikula@intel.com>
> Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_hdcp.c | 16 ++++------------
> 1 file changed, 4 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
> index d0a2bee9035a..409bd5d98a81 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> @@ -148,9 +148,8 @@ static int intel_hdcp_poll_ksv_fifo(struct intel_digital_port *intel_dig_port,
>
> static bool hdcp_key_loadable(struct drm_i915_private *dev_priv)
> {
> - struct i915_power_domains *power_domains = &dev_priv->power_domains;
> - struct i915_power_well *power_well;
> enum i915_power_well_id id;
> + intel_wakeref_t wakeref;
> bool enabled = false;
>
> /*
> @@ -162,17 +161,10 @@ static bool hdcp_key_loadable(struct drm_i915_private *dev_priv)
> else
> id = SKL_DISP_PW_1;
>
> - mutex_lock(&power_domains->lock);
> -
> /* PG1 (power well #1) needs to be enabled */
> - for_each_power_well(dev_priv, power_well) {
> - if (power_well->desc->id == id) {
> - enabled = power_well->desc->ops->is_enabled(dev_priv,
> - power_well);
> - break;
> - }
> - }
> - mutex_unlock(&power_domains->lock);
> + wakeref = intel_runtime_pm_get(&dev_priv->runtime_pm);
> + enabled = intel_display_power_well_is_enabled(dev_priv, id);
> + intel_runtime_pm_put(&dev_priv->runtime_pm, wakeref);
with_intel_runtime_pm(&dev_priv->runtime_pm, wakeref)
enabled = intel_display_power_well_is_enabled(dev_priv, id);
>
> /*
> * Another req for hdcp key loadability is enabled state of pll for
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for HDCP minor refactoring
2020-05-13 12:18 [Intel-gfx] [PATCH 0/2] HDCP minor refactoring Anshuman Gupta
` (2 preceding siblings ...)
2020-05-13 15:03 ` [Intel-gfx] ✓ Fi.CI.BAT: success for HDCP minor refactoring Patchwork
@ 2020-05-14 12:03 ` Patchwork
3 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2020-05-14 12:03 UTC (permalink / raw)
To: Anshuman Gupta; +Cc: intel-gfx
== Series Details ==
Series: HDCP minor refactoring
URL : https://patchwork.freedesktop.org/series/77224/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8474_full -> Patchwork_17646_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_17646_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_suspend@fence-restore-tiled2untiled:
- shard-kbl: [PASS][1] -> [DMESG-WARN][2] ([i915#180]) +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8474/shard-kbl6/igt@i915_suspend@fence-restore-tiled2untiled.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17646/shard-kbl4/igt@i915_suspend@fence-restore-tiled2untiled.html
* igt@kms_cursor_crc@pipe-c-cursor-128x128-offscreen:
- shard-skl: [PASS][3] -> [FAIL][4] ([i915#54])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8474/shard-skl2/igt@kms_cursor_crc@pipe-c-cursor-128x128-offscreen.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17646/shard-skl10/igt@kms_cursor_crc@pipe-c-cursor-128x128-offscreen.html
* igt@kms_draw_crc@draw-method-rgb565-mmap-cpu-xtiled:
- shard-snb: [PASS][5] -> [SKIP][6] ([fdo#109271])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8474/shard-snb5/igt@kms_draw_crc@draw-method-rgb565-mmap-cpu-xtiled.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17646/shard-snb1/igt@kms_draw_crc@draw-method-rgb565-mmap-cpu-xtiled.html
* igt@kms_fbcon_fbt@psr-suspend:
- shard-skl: [PASS][7] -> [INCOMPLETE][8] ([i915#69])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8474/shard-skl6/igt@kms_fbcon_fbt@psr-suspend.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17646/shard-skl1/igt@kms_fbcon_fbt@psr-suspend.html
* igt@kms_frontbuffer_tracking@fbc-suspend:
- shard-apl: [PASS][9] -> [DMESG-WARN][10] ([i915#180] / [i915#95])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8474/shard-apl2/igt@kms_frontbuffer_tracking@fbc-suspend.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17646/shard-apl1/igt@kms_frontbuffer_tracking@fbc-suspend.html
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes:
- shard-apl: [PASS][11] -> [DMESG-WARN][12] ([i915#180]) +2 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8474/shard-apl2/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17646/shard-apl1/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes.html
* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: [PASS][13] -> [FAIL][14] ([fdo#108145] / [i915#265]) +2 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8474/shard-skl5/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17646/shard-skl5/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
* igt@kms_psr2_su@frontbuffer:
- shard-iclb: [PASS][15] -> [SKIP][16] ([fdo#109642] / [fdo#111068])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8474/shard-iclb2/igt@kms_psr2_su@frontbuffer.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17646/shard-iclb8/igt@kms_psr2_su@frontbuffer.html
#### Possible fixes ####
* igt@i915_suspend@sysfs-reader:
- shard-kbl: [DMESG-WARN][17] ([i915#180]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8474/shard-kbl4/igt@i915_suspend@sysfs-reader.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17646/shard-kbl6/igt@i915_suspend@sysfs-reader.html
* igt@kms_cursor_legacy@all-pipes-torture-move:
- shard-snb: [DMESG-WARN][19] ([i915#128]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8474/shard-snb5/igt@kms_cursor_legacy@all-pipes-torture-move.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17646/shard-snb2/igt@kms_cursor_legacy@all-pipes-torture-move.html
* igt@kms_cursor_legacy@pipe-d-torture-bo:
- shard-tglb: [DMESG-WARN][21] ([i915#128]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8474/shard-tglb1/igt@kms_cursor_legacy@pipe-d-torture-bo.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17646/shard-tglb6/igt@kms_cursor_legacy@pipe-d-torture-bo.html
* igt@kms_hdr@bpc-switch:
- shard-skl: [FAIL][23] ([i915#1188]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8474/shard-skl4/igt@kms_hdr@bpc-switch.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17646/shard-skl9/igt@kms_hdr@bpc-switch.html
* igt@kms_psr@psr2_primary_blt:
- shard-iclb: [SKIP][25] ([fdo#109441]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8474/shard-iclb8/igt@kms_psr@psr2_primary_blt.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17646/shard-iclb2/igt@kms_psr@psr2_primary_blt.html
#### Warnings ####
* igt@i915_pm_dc@dc6-dpms:
- shard-tglb: [FAIL][27] ([i915#454]) -> [SKIP][28] ([i915#468])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8474/shard-tglb3/igt@i915_pm_dc@dc6-dpms.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17646/shard-tglb2/igt@i915_pm_dc@dc6-dpms.html
* igt@i915_pm_rc6_residency@rc6-idle:
- shard-iclb: [WARN][29] ([i915#1515]) -> [FAIL][30] ([i915#1515])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8474/shard-iclb6/igt@i915_pm_rc6_residency@rc6-idle.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17646/shard-iclb7/igt@i915_pm_rc6_residency@rc6-idle.html
* igt@kms_content_protection@atomic-dpms:
- shard-apl: [TIMEOUT][31] ([i915#1319]) -> [FAIL][32] ([fdo#110321] / [fdo#110336] / [i915#95]) +1 similar issue
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8474/shard-apl4/igt@kms_content_protection@atomic-dpms.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17646/shard-apl3/igt@kms_content_protection@atomic-dpms.html
* igt@runner@aborted:
- shard-tglb: [FAIL][33] ([i915#1602]) -> ([FAIL][34], [FAIL][35]) ([i915#1602] / [i915#1759])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8474/shard-tglb7/igt@runner@aborted.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17646/shard-tglb1/igt@runner@aborted.html
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17646/shard-tglb5/igt@runner@aborted.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110321]: https://bugs.freedesktop.org/show_bug.cgi?id=110321
[fdo#110336]: https://bugs.freedesktop.org/show_bug.cgi?id=110336
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#128]: https://gitlab.freedesktop.org/drm/intel/issues/128
[i915#1319]: https://gitlab.freedesktop.org/drm/intel/issues/1319
[i915#1515]: https://gitlab.freedesktop.org/drm/intel/issues/1515
[i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
[i915#1602]: https://gitlab.freedesktop.org/drm/intel/issues/1602
[i915#1759]: https://gitlab.freedesktop.org/drm/intel/issues/1759
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1823]: https://gitlab.freedesktop.org/drm/intel/issues/1823
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#468]: https://gitlab.freedesktop.org/drm/intel/issues/468
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#69]: https://gitlab.freedesktop.org/drm/intel/issues/69
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (11 -> 11)
------------------------------
No changes in participating hosts
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_8474 -> Patchwork_17646
CI-20190529: 20190529
CI_DRM_8474: 2244df7018f329285893f900c738e7074e6ae1d5 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5651: e54e2642f1967ca3c488db32264607df670d1dfb @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_17646: 0d54075397ea83098db4fb9ed01c9469a88cc409 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17646/index.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Intel-gfx] [PATCH 1/2] drm/i915/hdcp: Add update_pipe early return
2020-05-13 12:18 ` [Intel-gfx] [PATCH 1/2] drm/i915/hdcp: Add update_pipe early return Anshuman Gupta
@ 2020-05-18 10:14 ` Shankar, Uma
2020-05-18 10:18 ` Gupta, Anshuman
0 siblings, 1 reply; 8+ messages in thread
From: Shankar, Uma @ 2020-05-18 10:14 UTC (permalink / raw)
To: Gupta, Anshuman, intel-gfx
> -----Original Message-----
> From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of
> Anshuman Gupta
> Sent: Wednesday, May 13, 2020 5:49 PM
> To: intel-gfx@lists.freedesktop.org
> Subject: [Intel-gfx] [PATCH 1/2] drm/i915/hdcp: Add update_pipe early return
>
> Currently intel_hdcp_update_pipe() is also getting called for non-hdcp
> connectors and got though its conditional code flow, which is completely
> unnecessary for non-hdcp connectors, therefore it make sense to have an early
> return. No functional change.
Looks Good to me.
Reviewed-by: Uma Shankar <uma.shankar@intel.com>
> Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_hdcp.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c
> b/drivers/gpu/drm/i915/display/intel_hdcp.c
> index 2cbc4619b4ce..d0a2bee9035a 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> @@ -2079,11 +2079,15 @@ void intel_hdcp_update_pipe(struct
> intel_atomic_state *state,
> struct intel_connector *connector =
> to_intel_connector(conn_state->connector);
> struct intel_hdcp *hdcp = &connector->hdcp;
> - bool content_protection_type_changed =
> + bool content_protection_type_changed;
> +
> + if (!connector->hdcp.shim)
> + return;
> +
> + content_protection_type_changed =
> (conn_state->hdcp_content_type != hdcp->content_type &&
> conn_state->content_protection !=
> DRM_MODE_CONTENT_PROTECTION_UNDESIRED);
> -
> /*
> * During the HDCP encryption session if Type change is requested,
> * disable the HDCP and reenable it with new TYPE value.
> --
> 2.26.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Intel-gfx] [PATCH 1/2] drm/i915/hdcp: Add update_pipe early return
2020-05-18 10:14 ` Shankar, Uma
@ 2020-05-18 10:18 ` Gupta, Anshuman
0 siblings, 0 replies; 8+ messages in thread
From: Gupta, Anshuman @ 2020-05-18 10:18 UTC (permalink / raw)
To: Shankar, Uma, intel-gfx
-----Original Message-----
From: Shankar, Uma <uma.shankar@intel.com>
Sent: Monday, May 18, 2020 3:45 PM
To: Gupta, Anshuman <anshuman.gupta@intel.com>; intel-gfx@lists.freedesktop.org
Subject: RE: [Intel-gfx] [PATCH 1/2] drm/i915/hdcp: Add update_pipe early return
> -----Original Message-----
> From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of
> Anshuman Gupta
> Sent: Wednesday, May 13, 2020 5:49 PM
> To: intel-gfx@lists.freedesktop.org
> Subject: [Intel-gfx] [PATCH 1/2] drm/i915/hdcp: Add update_pipe early
> return
>
> Currently intel_hdcp_update_pipe() is also getting called for non-hdcp
> connectors and got though its conditional code flow, which is
> completely unnecessary for non-hdcp connectors, therefore it make
> sense to have an early return. No functional change.
Looks Good to me.
Reviewed-by: Uma Shankar <uma.shankar@intel.com>
Thanks Uma for review!
> Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_hdcp.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c
> b/drivers/gpu/drm/i915/display/intel_hdcp.c
> index 2cbc4619b4ce..d0a2bee9035a 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> @@ -2079,11 +2079,15 @@ void intel_hdcp_update_pipe(struct
> intel_atomic_state *state,
> struct intel_connector *connector =
> to_intel_connector(conn_state->connector);
> struct intel_hdcp *hdcp = &connector->hdcp;
> - bool content_protection_type_changed =
> + bool content_protection_type_changed;
> +
> + if (!connector->hdcp.shim)
> + return;
> +
> + content_protection_type_changed =
> (conn_state->hdcp_content_type != hdcp->content_type &&
> conn_state->content_protection !=
> DRM_MODE_CONTENT_PROTECTION_UNDESIRED);
> -
> /*
> * During the HDCP encryption session if Type change is requested,
> * disable the HDCP and reenable it with new TYPE value.
> --
> 2.26.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-05-18 10:18 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-13 12:18 [Intel-gfx] [PATCH 0/2] HDCP minor refactoring Anshuman Gupta
2020-05-13 12:18 ` [Intel-gfx] [PATCH 1/2] drm/i915/hdcp: Add update_pipe early return Anshuman Gupta
2020-05-18 10:14 ` Shankar, Uma
2020-05-18 10:18 ` Gupta, Anshuman
2020-05-13 12:18 ` [Intel-gfx] [PATCH 2/2] drm/i915/hdcp: No direct access to power_well desc Anshuman Gupta
2020-05-14 10:16 ` Jani Nikula
2020-05-13 15:03 ` [Intel-gfx] ✓ Fi.CI.BAT: success for HDCP minor refactoring Patchwork
2020-05-14 12:03 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).