* [Intel-gfx] [PATCH][next] drm/i915/hdcp: Fix return of value in uninitialized variable ret
@ 2021-01-22 15:09 Colin King
2021-01-22 15:21 ` Jani Nikula
2021-01-22 19:21 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for " Patchwork
0 siblings, 2 replies; 4+ messages in thread
From: Colin King @ 2021-01-22 15:09 UTC (permalink / raw)
To: Jani Nikula, Joonas Lahtinen, Rodrigo Vivi, David Airlie,
Daniel Vetter, Ramalingam C, Anshuman Gupta, Uma Shankar,
intel-gfx, dri-devel
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
Currently when there are other connectors on the port using HDCP the
function _intel_hdcp_disable returns a garbage uninitialized value in
variable ret. I believe the intention is to return 0, so return this
literal value instead of the value in ret.
Addresses-Coverity: ("Uninitialized scalar return")
Fixes: 899c8762f981 ("drm/i915/hdcp: Configure HDCP2.2 MST steram encryption status")
Signed-off-by: Colin Ian King <colin.king@canonical.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 db8dff2eeb0a..a0e7b0bf892b 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -883,7 +883,7 @@ static int _intel_hdcp_disable(struct intel_connector *connector)
* until it disabled HDCP encryption for all connectors in MST topology.
*/
if (dig_port->num_hdcp_streams > 0)
- return ret;
+ return 0;
hdcp->hdcp_encrypted = false;
intel_de_write(dev_priv, HDCP_CONF(dev_priv, cpu_transcoder, port), 0);
--
2.29.2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Intel-gfx] [PATCH][next] drm/i915/hdcp: Fix return of value in uninitialized variable ret
2021-01-22 15:09 [Intel-gfx] [PATCH][next] drm/i915/hdcp: Fix return of value in uninitialized variable ret Colin King
@ 2021-01-22 15:21 ` Jani Nikula
2021-01-25 10:20 ` Gupta, Anshuman
2021-01-22 19:21 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for " Patchwork
1 sibling, 1 reply; 4+ messages in thread
From: Jani Nikula @ 2021-01-22 15:21 UTC (permalink / raw)
To: Colin King, Joonas Lahtinen, Rodrigo Vivi, David Airlie,
Daniel Vetter, Ramalingam C, Anshuman Gupta, Uma Shankar,
intel-gfx, dri-devel
Cc: kernel-janitors, linux-kernel
On Fri, 22 Jan 2021, Colin King <colin.king@canonical.com> wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Currently when there are other connectors on the port using HDCP the
> function _intel_hdcp_disable returns a garbage uninitialized value in
> variable ret. I believe the intention is to return 0, so return this
> literal value instead of the value in ret.
>
> Addresses-Coverity: ("Uninitialized scalar return")
> Fixes: 899c8762f981 ("drm/i915/hdcp: Configure HDCP2.2 MST steram encryption status")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
Thanks, but there's already a fix in progress:
http://lore.kernel.org/r/20210119064655.1605-3-anshuman.gupta@intel.com
BR,
Jani.
> ---
> 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 db8dff2eeb0a..a0e7b0bf892b 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> @@ -883,7 +883,7 @@ static int _intel_hdcp_disable(struct intel_connector *connector)
> * until it disabled HDCP encryption for all connectors in MST topology.
> */
> if (dig_port->num_hdcp_streams > 0)
> - return ret;
> + return 0;
>
> hdcp->hdcp_encrypted = false;
> intel_de_write(dev_priv, HDCP_CONF(dev_priv, cpu_transcoder, port), 0);
--
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] 4+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915/hdcp: Fix return of value in uninitialized variable ret
2021-01-22 15:09 [Intel-gfx] [PATCH][next] drm/i915/hdcp: Fix return of value in uninitialized variable ret Colin King
2021-01-22 15:21 ` Jani Nikula
@ 2021-01-22 19:21 ` Patchwork
1 sibling, 0 replies; 4+ messages in thread
From: Patchwork @ 2021-01-22 19:21 UTC (permalink / raw)
To: Colin King; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/hdcp: Fix return of value in uninitialized variable ret
URL : https://patchwork.freedesktop.org/series/86186/
State : failure
== Summary ==
Applying: drm/i915/hdcp: Fix return of value in uninitialized variable ret
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/display/intel_hdcp.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/display/intel_hdcp.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_hdcp.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 drm/i915/hdcp: Fix return of value in uninitialized variable ret
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Intel-gfx] [PATCH][next] drm/i915/hdcp: Fix return of value in uninitialized variable ret
2021-01-22 15:21 ` Jani Nikula
@ 2021-01-25 10:20 ` Gupta, Anshuman
0 siblings, 0 replies; 4+ messages in thread
From: Gupta, Anshuman @ 2021-01-25 10:20 UTC (permalink / raw)
To: Jani Nikula, Colin King, Joonas Lahtinen, Vivi, Rodrigo,
David Airlie, Daniel Vetter, C, Ramalingam, Shankar, Uma,
intel-gfx, dri-devel
Cc: kernel-janitors, linux-kernel
It is already merged to drm-intel-next
https://cgit.freedesktop.org/drm/drm-intel/commit/?h=drm-intel-next&id=40a6cead28f841ac350bd38dd7260ecacd5eab03
> -----Original Message-----
> From: Jani Nikula <jani.nikula@linux.intel.com>
> Sent: Friday, January 22, 2021 8:51 PM
> To: Colin King <colin.king@canonical.com>; Joonas Lahtinen
> <joonas.lahtinen@linux.intel.com>; Vivi, Rodrigo <rodrigo.vivi@intel.com>;
> David Airlie <airlied@linux.ie>; Daniel Vetter <daniel@ffwll.ch>; C, Ramalingam
> <ramalingam.c@intel.com>; Gupta, Anshuman <anshuman.gupta@intel.com>;
> Shankar, Uma <uma.shankar@intel.com>; intel-gfx@lists.freedesktop.org; dri-
> devel@lists.freedesktop.org
> Cc: kernel-janitors@vger.kernel.org; linux-kernel@vger.kernel.org
> Subject: Re: [PATCH][next] drm/i915/hdcp: Fix return of value in uninitialized
> variable ret
>
> On Fri, 22 Jan 2021, Colin King <colin.king@canonical.com> wrote:
> > From: Colin Ian King <colin.king@canonical.com>
> >
> > Currently when there are other connectors on the port using HDCP the
> > function _intel_hdcp_disable returns a garbage uninitialized value in
> > variable ret. I believe the intention is to return 0, so return this
> > literal value instead of the value in ret.
> >
> > Addresses-Coverity: ("Uninitialized scalar return")
> > Fixes: 899c8762f981 ("drm/i915/hdcp: Configure HDCP2.2 MST steram
> > encryption status")
> > Signed-off-by: Colin Ian King <colin.king@canonical.com>
>
> Thanks, but there's already a fix in progress:
>
> http://lore.kernel.org/r/20210119064655.1605-3-anshuman.gupta@intel.com
>
> BR,
> Jani.
>
>
> > ---
> > 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 db8dff2eeb0a..a0e7b0bf892b 100644
> > --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> > +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> > @@ -883,7 +883,7 @@ static int _intel_hdcp_disable(struct intel_connector
> *connector)
> > * until it disabled HDCP encryption for all connectors in MST topology.
> > */
> > if (dig_port->num_hdcp_streams > 0)
> > - return ret;
> > + return 0;
> >
> > hdcp->hdcp_encrypted = false;
> > intel_de_write(dev_priv, HDCP_CONF(dev_priv, cpu_transcoder, port),
> > 0);
>
> --
> 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] 4+ messages in thread
end of thread, other threads:[~2021-01-25 10:20 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-22 15:09 [Intel-gfx] [PATCH][next] drm/i915/hdcp: Fix return of value in uninitialized variable ret Colin King
2021-01-22 15:21 ` Jani Nikula
2021-01-25 10:20 ` Gupta, Anshuman
2021-01-22 19:21 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for " 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).