* Re: [Intel-gfx] 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
` (4 subsequent siblings)
5 siblings, 0 replies; 11+ messages in thread
From: Stephen Rothwell @ 2020-10-12 4:26 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Paul Cercueil, Dave Airlie, Linux Next Mailing List, Sam Ravnborg,
Linux Kernel Mailing List
[-- Attachment #1.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 #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [Intel-gfx] 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 ` [Intel-gfx] [PATCH] drm/ingenic: Fix bad revert Paul Cercueil
` (3 subsequent siblings)
5 siblings, 0 replies; 11+ messages in thread
From: Paul Cercueil @ 2020-10-12 10:15 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Dave Airlie, Daniel Vetter, Intel Graphics,
Linux Kernel Mailing List, DRI, linux-next, Sam Ravnborg
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
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread* [Intel-gfx] [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-12 18:10 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
` (2 subsequent siblings)
5 siblings, 1 reply; 11+ messages in thread
From: Paul Cercueil @ 2020-10-12 10:25 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, Intel Graphics, Linux Kernel Mailing List, DRI,
Paul Cercueil, linux-next, Sam Ravnborg
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
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [Intel-gfx] [PATCH] drm/ingenic: Fix bad revert
2020-10-12 10:25 ` [Intel-gfx] [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; 11+ messages in thread
From: Daniel Vetter @ 2020-10-12 14:10 UTC (permalink / raw)
To: Paul Cercueil
Cc: Stephen Rothwell, Daniel Vetter, Intel Graphics,
Linux Kernel Mailing List, DRI, linux-next, Sam Ravnborg
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
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [Intel-gfx] [PATCH] drm/ingenic: Fix bad revert
2020-10-12 14:10 ` Daniel Vetter
@ 2020-10-12 19:13 ` Paul Cercueil
0 siblings, 0 replies; 11+ messages in thread
From: Paul Cercueil @ 2020-10-12 19:13 UTC (permalink / raw)
To: Daniel Vetter
Cc: Stephen Rothwell, Daniel Vetter, Intel Graphics,
Linux Kernel Mailing List, DRI, linux-next, Sam Ravnborg
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
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/ingenic: Fix bad revert
2020-10-12 4:24 ` Stephen Rothwell
` (2 preceding siblings ...)
2020-10-12 10:25 ` [Intel-gfx] [PATCH] drm/ingenic: Fix bad revert Paul Cercueil
@ 2020-10-12 18:10 ` Patchwork
2020-10-12 21:34 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2020-10-13 11:12 ` [Intel-gfx] linux-next: build failure after merge of the drm-misc tree Paul Cercueil
5 siblings, 0 replies; 11+ messages in thread
From: Patchwork @ 2020-10-12 18:10 UTC (permalink / raw)
To: Paul Cercueil; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 4694 bytes --]
== Series Details ==
Series: drm/ingenic: Fix bad revert
URL : https://patchwork.freedesktop.org/series/82588/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_9130 -> Patchwork_18679
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/index.html
Known issues
------------
Here are the changes found in Patchwork_18679 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_module_load@reload:
- fi-icl-y: [PASS][1] -> [DMESG-WARN][2] ([i915#1982])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9130/fi-icl-y/igt@i915_module_load@reload.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/fi-icl-y/igt@i915_module_load@reload.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-bsw-kefka: [PASS][3] -> [DMESG-WARN][4] ([i915#1982]) +1 similar issue
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9130/fi-bsw-kefka/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/fi-bsw-kefka/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
* igt@kms_cursor_legacy@basic-flip-before-cursor-atomic:
- fi-icl-u2: [PASS][5] -> [DMESG-WARN][6] ([i915#1982])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9130/fi-icl-u2/igt@kms_cursor_legacy@basic-flip-before-cursor-atomic.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/fi-icl-u2/igt@kms_cursor_legacy@basic-flip-before-cursor-atomic.html
#### Possible fixes ####
* igt@debugfs_test@read_all_entries:
- {fi-kbl-7560u}: [INCOMPLETE][7] ([i915#2417]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9130/fi-kbl-7560u/igt@debugfs_test@read_all_entries.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/fi-kbl-7560u/igt@debugfs_test@read_all_entries.html
* igt@gem_exec_suspend@basic-s0:
- fi-tgl-u2: [FAIL][9] ([i915#1888]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9130/fi-tgl-u2/igt@gem_exec_suspend@basic-s0.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/fi-tgl-u2/igt@gem_exec_suspend@basic-s0.html
* igt@i915_selftest@live@coherency:
- fi-gdg-551: [DMESG-FAIL][11] ([i915#1748]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9130/fi-gdg-551/igt@i915_selftest@live@coherency.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/fi-gdg-551/igt@i915_selftest@live@coherency.html
* igt@kms_flip@basic-flip-vs-dpms@a-dsi1:
- {fi-tgl-dsi}: [DMESG-WARN][13] ([i915#1982]) -> [PASS][14] +1 similar issue
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9130/fi-tgl-dsi/igt@kms_flip@basic-flip-vs-dpms@a-dsi1.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/fi-tgl-dsi/igt@kms_flip@basic-flip-vs-dpms@a-dsi1.html
* igt@kms_flip@basic-flip-vs-wf_vblank@b-edp1:
- fi-icl-u2: [DMESG-WARN][15] ([i915#1982]) -> [PASS][16] +1 similar issue
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9130/fi-icl-u2/igt@kms_flip@basic-flip-vs-wf_vblank@b-edp1.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/fi-icl-u2/igt@kms_flip@basic-flip-vs-wf_vblank@b-edp1.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[i915#1748]: https://gitlab.freedesktop.org/drm/intel/issues/1748
[i915#1888]: https://gitlab.freedesktop.org/drm/intel/issues/1888
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2417]: https://gitlab.freedesktop.org/drm/intel/issues/2417
Participating hosts (45 -> 41)
------------------------------
Additional (3): fi-kbl-soraka fi-tgl-y fi-kbl-r
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_9130 -> Patchwork_18679
CI-20190529: 20190529
CI_DRM_9130: da13fb4f671901dbcf26437592f352579cc3b617 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5810: f78ce760920efb5015725c749f411c5724114bda @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18679: 246cb4e2fc8726e5a3c6d62b4bed6a82d318999a @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
246cb4e2fc87 drm/ingenic: Fix bad revert
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/index.html
[-- Attachment #1.2: Type: text/html, Size: 5778 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread* [Intel-gfx] ✗ Fi.CI.IGT: failure for drm/ingenic: Fix bad revert
2020-10-12 4:24 ` Stephen Rothwell
` (3 preceding siblings ...)
2020-10-12 18:10 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
@ 2020-10-12 21:34 ` Patchwork
2020-10-13 11:12 ` [Intel-gfx] linux-next: build failure after merge of the drm-misc tree Paul Cercueil
5 siblings, 0 replies; 11+ messages in thread
From: Patchwork @ 2020-10-12 21:34 UTC (permalink / raw)
To: Paul Cercueil; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 13268 bytes --]
== Series Details ==
Series: drm/ingenic: Fix bad revert
URL : https://patchwork.freedesktop.org/series/82588/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_9130_full -> Patchwork_18679_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_18679_full absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_18679_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_18679_full:
### IGT changes ###
#### Possible regressions ####
* igt@gem_set_tiling_vs_blt@tiled-to-untiled:
- shard-hsw: NOTRUN -> [INCOMPLETE][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/shard-hsw5/igt@gem_set_tiling_vs_blt@tiled-to-untiled.html
Known issues
------------
Here are the changes found in Patchwork_18679_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_isolation@preservation-s3@vcs0:
- shard-skl: [PASS][2] -> [INCOMPLETE][3] ([i915#198])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9130/shard-skl5/igt@gem_ctx_isolation@preservation-s3@vcs0.html
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/shard-skl5/igt@gem_ctx_isolation@preservation-s3@vcs0.html
* igt@gem_exec_reloc@basic-many-active@rcs0:
- shard-apl: [PASS][4] -> [FAIL][5] ([i915#1635] / [i915#2389])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9130/shard-apl3/igt@gem_exec_reloc@basic-many-active@rcs0.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/shard-apl2/igt@gem_exec_reloc@basic-many-active@rcs0.html
* igt@gem_exec_whisper@basic-fds-forked:
- shard-glk: [PASS][6] -> [DMESG-WARN][7] ([i915#118] / [i915#95])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9130/shard-glk6/igt@gem_exec_whisper@basic-fds-forked.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/shard-glk8/igt@gem_exec_whisper@basic-fds-forked.html
* igt@i915_module_load@reload-with-fault-injection:
- shard-glk: [PASS][8] -> [DMESG-WARN][9] ([i915#1982]) +1 similar issue
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9130/shard-glk8/igt@i915_module_load@reload-with-fault-injection.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/shard-glk3/igt@i915_module_load@reload-with-fault-injection.html
* igt@i915_pm_dc@dc6-psr:
- shard-skl: [PASS][10] -> [DMESG-FAIL][11] ([i915#1982])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9130/shard-skl8/igt@i915_pm_dc@dc6-psr.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/shard-skl4/igt@i915_pm_dc@dc6-psr.html
* igt@i915_suspend@sysfs-reader:
- shard-kbl: [PASS][12] -> [INCOMPLETE][13] ([i915#155])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9130/shard-kbl7/igt@i915_suspend@sysfs-reader.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/shard-kbl4/igt@i915_suspend@sysfs-reader.html
* igt@kms_cursor_edge_walk@pipe-a-64x64-right-edge:
- shard-skl: [PASS][14] -> [DMESG-WARN][15] ([i915#1982]) +5 similar issues
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9130/shard-skl4/igt@kms_cursor_edge_walk@pipe-a-64x64-right-edge.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/shard-skl7/igt@kms_cursor_edge_walk@pipe-a-64x64-right-edge.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
- shard-apl: [PASS][16] -> [DMESG-WARN][17] ([i915#1635] / [i915#1982])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9130/shard-apl3/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy.html
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/shard-apl1/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy.html
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-mmap-gtt:
- shard-tglb: [PASS][18] -> [DMESG-WARN][19] ([i915#1982])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9130/shard-tglb6/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-mmap-gtt.html
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/shard-tglb8/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-mmap-gtt.html
* igt@kms_hdr@bpc-switch-dpms:
- shard-skl: [PASS][20] -> [FAIL][21] ([i915#1188])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9130/shard-skl5/igt@kms_hdr@bpc-switch-dpms.html
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/shard-skl9/igt@kms_hdr@bpc-switch-dpms.html
* igt@kms_psr@psr2_suspend:
- shard-iclb: [PASS][22] -> [SKIP][23] ([fdo#109441]) +1 similar issue
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9130/shard-iclb2/igt@kms_psr@psr2_suspend.html
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/shard-iclb7/igt@kms_psr@psr2_suspend.html
* igt@kms_vblank@pipe-c-wait-idle:
- shard-kbl: [PASS][24] -> [DMESG-WARN][25] ([i915#1982])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9130/shard-kbl2/igt@kms_vblank@pipe-c-wait-idle.html
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/shard-kbl4/igt@kms_vblank@pipe-c-wait-idle.html
#### Possible fixes ####
* {igt@gem_exec_capture@pi@rcs0}:
- shard-glk: [INCOMPLETE][26] ([i915#2553]) -> [PASS][27]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9130/shard-glk2/igt@gem_exec_capture@pi@rcs0.html
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/shard-glk4/igt@gem_exec_capture@pi@rcs0.html
* igt@gem_exec_schedule@smoketest-all:
- shard-glk: [DMESG-WARN][28] ([i915#118] / [i915#95]) -> [PASS][29]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9130/shard-glk8/igt@gem_exec_schedule@smoketest-all.html
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/shard-glk2/igt@gem_exec_schedule@smoketest-all.html
* {igt@kms_async_flips@async-flip-with-page-flip-events}:
- shard-kbl: [FAIL][30] ([i915#2521]) -> [PASS][31]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9130/shard-kbl2/igt@kms_async_flips@async-flip-with-page-flip-events.html
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/shard-kbl4/igt@kms_async_flips@async-flip-with-page-flip-events.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- shard-apl: [DMESG-WARN][32] ([i915#1635] / [i915#1982]) -> [PASS][33] +1 similar issue
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9130/shard-apl2/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/shard-apl7/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1:
- shard-skl: [FAIL][34] ([i915#79]) -> [PASS][35]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9130/shard-skl2/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1.html
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/shard-skl1/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1.html
* igt@kms_flip@plain-flip-fb-recreate@b-edp1:
- shard-skl: [FAIL][36] ([i915#2122]) -> [PASS][37]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9130/shard-skl10/igt@kms_flip@plain-flip-fb-recreate@b-edp1.html
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/shard-skl7/igt@kms_flip@plain-flip-fb-recreate@b-edp1.html
* igt@kms_hdr@bpc-switch-suspend:
- shard-skl: [FAIL][38] ([i915#1188]) -> [PASS][39]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9130/shard-skl7/igt@kms_hdr@bpc-switch-suspend.html
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/shard-skl3/igt@kms_hdr@bpc-switch-suspend.html
* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min:
- shard-skl: [FAIL][40] ([fdo#108145] / [i915#265]) -> [PASS][41] +1 similar issue
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9130/shard-skl10/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/shard-skl7/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html
* igt@kms_psr@psr2_cursor_render:
- shard-iclb: [SKIP][42] ([fdo#109441]) -> [PASS][43]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9130/shard-iclb1/igt@kms_psr@psr2_cursor_render.html
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/shard-iclb2/igt@kms_psr@psr2_cursor_render.html
* igt@kms_setmode@basic:
- shard-apl: [FAIL][44] ([i915#1635] / [i915#31]) -> [PASS][45]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9130/shard-apl4/igt@kms_setmode@basic.html
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/shard-apl1/igt@kms_setmode@basic.html
* igt@kms_universal_plane@universal-plane-gen9-features-pipe-b:
- shard-tglb: [DMESG-WARN][46] ([i915#1982]) -> [PASS][47] +3 similar issues
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9130/shard-tglb5/igt@kms_universal_plane@universal-plane-gen9-features-pipe-b.html
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/shard-tglb7/igt@kms_universal_plane@universal-plane-gen9-features-pipe-b.html
* igt@perf@polling-parameterized:
- shard-glk: [FAIL][48] ([i915#1542]) -> [PASS][49]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9130/shard-glk3/igt@perf@polling-parameterized.html
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/shard-glk2/igt@perf@polling-parameterized.html
* igt@prime_vgem@basic-fence-blt:
- shard-skl: [DMESG-WARN][50] ([i915#1982]) -> [PASS][51] +4 similar issues
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9130/shard-skl7/igt@prime_vgem@basic-fence-blt.html
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/shard-skl6/igt@prime_vgem@basic-fence-blt.html
#### Warnings ####
* igt@gem_partial_pwrite_pread@writes-after-reads:
- shard-hsw: [FAIL][52] -> [FAIL][53] ([i915#2261])
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9130/shard-hsw5/igt@gem_partial_pwrite_pread@writes-after-reads.html
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/shard-hsw4/igt@gem_partial_pwrite_pread@writes-after-reads.html
* igt@kms_plane_lowres@pipe-a-tiling-y:
- shard-iclb: [DMESG-FAIL][54] ([i915#1226]) -> [DMESG-WARN][55] ([i915#1226])
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9130/shard-iclb2/igt@kms_plane_lowres@pipe-a-tiling-y.html
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/shard-iclb2/igt@kms_plane_lowres@pipe-a-tiling-y.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#1226]: https://gitlab.freedesktop.org/drm/intel/issues/1226
[i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
[i915#155]: https://gitlab.freedesktop.org/drm/intel/issues/155
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#198]: https://gitlab.freedesktop.org/drm/intel/issues/198
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2261]: https://gitlab.freedesktop.org/drm/intel/issues/2261
[i915#2389]: https://gitlab.freedesktop.org/drm/intel/issues/2389
[i915#2521]: https://gitlab.freedesktop.org/drm/intel/issues/2521
[i915#2553]: https://gitlab.freedesktop.org/drm/intel/issues/2553
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (11 -> 12)
------------------------------
Additional (1): pig-snb-2600
Build changes
-------------
* Linux: CI_DRM_9130 -> Patchwork_18679
CI-20190529: 20190529
CI_DRM_9130: da13fb4f671901dbcf26437592f352579cc3b617 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5810: f78ce760920efb5015725c749f411c5724114bda @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18679: 246cb4e2fc8726e5a3c6d62b4bed6a82d318999a @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18679/index.html
[-- Attachment #1.2: Type: text/html, Size: 15648 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
2020-10-12 4:24 ` Stephen Rothwell
` (4 preceding siblings ...)
2020-10-12 21:34 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
@ 2020-10-13 11:12 ` Paul Cercueil
5 siblings, 0 replies; 11+ messages in thread
From: Paul Cercueil @ 2020-10-13 11:12 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Dave Airlie, Daniel Vetter, Intel Graphics,
Linux Kernel Mailing List, DRI, linux-next, Sam Ravnborg
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
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread