| Message ID | 20250116052023.981666-1-suraj.kandpal@intel.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | drm/i915/hdcp: Use correct function to check if encoder is HDMI | expand |
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) {
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) {
> -----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
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) {
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(-)