From: Maxime Ripard <maxime@cerno.tech>
To: Nathan Chancellor <nathan@kernel.org>
Cc: "Stephen Rothwell" <sfr@canb.auug.org.au>,
"Daniel Vetter" <daniel.vetter@ffwll.ch>,
"Intel Graphics" <intel-gfx@lists.freedesktop.org>,
DRI <dri-devel@lists.freedesktop.org>,
"José Expósito" <jose.exposito89@gmail.com>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Linux Next Mailing List" <linux-next@vger.kernel.org>,
llvm@lists.linux.dev
Subject: Re: linux-next: manual merge of the drm-misc tree with the origin tree
Date: Fri, 18 Nov 2022 10:20:20 +0100 [thread overview]
Message-ID: <20221118092020.nhvjomvwwryb7j3n@houat> (raw)
In-Reply-To: <Y3bLRLDCrd7KYqom@dev-arch.thelio-3990X>
[-- Attachment #1: Type: text/plain, Size: 1419 bytes --]
On Thu, Nov 17, 2022 at 05:01:08PM -0700, Nathan Chancellor wrote:
> On Fri, Nov 18, 2022 at 09:06:36AM +1100, Stephen Rothwell wrote:
> > Hi Nathan,
> >
> > On Thu, 17 Nov 2022 10:29:33 -0700 Nathan Chancellor <nathan@kernel.org> wrote:
> > >
> > > This resolution is not quite right, as pointed out by clang:
> > >
> > > drivers/gpu/drm/vc4/vc4_hdmi.c:351:14: error: variable 'vc4_hdmi' is uninitialized when used here [-Werror,-Wuninitialized]
> > > mutex_lock(&vc4_hdmi->mutex);
> > > ^~~~~~~~
> > > ./include/linux/mutex.h:187:44: note: expanded from macro 'mutex_lock'
> > > #define mutex_lock(lock) mutex_lock_nested(lock, 0)
> > > ^~~~
> > > drivers/gpu/drm/vc4/vc4_hdmi.c:322:27: note: initialize the variable 'vc4_hdmi' to silence this warning
> > > struct vc4_hdmi *vc4_hdmi;
> > > ^
> > > = NULL
> > > 1 error generated.
> > >
> > > Obviously, the assignment of vc4_hdmi should be before mutex_lock().
> >
> > Thanks for pointing that out (silly me :-) ). I have fixed up the
> > resolution for today.
>
> Great, thank you so much! One less warning to worry about :)
I actually did the same conflict resolution in drm-tip. I've fixed it up
too, thanks for your report :)
Maxime
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Maxime Ripard <maxime@cerno.tech>
To: Nathan Chancellor <nathan@kernel.org>
Cc: "Stephen Rothwell" <sfr@canb.auug.org.au>,
"Daniel Vetter" <daniel.vetter@ffwll.ch>,
"Intel Graphics" <intel-gfx@lists.freedesktop.org>,
llvm@lists.linux.dev,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
DRI <dri-devel@lists.freedesktop.org>,
"Linux Next Mailing List" <linux-next@vger.kernel.org>,
"José Expósito" <jose.exposito89@gmail.com>
Subject: Re: linux-next: manual merge of the drm-misc tree with the origin tree
Date: Fri, 18 Nov 2022 10:20:20 +0100 [thread overview]
Message-ID: <20221118092020.nhvjomvwwryb7j3n@houat> (raw)
In-Reply-To: <Y3bLRLDCrd7KYqom@dev-arch.thelio-3990X>
[-- Attachment #1: Type: text/plain, Size: 1419 bytes --]
On Thu, Nov 17, 2022 at 05:01:08PM -0700, Nathan Chancellor wrote:
> On Fri, Nov 18, 2022 at 09:06:36AM +1100, Stephen Rothwell wrote:
> > Hi Nathan,
> >
> > On Thu, 17 Nov 2022 10:29:33 -0700 Nathan Chancellor <nathan@kernel.org> wrote:
> > >
> > > This resolution is not quite right, as pointed out by clang:
> > >
> > > drivers/gpu/drm/vc4/vc4_hdmi.c:351:14: error: variable 'vc4_hdmi' is uninitialized when used here [-Werror,-Wuninitialized]
> > > mutex_lock(&vc4_hdmi->mutex);
> > > ^~~~~~~~
> > > ./include/linux/mutex.h:187:44: note: expanded from macro 'mutex_lock'
> > > #define mutex_lock(lock) mutex_lock_nested(lock, 0)
> > > ^~~~
> > > drivers/gpu/drm/vc4/vc4_hdmi.c:322:27: note: initialize the variable 'vc4_hdmi' to silence this warning
> > > struct vc4_hdmi *vc4_hdmi;
> > > ^
> > > = NULL
> > > 1 error generated.
> > >
> > > Obviously, the assignment of vc4_hdmi should be before mutex_lock().
> >
> > Thanks for pointing that out (silly me :-) ). I have fixed up the
> > resolution for today.
>
> Great, thank you so much! One less warning to worry about :)
I actually did the same conflict resolution in drm-tip. I've fixed it up
too, thanks for your report :)
Maxime
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Maxime Ripard <maxime@cerno.tech>
To: Nathan Chancellor <nathan@kernel.org>
Cc: "Stephen Rothwell" <sfr@canb.auug.org.au>,
"Daniel Vetter" <daniel.vetter@ffwll.ch>,
"Intel Graphics" <intel-gfx@lists.freedesktop.org>,
llvm@lists.linux.dev,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
DRI <dri-devel@lists.freedesktop.org>,
"Linux Next Mailing List" <linux-next@vger.kernel.org>,
"José Expósito" <jose.exposito89@gmail.com>
Subject: Re: [Intel-gfx] linux-next: manual merge of the drm-misc tree with the origin tree
Date: Fri, 18 Nov 2022 10:20:20 +0100 [thread overview]
Message-ID: <20221118092020.nhvjomvwwryb7j3n@houat> (raw)
In-Reply-To: <Y3bLRLDCrd7KYqom@dev-arch.thelio-3990X>
[-- Attachment #1: Type: text/plain, Size: 1419 bytes --]
On Thu, Nov 17, 2022 at 05:01:08PM -0700, Nathan Chancellor wrote:
> On Fri, Nov 18, 2022 at 09:06:36AM +1100, Stephen Rothwell wrote:
> > Hi Nathan,
> >
> > On Thu, 17 Nov 2022 10:29:33 -0700 Nathan Chancellor <nathan@kernel.org> wrote:
> > >
> > > This resolution is not quite right, as pointed out by clang:
> > >
> > > drivers/gpu/drm/vc4/vc4_hdmi.c:351:14: error: variable 'vc4_hdmi' is uninitialized when used here [-Werror,-Wuninitialized]
> > > mutex_lock(&vc4_hdmi->mutex);
> > > ^~~~~~~~
> > > ./include/linux/mutex.h:187:44: note: expanded from macro 'mutex_lock'
> > > #define mutex_lock(lock) mutex_lock_nested(lock, 0)
> > > ^~~~
> > > drivers/gpu/drm/vc4/vc4_hdmi.c:322:27: note: initialize the variable 'vc4_hdmi' to silence this warning
> > > struct vc4_hdmi *vc4_hdmi;
> > > ^
> > > = NULL
> > > 1 error generated.
> > >
> > > Obviously, the assignment of vc4_hdmi should be before mutex_lock().
> >
> > Thanks for pointing that out (silly me :-) ). I have fixed up the
> > resolution for today.
>
> Great, thank you so much! One less warning to worry about :)
I actually did the same conflict resolution in drm-tip. I've fixed it up
too, thanks for your report :)
Maxime
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
next prev parent reply other threads:[~2022-11-18 9:20 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-15 23:57 linux-next: manual merge of the drm-misc tree with the origin tree Stephen Rothwell
2022-11-15 23:57 ` [Intel-gfx] " Stephen Rothwell
2022-11-15 23:57 ` Stephen Rothwell
2022-11-17 17:29 ` Nathan Chancellor
2022-11-17 17:29 ` [Intel-gfx] " Nathan Chancellor
2022-11-17 17:29 ` Nathan Chancellor
2022-11-17 22:06 ` Stephen Rothwell
2022-11-17 22:06 ` Stephen Rothwell
2022-11-17 22:06 ` [Intel-gfx] " Stephen Rothwell
2022-11-18 0:01 ` Nathan Chancellor
2022-11-18 0:01 ` [Intel-gfx] " Nathan Chancellor
2022-11-18 0:01 ` Nathan Chancellor
2022-11-18 9:20 ` Maxime Ripard [this message]
2022-11-18 9:20 ` [Intel-gfx] " Maxime Ripard
2022-11-18 9:20 ` Maxime Ripard
-- strict thread matches above, loose matches on Subject: below --
2021-11-07 22:31 Stephen Rothwell
2021-11-07 22:31 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221118092020.nhvjomvwwryb7j3n@houat \
--to=maxime@cerno.tech \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jose.exposito89@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=llvm@lists.linux.dev \
--cc=nathan@kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.