Hi Greg,
Linus had to apply a fixup for this patch. Please ensure that it's in
your patch list:
commit d652d5f1eeeb06046009f4fcb9b4542249526916
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu Dec 17 09:27:57 2020 -0800
drm/edid: fix objtool warning in drm_cvt_modes()
It does not appear to have a Fixes tag, so may not have been picked up
by your automated tooling.
Cheers,
-ilia
On Mon, Dec 28, 2020 at 9:01 AM Greg Kroah-Hartman
<gregkh@linuxfoundation.org> wrote:
>
> From: Lyude Paul <lyude@redhat.com>
>
> [ Upstream commit 991fcb77f490390bcad89fa67d95763c58cdc04c ]
>
> Noticed this when trying to compile with -Wall on a kernel fork. We
> potentially don't set width here, which causes the compiler to complain
> about width potentially being uninitialized in drm_cvt_modes(). So, let's
> fix that.
>
> Changes since v1:
> * Don't emit an error as this code isn't reachable, just mark it as such
> Changes since v2:
> * Remove now unused variable
>
> Fixes: 3f649ab728cd ("treewide: Remove uninitialized_var() usage")
> Signed-off-by: Lyude Paul <lyude@redhat.com>
> Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
> Link: https://patchwork.freedesktop.org/patch/msgid/20201105235703.1328115-1-lyude@redhat.com
> Signed-off-by: Sasha Levin <sashal@kernel.org>
> ---
> drivers/gpu/drm/drm_edid.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
> index 631125b46e04c..b84efd538a702 100644
> --- a/drivers/gpu/drm/drm_edid.c
> +++ b/drivers/gpu/drm/drm_edid.c
> @@ -3114,6 +3114,8 @@ static int drm_cvt_modes(struct drm_connector *connector,
> case 0x0c:
> width = height * 15 / 9;
> break;
> + default:
> + unreachable();
> }
>
> for (j = 1; j < 5; j++) {
> --
> 2.27.0
>
>
>
On Mon, Dec 28, 2020 at 09:09:59AM -0500, Ilia Mirkin wrote: > Hi Greg, > > Linus had to apply a fixup for this patch. Please ensure that it's in > your patch list: > > commit d652d5f1eeeb06046009f4fcb9b4542249526916 > Author: Linus Torvalds <torvalds@linux-foundation.org> > Date: Thu Dec 17 09:27:57 2020 -0800 > > drm/edid: fix objtool warning in drm_cvt_modes() > > It does not appear to have a Fixes tag, so may not have been picked up > by your automated tooling. It was not, thanks, now queued up! greg k-h
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 631125b46e04c..b84efd538a702 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -3114,6 +3114,8 @@ static int drm_cvt_modes(struct drm_connector *connector, case 0x0c: width = height * 15 / 9; break; + default: + unreachable(); } for (j = 1; j < 5; j++) {