[PATCH] drm/i915/hdcp: Use correct function to check if encoder is HDMI

[PATCH] drm/i915/hdcp: Use correct function to check if encoder is HDMI

[Suraj Kandpal]

Use intel_encoder_is_hdmi function which was recently introduced to
see if encoder is HDMI or not.

Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
---
 drivers/gpu/drm/i915/display/intel_hdcp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
index 7464b44c8bb3..378bc5c2927b 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -41,7 +41,7 @@ intel_hdcp_adjust_hdcp_line_rekeying(struct intel_encoder *encoder,
 	u32 rekey_bit = 0;
 
 	/* Here we assume HDMI is in TMDS mode of operation */
-	if (encoder->type != INTEL_OUTPUT_HDMI)
+	if (intel_encoder_is_hdmi(encoder))
 		return;
 
 	if (DISPLAY_VER(display) >= 30) {
-- 
2.34.1

[PATCH] drm/i915/hdcp: Use correct function to check if encoder is HDMI

[Suraj Kandpal]

Use intel_encoder_is_hdmi function which was recently introduced to
see if encoder is HDMI or not.

Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
---
 drivers/gpu/drm/i915/display/intel_hdcp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
index 7464b44c8bb3..91d5629cd9f9 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -41,7 +41,7 @@ intel_hdcp_adjust_hdcp_line_rekeying(struct intel_encoder *encoder,
 	u32 rekey_bit = 0;
 
 	/* Here we assume HDMI is in TMDS mode of operation */
-	if (encoder->type != INTEL_OUTPUT_HDMI)
+	if (!intel_encoder_is_hdmi(encoder))
 		return;
 
 	if (DISPLAY_VER(display) >= 30) {
-- 
2.34.1

✗ i915.CI.BAT: failure for drm/i915/hdcp: Use correct function to check if encoder is HDMI (rev2)

[Patchwork]

[-- Attachment #1: Type: text/plain, Size: 5807 bytes --]

== Series Details ==

Series: drm/i915/hdcp: Use correct function to check if encoder is HDMI (rev2)
URL   : https://patchwork.freedesktop.org/series/143581/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_15964 -> Patchwork_143581v2
====================================================

Summary
-------

  **FAILURE**

  Serious unknown changes coming with Patchwork_143581v2 absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_143581v2, please notify your bug team (I915-ci-infra@lists.freedesktop.org) to allow them
  to document this new failure mode, which will reduce false positives in CI.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_143581v2/index.html

Participating hosts (42 -> 40)
------------------------------

  Missing    (2): fi-glk-j4005 fi-snb-2520m 

Possible new issues
-------------------

  Here are the unknown changes that may have been introduced in Patchwork_143581v2:

### IGT changes ###

#### Possible regressions ####

  * igt@i915_selftest@live@execlists:
    - bat-jsl-3:          [PASS][1] -> [DMESG-WARN][2] +1 other test dmesg-warn
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15964/bat-jsl-3/igt@i915_selftest@live@execlists.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_143581v2/bat-jsl-3/igt@i915_selftest@live@execlists.html

  * igt@i915_selftest@live@slpc:
    - bat-arlh-3:         [PASS][3] -> [INCOMPLETE][4]
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15964/bat-arlh-3/igt@i915_selftest@live@slpc.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_143581v2/bat-arlh-3/igt@i915_selftest@live@slpc.html

  
Known issues
------------

  Here are the changes found in Patchwork_143581v2 that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@dmabuf@all-tests:
    - bat-apl-1:          [PASS][5] -> [INCOMPLETE][6] ([i915#12904]) +1 other test incomplete
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15964/bat-apl-1/igt@dmabuf@all-tests.html
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_143581v2/bat-apl-1/igt@dmabuf@all-tests.html

  * igt@i915_module_load@load:
    - fi-pnv-d510:        [PASS][7] -> [ABORT][8] ([i915#13203])
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15964/fi-pnv-d510/igt@i915_module_load@load.html
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_143581v2/fi-pnv-d510/igt@i915_module_load@load.html
    - bat-twl-1:          [PASS][9] -> [DMESG-WARN][10] ([i915#1982])
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15964/bat-twl-1/igt@i915_module_load@load.html
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_143581v2/bat-twl-1/igt@i915_module_load@load.html

  * igt@i915_pm_rpm@module-reload:
    - bat-dg2-11:         [PASS][11] -> [FAIL][12] ([i915#13401])
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15964/bat-dg2-11/igt@i915_pm_rpm@module-reload.html
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_143581v2/bat-dg2-11/igt@i915_pm_rpm@module-reload.html

  * igt@i915_selftest@live:
    - bat-arlh-3:         [PASS][13] -> [INCOMPLETE][14] ([i915#12435])
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15964/bat-arlh-3/igt@i915_selftest@live.html
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_143581v2/bat-arlh-3/igt@i915_selftest@live.html

  * igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence:
    - bat-dg2-11:         [PASS][15] -> [SKIP][16] ([i915#9197]) +2 other tests skip
   [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15964/bat-dg2-11/igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence.html
   [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_143581v2/bat-dg2-11/igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence.html

  
#### Possible fixes ####

  * igt@i915_selftest@live:
    - bat-apl-1:          [DMESG-FAIL][17] ([i915#12435]) -> [PASS][18] +1 other test pass
   [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15964/bat-apl-1/igt@i915_selftest@live.html
   [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_143581v2/bat-apl-1/igt@i915_selftest@live.html

  * igt@i915_selftest@live@workarounds:
    - bat-arls-5:         [DMESG-FAIL][19] ([i915#13393]) -> [PASS][20] +1 other test pass
   [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15964/bat-arls-5/igt@i915_selftest@live@workarounds.html
   [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_143581v2/bat-arls-5/igt@i915_selftest@live@workarounds.html

  
  {name}: This element is suppressed. This means it is ignored when computing
          the status of the difference (SUCCESS, WARNING, or FAILURE).

  [i915#12435]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12435
  [i915#12904]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12904
  [i915#13203]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/13203
  [i915#13393]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/13393
  [i915#13401]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/13401
  [i915#1982]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/1982
  [i915#9197]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9197


Build changes
-------------

  * Linux: CI_DRM_15964 -> Patchwork_143581v2

  CI-20190529: 20190529
  CI_DRM_15964: 4cea1f90028925afcf1a0f8a0ef301f90349688c @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_8192: a3b85ce819b99284bef57aafc7d44f50a62e097f @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
  Patchwork_143581v2: 4cea1f90028925afcf1a0f8a0ef301f90349688c @ git://anongit.freedesktop.org/gfx-ci/linux

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_143581v2/index.html

[-- Attachment #2: Type: text/html, Size: 6729 bytes --]

Re: [PATCH] drm/i915/hdcp: Use correct function to check if encoder is HDMI

[Jani Nikula]

On Thu, 16 Jan 2025, Suraj Kandpal <suraj.kandpal@intel.com> wrote:
> Use intel_encoder_is_hdmi function which was recently introduced to
> see if encoder is HDMI or not.

Does this mean we always returned early from
intel_hdcp_adjust_hdcp_line_rekeying()?

Fixes: ?

BR,
Jani.






>
> Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_hdcp.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
> index 7464b44c8bb3..91d5629cd9f9 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> @@ -41,7 +41,7 @@ intel_hdcp_adjust_hdcp_line_rekeying(struct intel_encoder *encoder,
>  	u32 rekey_bit = 0;
>  
>  	/* Here we assume HDMI is in TMDS mode of operation */
> -	if (encoder->type != INTEL_OUTPUT_HDMI)
> +	if (!intel_encoder_is_hdmi(encoder))
>  		return;
>  
>  	if (DISPLAY_VER(display) >= 30) {

-- 
Jani Nikula, Intel

Re: [PATCH] drm/i915/hdcp: Use correct function to check if encoder is HDMI

[Jani Nikula]

On Thu, 16 Jan 2025, Jani Nikula <jani.nikula@linux.intel.com> wrote:
> On Thu, 16 Jan 2025, Suraj Kandpal <suraj.kandpal@intel.com> wrote:
>> Use intel_encoder_is_hdmi function which was recently introduced to
>> see if encoder is HDMI or not.
>
> Does this mean we always returned early from
> intel_hdcp_adjust_hdcp_line_rekeying()?
>
> Fixes: ?

And why is there no patch changelog, just two patches on the list, one
with the condition flipped and the other not?


>
> BR,
> Jani.
>
>
>
>
>
>
>>
>> Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
>> ---
>>  drivers/gpu/drm/i915/display/intel_hdcp.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
>> index 7464b44c8bb3..91d5629cd9f9 100644
>> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
>> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
>> @@ -41,7 +41,7 @@ intel_hdcp_adjust_hdcp_line_rekeying(struct intel_encoder *encoder,
>>  	u32 rekey_bit = 0;
>>  
>>  	/* Here we assume HDMI is in TMDS mode of operation */
>> -	if (encoder->type != INTEL_OUTPUT_HDMI)
>> +	if (!intel_encoder_is_hdmi(encoder))
>>  		return;
>>  
>>  	if (DISPLAY_VER(display) >= 30) {

-- 
Jani Nikula, Intel

RE: [PATCH] drm/i915/hdcp: Use correct function to check if encoder is HDMI

[Kandpal, Suraj]

> -----Original Message-----
> From: Jani Nikula <jani.nikula@linux.intel.com>
> Sent: Thursday, January 16, 2025 1:38 PM
> To: Kandpal, Suraj <suraj.kandpal@intel.com>; intel-xe@lists.freedesktop.org;
> intel-gfx@lists.freedesktop.org
> Cc: Nautiyal, Ankit K <ankit.k.nautiyal@intel.com>; Bhadane, Dnyaneshwar
> <dnyaneshwar.bhadane@intel.com>; Kandpal, Suraj
> <suraj.kandpal@intel.com>
> Subject: Re: [PATCH] drm/i915/hdcp: Use correct function to check if encoder
> is HDMI
> 
> On Thu, 16 Jan 2025, Jani Nikula <jani.nikula@linux.intel.com> wrote:
> > On Thu, 16 Jan 2025, Suraj Kandpal <suraj.kandpal@intel.com> wrote:
> >> Use intel_encoder_is_hdmi function which was recently introduced to
> >> see if encoder is HDMI or not.
> >
> > Does this mean we always returned early from
> > intel_hdcp_adjust_hdcp_line_rekeying()?
> >

Apparently so. Wasn't aware that encoder->type really didn’t work in the later gen

> > Fixes: ?
> 

Sure will add it

> And why is there no patch changelog, just two patches on the list, one with
> the condition flipped and the other not?

Oh that’s because of my bad luck with network I never meant to send the first patch(revision 1) and infact was not
Aware it had gone through since I had cancelled it didn’t realize it till I got saw two mails from me when I sent the
Correct patch immediately after 😐. Will be more careful with that next time

Regards,
Suraj Kandpal

> 
> 
> >
> > BR,
> > Jani.
> >
> >
> >
> >
> >
> >
> >>
> >> Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
> >> ---
> >>  drivers/gpu/drm/i915/display/intel_hdcp.c | 2 +-
> >>  1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c
> >> b/drivers/gpu/drm/i915/display/intel_hdcp.c
> >> index 7464b44c8bb3..91d5629cd9f9 100644
> >> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> >> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> >> @@ -41,7 +41,7 @@ intel_hdcp_adjust_hdcp_line_rekeying(struct
> intel_encoder *encoder,
> >>  	u32 rekey_bit = 0;
> >>
> >>  	/* Here we assume HDMI is in TMDS mode of operation */
> >> -	if (encoder->type != INTEL_OUTPUT_HDMI)
> >> +	if (!intel_encoder_is_hdmi(encoder))
> >>  		return;
> >>
> >>  	if (DISPLAY_VER(display) >= 30) {
> 
> --
> Jani Nikula, Intel

[PATCH] drm/i915/hdcp: Use correct function to check if encoder is HDMI

[Suraj Kandpal]

Use intel_encoder_is_hdmi function which was recently introduced to
see if encoder is HDMI or not.

--v2
-Add Fixes tag [Jani]

Fixes: 6a3691ca4799 ("drm/i915/hdcp: Disable HDCP Line Rekeying for HDCP2.2 on HDMI")
Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
---
 drivers/gpu/drm/i915/display/intel_hdcp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
index 7464b44c8bb3..91d5629cd9f9 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -41,7 +41,7 @@ intel_hdcp_adjust_hdcp_line_rekeying(struct intel_encoder *encoder,
 	u32 rekey_bit = 0;
 
 	/* Here we assume HDMI is in TMDS mode of operation */
-	if (encoder->type != INTEL_OUTPUT_HDMI)
+	if (!intel_encoder_is_hdmi(encoder))
 		return;
 
 	if (DISPLAY_VER(display) >= 30) {
-- 
2.34.1

Re: [PATCH] drm/i915/hdcp: Use correct function to check if encoder is HDMI

[Jani Nikula]

On Fri, 17 Jan 2025, Suraj Kandpal <suraj.kandpal@intel.com> wrote:
> Use intel_encoder_is_hdmi function which was recently introduced to
> see if encoder is HDMI or not.
>
> --v2
> -Add Fixes tag [Jani]
>
> Fixes: 6a3691ca4799 ("drm/i915/hdcp: Disable HDCP Line Rekeying for HDCP2.2 on HDMI")
> Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>

Reviewed-by: Jani Nikula <jani.nikula@intel.com>

> ---
>  drivers/gpu/drm/i915/display/intel_hdcp.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
> index 7464b44c8bb3..91d5629cd9f9 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> @@ -41,7 +41,7 @@ intel_hdcp_adjust_hdcp_line_rekeying(struct intel_encoder *encoder,
>  	u32 rekey_bit = 0;
>  
>  	/* Here we assume HDMI is in TMDS mode of operation */
> -	if (encoder->type != INTEL_OUTPUT_HDMI)
> +	if (!intel_encoder_is_hdmi(encoder))
>  		return;
>  
>  	if (DISPLAY_VER(display) >= 30) {

-- 
Jani Nikula, Intel

RE: [PATCH] drm/i915/hdcp: Use correct function to check if encoder is HDMI

[Kandpal, Suraj]

> -----Original Message-----
> From: Nikula, Jani <jani.nikula@intel.com>
> Sent: Monday, January 20, 2025 4:22 PM
> To: Kandpal, Suraj <suraj.kandpal@intel.com>; intel-xe@lists.freedesktop.org;
> intel-gfx@lists.freedesktop.org
> Cc: Nautiyal, Ankit K <ankit.k.nautiyal@intel.com>; Bhadane, Dnyaneshwar
> <dnyaneshwar.bhadane@intel.com>; Kandpal, Suraj
> <suraj.kandpal@intel.com>
> Subject: Re: [PATCH] drm/i915/hdcp: Use correct function to check if encoder
> is HDMI
> 
> On Fri, 17 Jan 2025, Suraj Kandpal <suraj.kandpal@intel.com> wrote:
> > Use intel_encoder_is_hdmi function which was recently introduced to
> > see if encoder is HDMI or not.
> >
> > --v2
> > -Add Fixes tag [Jani]
> >
> > Fixes: 6a3691ca4799 ("drm/i915/hdcp: Disable HDCP Line Rekeying for
> > HDCP2.2 on HDMI")
> > Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
> 
> Reviewed-by: Jani Nikula <jani.nikula@intel.com>

Thanks for the review pushed to din

Regards,
Suraj Kandpal 

> 
> > ---
> >  drivers/gpu/drm/i915/display/intel_hdcp.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c
> > b/drivers/gpu/drm/i915/display/intel_hdcp.c
> > index 7464b44c8bb3..91d5629cd9f9 100644
> > --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> > +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> > @@ -41,7 +41,7 @@ intel_hdcp_adjust_hdcp_line_rekeying(struct
> intel_encoder *encoder,
> >  	u32 rekey_bit = 0;
> >
> >  	/* Here we assume HDMI is in TMDS mode of operation */
> > -	if (encoder->type != INTEL_OUTPUT_HDMI)
> > +	if (!intel_encoder_is_hdmi(encoder))
> >  		return;
> >
> >  	if (DISPLAY_VER(display) >= 30) {
> 
> --
> Jani Nikula, Intel