* Re: linux-next: build failure after merge of the drm-misc tree
2020-10-12 4:24 ` Stephen Rothwell
@ 2020-10-12 4:26 ` Stephen Rothwell
2020-10-12 10:15 ` Paul Cercueil
` (2 subsequent siblings)
3 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2020-10-12 4:26 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Paul Cercueil, Sam Ravnborg, Linux Kernel Mailing List,
Linux Next Mailing List, Dave Airlie
[-- Attachment #1: Type: text/plain, Size: 6776 bytes --]
Hi all,
[Just adding Dave to cc's]
On Mon, 12 Oct 2020 15:24:52 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> On Thu, 8 Oct 2020 15:42:02 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Thu, 8 Oct 2020 14:09:03 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > After merging the drm-misc tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> >
> > In file included from include/linux/clk.h:13,
> > from drivers/gpu/drm/ingenic/ingenic-drm-drv.c:10:
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c: In function 'ingenic_drm_update_palette':
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct ingenic_drm' has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
> > 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> > | ^~~~~~~~~~~
> > include/linux/kernel.h:47:33: note: in definition of macro 'ARRAY_SIZE'
> > 47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
> > | ^~~
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct ingenic_drm' has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
> > 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> > | ^~~~~~~~~~~
> > include/linux/kernel.h:47:48: note: in definition of macro 'ARRAY_SIZE'
> > 47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
> > | ^~~
> > In file included from include/linux/bits.h:22,
> > from include/linux/bitops.h:5,
> > from drivers/gpu/drm/ingenic/ingenic-drm.h:10,
> > from drivers/gpu/drm/ingenic/ingenic-drm-drv.c:7:
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct ingenic_drm' has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
> > 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> > | ^~~~~~~~~~~
> > include/linux/build_bug.h:16:62: note: in definition of macro 'BUILD_BUG_ON_ZERO'
> > 16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
> > | ^
> > include/linux/compiler.h:224:46: note: in expansion of macro '__same_type'
> > 224 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
> > | ^~~~~~~~~~~
> > include/linux/kernel.h:47:59: note: in expansion of macro '__must_be_array'
> > 47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
> > | ^~~~~~~~~~~~~~~
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in expansion of macro 'ARRAY_SIZE'
> > 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> > | ^~~~~~~~~~
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct ingenic_drm' has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
> > 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> > | ^~~~~~~~~~~
> > include/linux/build_bug.h:16:62: note: in definition of macro 'BUILD_BUG_ON_ZERO'
> > 16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
> > | ^
> > include/linux/compiler.h:224:46: note: in expansion of macro '__same_type'
> > 224 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
> > | ^~~~~~~~~~~
> > include/linux/kernel.h:47:59: note: in expansion of macro '__must_be_array'
> > 47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
> > | ^~~~~~~~~~~~~~~
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in expansion of macro 'ARRAY_SIZE'
> > 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> > | ^~~~~~~~~~
> > include/linux/build_bug.h:16:51: error: bit-field '<anonymous>' width not an integer constant
> > 16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
> > | ^
> > include/linux/compiler.h:224:28: note: in expansion of macro 'BUILD_BUG_ON_ZERO'
> > 224 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
> > | ^~~~~~~~~~~~~~~~~
> > include/linux/kernel.h:47:59: note: in expansion of macro '__must_be_array'
> > 47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
> > | ^~~~~~~~~~~~~~~
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in expansion of macro 'ARRAY_SIZE'
> > 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> > | ^~~~~~~~~~
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c:453:9: error: 'struct ingenic_drm' has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
> > 453 | priv->dma_hwdescs->palette[i] = color;
> > | ^~~~~~~~~~~
> > | dma_hwdesc_f0
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c: In function 'ingenic_drm_plane_atomic_update':
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c:467:3: error: 'crtc_state' undeclared (first use in this function); did you mean 'ctx_state'?
> > 467 | crtc_state = state->crtc->state;
> > | ^~~~~~~~~~
> > | ctx_state
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c:467:3: note: each undeclared identifier is reported only once for each function it appears in
> > At top level:
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c:443:13: warning: 'ingenic_drm_update_palette' defined but not used [-Wunused-function]
> > 443 | static void ingenic_drm_update_palette(struct ingenic_drm *priv,
> > | ^~~~~~~~~~~~~~~~~~~~~~~~~~
> >
> > > I noticed that the ingenic driver revert I had been waiting for appeared
> > > in hte drm-misc tree, so I removed the BROKEN dependency for it, but it
> > > produced the above errors, so I have marked it BROKEN again.
>
> Any progress on this? I am still marking CONFIG_DRM_INGENIC as BROKEN
> in the drm and drm-misc trees.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2020-10-12 4:24 ` Stephen Rothwell
2020-10-12 4:26 ` Stephen Rothwell
@ 2020-10-12 10:15 ` Paul Cercueil
2020-10-12 10:25 ` [PATCH] drm/ingenic: Fix bad revert Paul Cercueil
2020-10-13 11:12 ` linux-next: build failure after merge of the drm-misc tree Paul Cercueil
3 siblings, 0 replies; 9+ messages in thread
From: Paul Cercueil @ 2020-10-12 10:15 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, Intel Graphics, DRI, Sam Ravnborg,
Linux Kernel Mailing List, linux-next, Dave Airlie
Hi Stephen,
Le lun. 12 oct. 2020 à 15:24, Stephen Rothwell <sfr@canb.auug.org.au>
a écrit :
> Hi all,
>
> On Thu, 8 Oct 2020 15:42:02 +1100 Stephen Rothwell
> <sfr@canb.auug.org.au> wrote:
>>
>> On Thu, 8 Oct 2020 14:09:03 +1100 Stephen Rothwell
>> <sfr@canb.auug.org.au> wrote:
>> >
>> > After merging the drm-misc tree, today's linux-next build (x86_64
>> > allmodconfig) failed like this:
>>
>> In file included from include/linux/clk.h:13,
>> from drivers/gpu/drm/ingenic/ingenic-drm-drv.c:10:
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c: In function
>> 'ingenic_drm_update_palette':
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct
>> ingenic_drm' has no member named 'dma_hwdescs'; did you mean
>> 'dma_hwdesc_f0'?
>> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
>> i++) {
>> | ^~~~~~~~~~~
>> include/linux/kernel.h:47:33: note: in definition of macro
>> 'ARRAY_SIZE'
>> 47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
>> __must_be_array(arr))
>> | ^~~
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct
>> ingenic_drm' has no member named 'dma_hwdescs'; did you mean
>> 'dma_hwdesc_f0'?
>> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
>> i++) {
>> | ^~~~~~~~~~~
>> include/linux/kernel.h:47:48: note: in definition of macro
>> 'ARRAY_SIZE'
>> 47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
>> __must_be_array(arr))
>> | ^~~
>> In file included from include/linux/bits.h:22,
>> from include/linux/bitops.h:5,
>> from drivers/gpu/drm/ingenic/ingenic-drm.h:10,
>> from drivers/gpu/drm/ingenic/ingenic-drm-drv.c:7:
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct
>> ingenic_drm' has no member named 'dma_hwdescs'; did you mean
>> 'dma_hwdesc_f0'?
>> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
>> i++) {
>> | ^~~~~~~~~~~
>> include/linux/build_bug.h:16:62: note: in definition of macro
>> 'BUILD_BUG_ON_ZERO'
>> 16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct {
>> int:(-!!(e)); })))
>> |
>> ^
>> include/linux/compiler.h:224:46: note: in expansion of macro
>> '__same_type'
>> 224 | #define __must_be_array(a)
>> BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
>> | ^~~~~~~~~~~
>> include/linux/kernel.h:47:59: note: in expansion of macro
>> '__must_be_array'
>> 47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
>> __must_be_array(arr))
>> |
>> ^~~~~~~~~~~~~~~
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in
>> expansion of macro 'ARRAY_SIZE'
>> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
>> i++) {
>> | ^~~~~~~~~~
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct
>> ingenic_drm' has no member named 'dma_hwdescs'; did you mean
>> 'dma_hwdesc_f0'?
>> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
>> i++) {
>> | ^~~~~~~~~~~
>> include/linux/build_bug.h:16:62: note: in definition of macro
>> 'BUILD_BUG_ON_ZERO'
>> 16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct {
>> int:(-!!(e)); })))
>> |
>> ^
>> include/linux/compiler.h:224:46: note: in expansion of macro
>> '__same_type'
>> 224 | #define __must_be_array(a)
>> BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
>> | ^~~~~~~~~~~
>> include/linux/kernel.h:47:59: note: in expansion of macro
>> '__must_be_array'
>> 47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
>> __must_be_array(arr))
>> |
>> ^~~~~~~~~~~~~~~
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in
>> expansion of macro 'ARRAY_SIZE'
>> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
>> i++) {
>> | ^~~~~~~~~~
>> include/linux/build_bug.h:16:51: error: bit-field '<anonymous>'
>> width not an integer constant
>> 16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct {
>> int:(-!!(e)); })))
>> | ^
>> include/linux/compiler.h:224:28: note: in expansion of macro
>> 'BUILD_BUG_ON_ZERO'
>> 224 | #define __must_be_array(a)
>> BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
>> | ^~~~~~~~~~~~~~~~~
>> include/linux/kernel.h:47:59: note: in expansion of macro
>> '__must_be_array'
>> 47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
>> __must_be_array(arr))
>> |
>> ^~~~~~~~~~~~~~~
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in
>> expansion of macro 'ARRAY_SIZE'
>> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
>> i++) {
>> | ^~~~~~~~~~
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:453:9: error: 'struct
>> ingenic_drm' has no member named 'dma_hwdescs'; did you mean
>> 'dma_hwdesc_f0'?
>> 453 | priv->dma_hwdescs->palette[i] = color;
>> | ^~~~~~~~~~~
>> | dma_hwdesc_f0
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c: In function
>> 'ingenic_drm_plane_atomic_update':
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:467:3: error:
>> 'crtc_state' undeclared (first use in this function); did you mean
>> 'ctx_state'?
>> 467 | crtc_state = state->crtc->state;
>> | ^~~~~~~~~~
>> | ctx_state
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:467:3: note: each
>> undeclared identifier is reported only once for each function it
>> appears in
>> At top level:
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:443:13: warning:
>> 'ingenic_drm_update_palette' defined but not used [-Wunused-function]
>> 443 | static void ingenic_drm_update_palette(struct ingenic_drm
>> *priv,
>> | ^~~~~~~~~~~~~~~~~~~~~~~~~~
>>
>> > I noticed that the ingenic driver revert I had been waiting for
>> appeared
>> > in hte drm-misc tree, so I removed the BROKEN dependency for it,
>> but it
>> > produced the above errors, so I have marked it BROKEN again.
>
> Any progress on this? I am still marking CONFIG_DRM_INGENIC as BROKEN
> in the drm and drm-misc trees.
Ugh, that doesn't look good. I'll send a fix ASAP.
(I was having email problems last week and the original email bounced,
sorry about that)
Cheers,
-Paul
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH] drm/ingenic: Fix bad revert
2020-10-12 4:24 ` Stephen Rothwell
2020-10-12 4:26 ` Stephen Rothwell
2020-10-12 10:15 ` Paul Cercueil
@ 2020-10-12 10:25 ` Paul Cercueil
2020-10-12 14:10 ` Daniel Vetter
2020-10-13 11:12 ` linux-next: build failure after merge of the drm-misc tree Paul Cercueil
3 siblings, 1 reply; 9+ messages in thread
From: Paul Cercueil @ 2020-10-12 10:25 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, Sam Ravnborg, Intel Graphics, DRI,
Linux Kernel Mailing List, linux-next, Paul Cercueil
Fix a badly reverted commit. The revert commit was cherry-picked from
drm-misc-next to drm-misc-next-fixes, and in the process some unrelated
code was added.
Fixes: a3fb64c00d44 "Revert "gpu/drm: ingenic: Add option to mmap GEM buffers cached""
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---
drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
index 1be1235bd546..a3d1617d7c67 100644
--- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
+++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
@@ -440,20 +440,6 @@ void ingenic_drm_plane_config(struct device *dev,
}
}
-static void ingenic_drm_update_palette(struct ingenic_drm *priv,
- const struct drm_color_lut *lut)
-{
- unsigned int i;
-
- for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
- u16 color = drm_color_lut_extract(lut[i].red, 5) << 11
- | drm_color_lut_extract(lut[i].green, 6) << 5
- | drm_color_lut_extract(lut[i].blue, 5);
-
- priv->dma_hwdescs->palette[i] = color;
- }
-}
-
static void ingenic_drm_plane_atomic_update(struct drm_plane *plane,
struct drm_plane_state *oldstate)
{
@@ -464,8 +450,6 @@ static void ingenic_drm_plane_atomic_update(struct drm_plane *plane,
dma_addr_t addr;
if (state && state->fb) {
- crtc_state = state->crtc->state;
-
addr = drm_fb_cma_get_gem_addr(state->fb, state, 0);
width = state->src_w >> 16;
height = state->src_h >> 16;
--
2.28.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH] drm/ingenic: Fix bad revert
2020-10-12 10:25 ` [PATCH] drm/ingenic: Fix bad revert Paul Cercueil
@ 2020-10-12 14:10 ` Daniel Vetter
2020-10-12 19:13 ` Paul Cercueil
0 siblings, 1 reply; 9+ messages in thread
From: Daniel Vetter @ 2020-10-12 14:10 UTC (permalink / raw)
To: Paul Cercueil
Cc: Stephen Rothwell, Daniel Vetter, Sam Ravnborg, Intel Graphics,
DRI, Linux Kernel Mailing List, linux-next
On Mon, Oct 12, 2020 at 12:25:09PM +0200, Paul Cercueil wrote:
> Fix a badly reverted commit. The revert commit was cherry-picked from
> drm-misc-next to drm-misc-next-fixes, and in the process some unrelated
> code was added.
>
> Fixes: a3fb64c00d44 "Revert "gpu/drm: ingenic: Add option to mmap GEM buffers cached""
> Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
And yes if you use git cherry-pick it'll do a 3 way merge, and
occasionally it's very tricky to resolve that properly. Especially when
you're not used to it.
What I tend to do to double check cerry-picks is git show both commits,
and compare the entire diff line-by-line to make sure I didn't misplace
anything.
Another trick is to use the raw patch instead of cherry-pick, since that
won't do a 3 way merge where you might get confused with other context and
fun stuff like that.
Cheers, Daniel
> ---
> drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 16 ----------------
> 1 file changed, 16 deletions(-)
>
> diff --git a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
> index 1be1235bd546..a3d1617d7c67 100644
> --- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
> +++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
> @@ -440,20 +440,6 @@ void ingenic_drm_plane_config(struct device *dev,
> }
> }
>
> -static void ingenic_drm_update_palette(struct ingenic_drm *priv,
> - const struct drm_color_lut *lut)
> -{
> - unsigned int i;
> -
> - for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> - u16 color = drm_color_lut_extract(lut[i].red, 5) << 11
> - | drm_color_lut_extract(lut[i].green, 6) << 5
> - | drm_color_lut_extract(lut[i].blue, 5);
> -
> - priv->dma_hwdescs->palette[i] = color;
> - }
> -}
> -
> static void ingenic_drm_plane_atomic_update(struct drm_plane *plane,
> struct drm_plane_state *oldstate)
> {
> @@ -464,8 +450,6 @@ static void ingenic_drm_plane_atomic_update(struct drm_plane *plane,
> dma_addr_t addr;
>
> if (state && state->fb) {
> - crtc_state = state->crtc->state;
> -
> addr = drm_fb_cma_get_gem_addr(state->fb, state, 0);
> width = state->src_w >> 16;
> height = state->src_h >> 16;
> --
> 2.28.0
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] drm/ingenic: Fix bad revert
2020-10-12 14:10 ` Daniel Vetter
@ 2020-10-12 19:13 ` Paul Cercueil
0 siblings, 0 replies; 9+ messages in thread
From: Paul Cercueil @ 2020-10-12 19:13 UTC (permalink / raw)
To: Daniel Vetter
Cc: Stephen Rothwell, Daniel Vetter, Sam Ravnborg, Intel Graphics,
DRI, Linux Kernel Mailing List, linux-next
Le lun. 12 oct. 2020 à 16:10, Daniel Vetter <daniel@ffwll.ch> a écrit
:
> On Mon, Oct 12, 2020 at 12:25:09PM +0200, Paul Cercueil wrote:
>> Fix a badly reverted commit. The revert commit was cherry-picked
>> from
>> drm-misc-next to drm-misc-next-fixes, and in the process some
>> unrelated
>> code was added.
>>
>> Fixes: a3fb64c00d44 "Revert "gpu/drm: ingenic: Add option to mmap
>> GEM buffers cached""
>> Signed-off-by: Paul Cercueil <paul@crapouillou.net>
>
> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
I applied the patch to drm-misc-next-fixes.
Thanks,
-Paul
> And yes if you use git cherry-pick it'll do a 3 way merge, and
> occasionally it's very tricky to resolve that properly. Especially
> when
> you're not used to it.
>
> What I tend to do to double check cerry-picks is git show both
> commits,
> and compare the entire diff line-by-line to make sure I didn't
> misplace
> anything.
>
> Another trick is to use the raw patch instead of cherry-pick, since
> that
> won't do a 3 way merge where you might get confused with other
> context and
> fun stuff like that.
>
> Cheers, Daniel
>> ---
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 16 ----------------
>> 1 file changed, 16 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
>> b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
>> index 1be1235bd546..a3d1617d7c67 100644
>> --- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
>> +++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
>> @@ -440,20 +440,6 @@ void ingenic_drm_plane_config(struct device
>> *dev,
>> }
>> }
>>
>> -static void ingenic_drm_update_palette(struct ingenic_drm *priv,
>> - const struct drm_color_lut *lut)
>> -{
>> - unsigned int i;
>> -
>> - for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
>> - u16 color = drm_color_lut_extract(lut[i].red, 5) << 11
>> - | drm_color_lut_extract(lut[i].green, 6) << 5
>> - | drm_color_lut_extract(lut[i].blue, 5);
>> -
>> - priv->dma_hwdescs->palette[i] = color;
>> - }
>> -}
>> -
>> static void ingenic_drm_plane_atomic_update(struct drm_plane
>> *plane,
>> struct drm_plane_state *oldstate)
>> {
>> @@ -464,8 +450,6 @@ static void
>> ingenic_drm_plane_atomic_update(struct drm_plane *plane,
>> dma_addr_t addr;
>>
>> if (state && state->fb) {
>> - crtc_state = state->crtc->state;
>> -
>> addr = drm_fb_cma_get_gem_addr(state->fb, state, 0);
>> width = state->src_w >> 16;
>> height = state->src_h >> 16;
>> --
>> 2.28.0
>>
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2020-10-12 4:24 ` Stephen Rothwell
` (2 preceding siblings ...)
2020-10-12 10:25 ` [PATCH] drm/ingenic: Fix bad revert Paul Cercueil
@ 2020-10-13 11:12 ` Paul Cercueil
3 siblings, 0 replies; 9+ messages in thread
From: Paul Cercueil @ 2020-10-13 11:12 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, Intel Graphics, DRI, Sam Ravnborg,
Linux Kernel Mailing List, linux-next, Dave Airlie
Hi Stephen,
Le lun. 12 oct. 2020 à 15:24, Stephen Rothwell <sfr@canb.auug.org.au>
a écrit :
> Hi all,
>
> On Thu, 8 Oct 2020 15:42:02 +1100 Stephen Rothwell
> <sfr@canb.auug.org.au> wrote:
>>
>> On Thu, 8 Oct 2020 14:09:03 +1100 Stephen Rothwell
>> <sfr@canb.auug.org.au> wrote:
>> >
>> > After merging the drm-misc tree, today's linux-next build (x86_64
>> > allmodconfig) failed like this:
>>
>> In file included from include/linux/clk.h:13,
>> from drivers/gpu/drm/ingenic/ingenic-drm-drv.c:10:
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c: In function
>> 'ingenic_drm_update_palette':
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct
>> ingenic_drm' has no member named 'dma_hwdescs'; did you mean
>> 'dma_hwdesc_f0'?
>> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
>> i++) {
>> | ^~~~~~~~~~~
>> include/linux/kernel.h:47:33: note: in definition of macro
>> 'ARRAY_SIZE'
>> 47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
>> __must_be_array(arr))
>> | ^~~
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct
>> ingenic_drm' has no member named 'dma_hwdescs'; did you mean
>> 'dma_hwdesc_f0'?
>> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
>> i++) {
>> | ^~~~~~~~~~~
>> include/linux/kernel.h:47:48: note: in definition of macro
>> 'ARRAY_SIZE'
>> 47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
>> __must_be_array(arr))
>> | ^~~
>> In file included from include/linux/bits.h:22,
>> from include/linux/bitops.h:5,
>> from drivers/gpu/drm/ingenic/ingenic-drm.h:10,
>> from drivers/gpu/drm/ingenic/ingenic-drm-drv.c:7:
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct
>> ingenic_drm' has no member named 'dma_hwdescs'; did you mean
>> 'dma_hwdesc_f0'?
>> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
>> i++) {
>> | ^~~~~~~~~~~
>> include/linux/build_bug.h:16:62: note: in definition of macro
>> 'BUILD_BUG_ON_ZERO'
>> 16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct {
>> int:(-!!(e)); })))
>> |
>> ^
>> include/linux/compiler.h:224:46: note: in expansion of macro
>> '__same_type'
>> 224 | #define __must_be_array(a)
>> BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
>> | ^~~~~~~~~~~
>> include/linux/kernel.h:47:59: note: in expansion of macro
>> '__must_be_array'
>> 47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
>> __must_be_array(arr))
>> |
>> ^~~~~~~~~~~~~~~
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in
>> expansion of macro 'ARRAY_SIZE'
>> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
>> i++) {
>> | ^~~~~~~~~~
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct
>> ingenic_drm' has no member named 'dma_hwdescs'; did you mean
>> 'dma_hwdesc_f0'?
>> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
>> i++) {
>> | ^~~~~~~~~~~
>> include/linux/build_bug.h:16:62: note: in definition of macro
>> 'BUILD_BUG_ON_ZERO'
>> 16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct {
>> int:(-!!(e)); })))
>> |
>> ^
>> include/linux/compiler.h:224:46: note: in expansion of macro
>> '__same_type'
>> 224 | #define __must_be_array(a)
>> BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
>> | ^~~~~~~~~~~
>> include/linux/kernel.h:47:59: note: in expansion of macro
>> '__must_be_array'
>> 47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
>> __must_be_array(arr))
>> |
>> ^~~~~~~~~~~~~~~
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in
>> expansion of macro 'ARRAY_SIZE'
>> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
>> i++) {
>> | ^~~~~~~~~~
>> include/linux/build_bug.h:16:51: error: bit-field '<anonymous>'
>> width not an integer constant
>> 16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct {
>> int:(-!!(e)); })))
>> | ^
>> include/linux/compiler.h:224:28: note: in expansion of macro
>> 'BUILD_BUG_ON_ZERO'
>> 224 | #define __must_be_array(a)
>> BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
>> | ^~~~~~~~~~~~~~~~~
>> include/linux/kernel.h:47:59: note: in expansion of macro
>> '__must_be_array'
>> 47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
>> __must_be_array(arr))
>> |
>> ^~~~~~~~~~~~~~~
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in
>> expansion of macro 'ARRAY_SIZE'
>> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
>> i++) {
>> | ^~~~~~~~~~
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:453:9: error: 'struct
>> ingenic_drm' has no member named 'dma_hwdescs'; did you mean
>> 'dma_hwdesc_f0'?
>> 453 | priv->dma_hwdescs->palette[i] = color;
>> | ^~~~~~~~~~~
>> | dma_hwdesc_f0
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c: In function
>> 'ingenic_drm_plane_atomic_update':
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:467:3: error:
>> 'crtc_state' undeclared (first use in this function); did you mean
>> 'ctx_state'?
>> 467 | crtc_state = state->crtc->state;
>> | ^~~~~~~~~~
>> | ctx_state
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:467:3: note: each
>> undeclared identifier is reported only once for each function it
>> appears in
>> At top level:
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:443:13: warning:
>> 'ingenic_drm_update_palette' defined but not used [-Wunused-function]
>> 443 | static void ingenic_drm_update_palette(struct ingenic_drm
>> *priv,
>> | ^~~~~~~~~~~~~~~~~~~~~~~~~~
>>
>> > I noticed that the ingenic driver revert I had been waiting for
>> appeared
>> > in hte drm-misc tree, so I removed the BROKEN dependency for it,
>> but it
>> > produced the above errors, so I have marked it BROKEN again.
>
> Any progress on this? I am still marking CONFIG_DRM_INGENIC as BROKEN
> in the drm and drm-misc trees.
It should be good now.
Cheers,
-Paul
^ permalink raw reply [flat|nested] 9+ messages in thread