* linux-next: manual merge of the drm-misc tree with the origin tree
@ 2022-11-15 23:57 ` Stephen Rothwell
0 siblings, 0 replies; 17+ messages in thread
From: Stephen Rothwell @ 2022-11-15 23:57 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: José Expósito, Linux Kernel Mailing List,
Linux Next Mailing List, Maxime Ripard
[-- Attachment #1: Type: text/plain, Size: 1541 bytes --]
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/vc4/vc4_hdmi.c
between commit:
682f99b8ae88 ("drm/vc4: hdmi: Take our lock to reset the link")
from the origin tree and commits:
d218750805a3 ("drm/vc4: hdmi: Pass vc4_hdmi to vc4_hdmi_supports_scrambling()")
0a99962c0dbf ("drm/vc4: hdmi: Fix pointer dereference before check")
from the drm-misc tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpu/drm/vc4/vc4_hdmi.c
index d7fcc7a4c082,6b223a5fcf6f..000000000000
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@@ -349,12 -348,9 +348,13 @@@ static int vc4_hdmi_reset_link(struct d
if (!crtc_state->active)
return 0;
+ mutex_lock(&vc4_hdmi->mutex);
+
- if (!vc4_hdmi_supports_scrambling(encoder)) {
+ vc4_hdmi = connector_to_vc4_hdmi(connector);
- if (!vc4_hdmi_supports_scrambling(vc4_hdmi))
++ if (!vc4_hdmi_supports_scrambling(vc4_hdmi)) {
+ mutex_unlock(&vc4_hdmi->mutex);
return 0;
+ }
scrambling_needed = vc4_hdmi_mode_needs_scrambling(&vc4_hdmi->saved_adjusted_mode,
vc4_hdmi->output_bpc,
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread* [Intel-gfx] linux-next: manual merge of the drm-misc tree with the origin tree
@ 2022-11-15 23:57 ` Stephen Rothwell
0 siblings, 0 replies; 17+ messages in thread
From: Stephen Rothwell @ 2022-11-15 23:57 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: José Expósito, Linux Next Mailing List,
Linux Kernel Mailing List, Maxime Ripard
[-- Attachment #1: Type: text/plain, Size: 1541 bytes --]
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/vc4/vc4_hdmi.c
between commit:
682f99b8ae88 ("drm/vc4: hdmi: Take our lock to reset the link")
from the origin tree and commits:
d218750805a3 ("drm/vc4: hdmi: Pass vc4_hdmi to vc4_hdmi_supports_scrambling()")
0a99962c0dbf ("drm/vc4: hdmi: Fix pointer dereference before check")
from the drm-misc tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpu/drm/vc4/vc4_hdmi.c
index d7fcc7a4c082,6b223a5fcf6f..000000000000
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@@ -349,12 -348,9 +348,13 @@@ static int vc4_hdmi_reset_link(struct d
if (!crtc_state->active)
return 0;
+ mutex_lock(&vc4_hdmi->mutex);
+
- if (!vc4_hdmi_supports_scrambling(encoder)) {
+ vc4_hdmi = connector_to_vc4_hdmi(connector);
- if (!vc4_hdmi_supports_scrambling(vc4_hdmi))
++ if (!vc4_hdmi_supports_scrambling(vc4_hdmi)) {
+ mutex_unlock(&vc4_hdmi->mutex);
return 0;
+ }
scrambling_needed = vc4_hdmi_mode_needs_scrambling(&vc4_hdmi->saved_adjusted_mode,
vc4_hdmi->output_bpc,
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread* linux-next: manual merge of the drm-misc tree with the origin tree
@ 2022-11-15 23:57 ` Stephen Rothwell
0 siblings, 0 replies; 17+ messages in thread
From: Stephen Rothwell @ 2022-11-15 23:57 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: José Expósito, Linux Next Mailing List,
Linux Kernel Mailing List, Maxime Ripard
[-- Attachment #1: Type: text/plain, Size: 1541 bytes --]
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/vc4/vc4_hdmi.c
between commit:
682f99b8ae88 ("drm/vc4: hdmi: Take our lock to reset the link")
from the origin tree and commits:
d218750805a3 ("drm/vc4: hdmi: Pass vc4_hdmi to vc4_hdmi_supports_scrambling()")
0a99962c0dbf ("drm/vc4: hdmi: Fix pointer dereference before check")
from the drm-misc tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpu/drm/vc4/vc4_hdmi.c
index d7fcc7a4c082,6b223a5fcf6f..000000000000
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@@ -349,12 -348,9 +348,13 @@@ static int vc4_hdmi_reset_link(struct d
if (!crtc_state->active)
return 0;
+ mutex_lock(&vc4_hdmi->mutex);
+
- if (!vc4_hdmi_supports_scrambling(encoder)) {
+ vc4_hdmi = connector_to_vc4_hdmi(connector);
- if (!vc4_hdmi_supports_scrambling(vc4_hdmi))
++ if (!vc4_hdmi_supports_scrambling(vc4_hdmi)) {
+ mutex_unlock(&vc4_hdmi->mutex);
return 0;
+ }
scrambling_needed = vc4_hdmi_mode_needs_scrambling(&vc4_hdmi->saved_adjusted_mode,
vc4_hdmi->output_bpc,
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: linux-next: manual merge of the drm-misc tree with the origin tree
2022-11-15 23:57 ` Stephen Rothwell
(?)
@ 2022-11-17 17:29 ` Nathan Chancellor
-1 siblings, 0 replies; 17+ messages in thread
From: Nathan Chancellor @ 2022-11-17 17:29 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, Intel Graphics, llvm, Linux Kernel Mailing List,
DRI, Linux Next Mailing List, Maxime Ripard,
José Expósito
Hi Stephen,
On Wed, Nov 16, 2022 at 10:57:02AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the drm-misc tree got a conflict in:
>
> drivers/gpu/drm/vc4/vc4_hdmi.c
>
> between commit:
>
> 682f99b8ae88 ("drm/vc4: hdmi: Take our lock to reset the link")
>
> from the origin tree and commits:
>
> d218750805a3 ("drm/vc4: hdmi: Pass vc4_hdmi to vc4_hdmi_supports_scrambling()")
> 0a99962c0dbf ("drm/vc4: hdmi: Fix pointer dereference before check")
>
> from the drm-misc tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/gpu/drm/vc4/vc4_hdmi.c
> index d7fcc7a4c082,6b223a5fcf6f..000000000000
> --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
> +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
> @@@ -349,12 -348,9 +348,13 @@@ static int vc4_hdmi_reset_link(struct d
> if (!crtc_state->active)
> return 0;
>
> + mutex_lock(&vc4_hdmi->mutex);
> +
> - if (!vc4_hdmi_supports_scrambling(encoder)) {
> + vc4_hdmi = connector_to_vc4_hdmi(connector);
> - if (!vc4_hdmi_supports_scrambling(vc4_hdmi))
> ++ if (!vc4_hdmi_supports_scrambling(vc4_hdmi)) {
> + mutex_unlock(&vc4_hdmi->mutex);
> return 0;
> + }
>
> scrambling_needed = vc4_hdmi_mode_needs_scrambling(&vc4_hdmi->saved_adjusted_mode,
> vc4_hdmi->output_bpc,
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().
Cheers,
Nathan
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [Intel-gfx] linux-next: manual merge of the drm-misc tree with the origin tree
@ 2022-11-17 17:29 ` Nathan Chancellor
0 siblings, 0 replies; 17+ messages in thread
From: Nathan Chancellor @ 2022-11-17 17:29 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, Intel Graphics, llvm, Linux Kernel Mailing List,
DRI, Linux Next Mailing List, Maxime Ripard,
José Expósito
Hi Stephen,
On Wed, Nov 16, 2022 at 10:57:02AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the drm-misc tree got a conflict in:
>
> drivers/gpu/drm/vc4/vc4_hdmi.c
>
> between commit:
>
> 682f99b8ae88 ("drm/vc4: hdmi: Take our lock to reset the link")
>
> from the origin tree and commits:
>
> d218750805a3 ("drm/vc4: hdmi: Pass vc4_hdmi to vc4_hdmi_supports_scrambling()")
> 0a99962c0dbf ("drm/vc4: hdmi: Fix pointer dereference before check")
>
> from the drm-misc tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/gpu/drm/vc4/vc4_hdmi.c
> index d7fcc7a4c082,6b223a5fcf6f..000000000000
> --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
> +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
> @@@ -349,12 -348,9 +348,13 @@@ static int vc4_hdmi_reset_link(struct d
> if (!crtc_state->active)
> return 0;
>
> + mutex_lock(&vc4_hdmi->mutex);
> +
> - if (!vc4_hdmi_supports_scrambling(encoder)) {
> + vc4_hdmi = connector_to_vc4_hdmi(connector);
> - if (!vc4_hdmi_supports_scrambling(vc4_hdmi))
> ++ if (!vc4_hdmi_supports_scrambling(vc4_hdmi)) {
> + mutex_unlock(&vc4_hdmi->mutex);
> return 0;
> + }
>
> scrambling_needed = vc4_hdmi_mode_needs_scrambling(&vc4_hdmi->saved_adjusted_mode,
> vc4_hdmi->output_bpc,
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().
Cheers,
Nathan
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: linux-next: manual merge of the drm-misc tree with the origin tree
@ 2022-11-17 17:29 ` Nathan Chancellor
0 siblings, 0 replies; 17+ messages in thread
From: Nathan Chancellor @ 2022-11-17 17:29 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, Intel Graphics, DRI, José Expósito,
Linux Kernel Mailing List, Linux Next Mailing List,
Maxime Ripard, llvm
Hi Stephen,
On Wed, Nov 16, 2022 at 10:57:02AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the drm-misc tree got a conflict in:
>
> drivers/gpu/drm/vc4/vc4_hdmi.c
>
> between commit:
>
> 682f99b8ae88 ("drm/vc4: hdmi: Take our lock to reset the link")
>
> from the origin tree and commits:
>
> d218750805a3 ("drm/vc4: hdmi: Pass vc4_hdmi to vc4_hdmi_supports_scrambling()")
> 0a99962c0dbf ("drm/vc4: hdmi: Fix pointer dereference before check")
>
> from the drm-misc tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/gpu/drm/vc4/vc4_hdmi.c
> index d7fcc7a4c082,6b223a5fcf6f..000000000000
> --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
> +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
> @@@ -349,12 -348,9 +348,13 @@@ static int vc4_hdmi_reset_link(struct d
> if (!crtc_state->active)
> return 0;
>
> + mutex_lock(&vc4_hdmi->mutex);
> +
> - if (!vc4_hdmi_supports_scrambling(encoder)) {
> + vc4_hdmi = connector_to_vc4_hdmi(connector);
> - if (!vc4_hdmi_supports_scrambling(vc4_hdmi))
> ++ if (!vc4_hdmi_supports_scrambling(vc4_hdmi)) {
> + mutex_unlock(&vc4_hdmi->mutex);
> return 0;
> + }
>
> scrambling_needed = vc4_hdmi_mode_needs_scrambling(&vc4_hdmi->saved_adjusted_mode,
> vc4_hdmi->output_bpc,
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().
Cheers,
Nathan
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: linux-next: manual merge of the drm-misc tree with the origin tree
2022-11-17 17:29 ` Nathan Chancellor
(?)
@ 2022-11-17 22:06 ` Stephen Rothwell
-1 siblings, 0 replies; 17+ messages in thread
From: Stephen Rothwell @ 2022-11-17 22:06 UTC (permalink / raw)
To: Nathan Chancellor
Cc: Daniel Vetter, Intel Graphics, llvm, Linux Kernel Mailing List,
DRI, Linux Next Mailing List, Maxime Ripard,
José Expósito
[-- Attachment #1: Type: text/plain, Size: 1042 bytes --]
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: linux-next: manual merge of the drm-misc tree with the origin tree
@ 2022-11-17 22:06 ` Stephen Rothwell
0 siblings, 0 replies; 17+ messages in thread
From: Stephen Rothwell @ 2022-11-17 22:06 UTC (permalink / raw)
To: Nathan Chancellor
Cc: Daniel Vetter, Intel Graphics, DRI, José Expósito,
Linux Kernel Mailing List, Linux Next Mailing List,
Maxime Ripard, llvm
[-- Attachment #1: Type: text/plain, Size: 1042 bytes --]
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [Intel-gfx] linux-next: manual merge of the drm-misc tree with the origin tree
@ 2022-11-17 22:06 ` Stephen Rothwell
0 siblings, 0 replies; 17+ messages in thread
From: Stephen Rothwell @ 2022-11-17 22:06 UTC (permalink / raw)
To: Nathan Chancellor
Cc: Daniel Vetter, Intel Graphics, llvm, Linux Kernel Mailing List,
DRI, Linux Next Mailing List, Maxime Ripard,
José Expósito
[-- Attachment #1: Type: text/plain, Size: 1042 bytes --]
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: linux-next: manual merge of the drm-misc tree with the origin tree
2022-11-17 22:06 ` [Intel-gfx] " Stephen Rothwell
(?)
@ 2022-11-18 0:01 ` Nathan Chancellor
-1 siblings, 0 replies; 17+ messages in thread
From: Nathan Chancellor @ 2022-11-18 0:01 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, Intel Graphics, DRI, José Expósito,
Linux Kernel Mailing List, Linux Next Mailing List,
Maxime Ripard, llvm
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 :)
Cheers,
Nathan
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [Intel-gfx] linux-next: manual merge of the drm-misc tree with the origin tree
@ 2022-11-18 0:01 ` Nathan Chancellor
0 siblings, 0 replies; 17+ messages in thread
From: Nathan Chancellor @ 2022-11-18 0:01 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, Intel Graphics, llvm, Linux Kernel Mailing List,
DRI, Linux Next Mailing List, Maxime Ripard,
José Expósito
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 :)
Cheers,
Nathan
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: linux-next: manual merge of the drm-misc tree with the origin tree
@ 2022-11-18 0:01 ` Nathan Chancellor
0 siblings, 0 replies; 17+ messages in thread
From: Nathan Chancellor @ 2022-11-18 0:01 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, Intel Graphics, llvm, Linux Kernel Mailing List,
DRI, Linux Next Mailing List, Maxime Ripard,
José Expósito
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 :)
Cheers,
Nathan
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: linux-next: manual merge of the drm-misc tree with the origin tree
2022-11-18 0:01 ` Nathan Chancellor
(?)
@ 2022-11-18 9:20 ` Maxime Ripard
-1 siblings, 0 replies; 17+ messages in thread
From: Maxime Ripard @ 2022-11-18 9:20 UTC (permalink / raw)
To: Nathan Chancellor
Cc: Stephen Rothwell, Daniel Vetter, Intel Graphics, DRI,
José Expósito, Linux Kernel Mailing List,
Linux Next Mailing List, llvm
[-- 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 --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [Intel-gfx] linux-next: manual merge of the drm-misc tree with the origin tree
@ 2022-11-18 9:20 ` Maxime Ripard
0 siblings, 0 replies; 17+ messages in thread
From: Maxime Ripard @ 2022-11-18 9:20 UTC (permalink / raw)
To: Nathan Chancellor
Cc: Stephen Rothwell, Daniel Vetter, Intel Graphics, llvm,
Linux Kernel Mailing List, DRI, Linux Next Mailing List,
José Expósito
[-- 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 --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: linux-next: manual merge of the drm-misc tree with the origin tree
@ 2022-11-18 9:20 ` Maxime Ripard
0 siblings, 0 replies; 17+ messages in thread
From: Maxime Ripard @ 2022-11-18 9:20 UTC (permalink / raw)
To: Nathan Chancellor
Cc: Stephen Rothwell, Daniel Vetter, Intel Graphics, llvm,
Linux Kernel Mailing List, DRI, Linux Next Mailing List,
José Expósito
[-- 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 --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* linux-next: manual merge of the drm-misc tree with the origin tree
@ 2021-11-07 22:31 ` Stephen Rothwell
0 siblings, 0 replies; 17+ messages in thread
From: Stephen Rothwell @ 2021-11-07 22:31 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Alex Deucher, Colin Ian King, Jason Gunthorpe, Jason Gunthorpe,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1417 bytes --]
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
between commit:
9ae807f0ec6a ("drm/amdgpu: clean up inconsistent indenting")
from the origin tree and commit:
0d979509539e ("drm/ttm: remove ttm_bo_vm_insert_huge()")
from the drm-misc tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index a573424a6e0b,a1e63ba4c54a..000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@@ -60,9 -60,10 +60,9 @@@ static vm_fault_t amdgpu_gem_fault(stru
goto unlock;
}
- ret = ttm_bo_vm_fault_reserved(vmf, vmf->vma->vm_page_prot,
- TTM_BO_VM_NUM_PREFAULT);
-
- drm_dev_exit(idx);
+ ret = ttm_bo_vm_fault_reserved(vmf, vmf->vma->vm_page_prot,
- TTM_BO_VM_NUM_PREFAULT, 1);
++ TTM_BO_VM_NUM_PREFAULT);
+ drm_dev_exit(idx);
} else {
ret = ttm_bo_vm_dummy_page(vmf, vmf->vma->vm_page_prot);
}
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread* linux-next: manual merge of the drm-misc tree with the origin tree
@ 2021-11-07 22:31 ` Stephen Rothwell
0 siblings, 0 replies; 17+ messages in thread
From: Stephen Rothwell @ 2021-11-07 22:31 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Linux Kernel Mailing List, Jason Gunthorpe,
Linux Next Mailing List, Jason Gunthorpe, Alex Deucher,
Colin Ian King
[-- Attachment #1: Type: text/plain, Size: 1417 bytes --]
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
between commit:
9ae807f0ec6a ("drm/amdgpu: clean up inconsistent indenting")
from the origin tree and commit:
0d979509539e ("drm/ttm: remove ttm_bo_vm_insert_huge()")
from the drm-misc tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index a573424a6e0b,a1e63ba4c54a..000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@@ -60,9 -60,10 +60,9 @@@ static vm_fault_t amdgpu_gem_fault(stru
goto unlock;
}
- ret = ttm_bo_vm_fault_reserved(vmf, vmf->vma->vm_page_prot,
- TTM_BO_VM_NUM_PREFAULT);
-
- drm_dev_exit(idx);
+ ret = ttm_bo_vm_fault_reserved(vmf, vmf->vma->vm_page_prot,
- TTM_BO_VM_NUM_PREFAULT, 1);
++ TTM_BO_VM_NUM_PREFAULT);
+ drm_dev_exit(idx);
} else {
ret = ttm_bo_vm_dummy_page(vmf, vmf->vma->vm_page_prot);
}
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2022-11-18 9:20 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
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
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.