diff mbox

drm/tve200: Pass NULL format_modifier to drm_simple_display_pipe_init

Message ID 20170825201612.23056-1-rodrigo.vivi@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Rodrigo Vivi Aug. 25, 2017, 8:16 p.m. UTC
This Fixes build on branches where we already have format-modifier.

Reference: https://lists.freedesktop.org/archives/dri-devel/2017-August/151044.html
Fixes: e6fc3b68558e ("drm: Plumb modifiers through plane init")
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Janet Morgan <janet.morgan@intel.com>
Cc: Ben Widawsky <ben@bwidawsk.net>
Cc: Daniel Stone <daniels@collabora.com> (v2)
Cc: Liviu Dudau <Liviu.Dudau@arm.com>
Cc: Daniel Stone <daniels@collabora.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/tve200/tve200_display.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Daniel Stone Aug. 25, 2017, 8:31 p.m. UTC | #1
Sorry for the mobile email client, but:
Reviewed-by: Daniel Stone <daniels@collabora.com>

> On 25 Aug 2017, at 9:16 pm, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
> 
> This Fixes build on branches where we already have format-modifier.
> 
> Reference: https://lists.freedesktop.org/archives/dri-devel/2017-August/151044.html
> Fixes: e6fc3b68558e ("drm: Plumb modifiers through plane init")
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Cc: Janet Morgan <janet.morgan@intel.com>
> Cc: Ben Widawsky <ben@bwidawsk.net>
> Cc: Daniel Stone <daniels@collabora.com> (v2)
> Cc: Liviu Dudau <Liviu.Dudau@arm.com>
> Cc: Daniel Stone <daniels@collabora.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> drivers/gpu/drm/tve200/tve200_display.c | 1 +
> 1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/gpu/drm/tve200/tve200_display.c b/drivers/gpu/drm/tve200/tve200_display.c
> index 37fb333331f3..3f4b97bf2a13 100644
> --- a/drivers/gpu/drm/tve200/tve200_display.c
> +++ b/drivers/gpu/drm/tve200/tve200_display.c
> @@ -336,6 +336,7 @@ int tve200_display_init(struct drm_device *drm)
>    ret = drm_simple_display_pipe_init(drm, &priv->pipe,
>                       &tve200_display_funcs,
>                       formats, ARRAY_SIZE(formats),
> +                       NULL,
>                       &priv->connector.connector);
>    if (ret)
>        return ret;
> -- 
> 2.13.2
>
Daniel Vetter Aug. 28, 2017, 8:40 a.m. UTC | #2
On Fri, Aug 25, 2017 at 01:16:12PM -0700, Rodrigo Vivi wrote:
> This Fixes build on branches where we already have format-modifier.
> 
> Reference: https://lists.freedesktop.org/archives/dri-devel/2017-August/151044.html
> Fixes: e6fc3b68558e ("drm: Plumb modifiers through plane init")

tve200 was merged after this patch, the correct Fixes line would be:

Fixes: 179c02fe90a4 ("drm/tve200: Add new driver for TVE200")

Linus, can you pls make sure that tve200 is enabled int the
drm-rerere/*arm*defconfig files, to avoid this in the future? They're the
recommended set to compile-test drm-misc (yes we should somehow bot-ify
this, but oh well).

Thanks, Daniel

> Cc: Linus Walleij <linus.walleij@linaro.org>
> Cc: Janet Morgan <janet.morgan@intel.com>
> Cc: Ben Widawsky <ben@bwidawsk.net>
> Cc: Daniel Stone <daniels@collabora.com> (v2)
> Cc: Liviu Dudau <Liviu.Dudau@arm.com>
> Cc: Daniel Stone <daniels@collabora.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
>  drivers/gpu/drm/tve200/tve200_display.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/gpu/drm/tve200/tve200_display.c b/drivers/gpu/drm/tve200/tve200_display.c
> index 37fb333331f3..3f4b97bf2a13 100644
> --- a/drivers/gpu/drm/tve200/tve200_display.c
> +++ b/drivers/gpu/drm/tve200/tve200_display.c
> @@ -336,6 +336,7 @@ int tve200_display_init(struct drm_device *drm)
>  	ret = drm_simple_display_pipe_init(drm, &priv->pipe,
>  					   &tve200_display_funcs,
>  					   formats, ARRAY_SIZE(formats),
> +					   NULL,
>  					   &priv->connector.connector);
>  	if (ret)
>  		return ret;
> -- 
> 2.13.2
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
Daniel Vetter Aug. 30, 2017, 7:22 a.m. UTC | #3
On Mon, Aug 28, 2017 at 10:40:34AM +0200, Daniel Vetter wrote:
> On Fri, Aug 25, 2017 at 01:16:12PM -0700, Rodrigo Vivi wrote:
> > This Fixes build on branches where we already have format-modifier.
> > 
> > Reference: https://lists.freedesktop.org/archives/dri-devel/2017-August/151044.html
> > Fixes: e6fc3b68558e ("drm: Plumb modifiers through plane init")
> 
> tve200 was merged after this patch, the correct Fixes line would be:
> 
> Fixes: 179c02fe90a4 ("drm/tve200: Add new driver for TVE200")
> 
> Linus, can you pls make sure that tve200 is enabled int the
> drm-rerere/*arm*defconfig files, to avoid this in the future? They're the
> recommended set to compile-test drm-misc (yes we should somehow bot-ify
> this, but oh well).

Neither Rodrigo (as the author of the patch) or Linus (as the driver
maintainer) took action here already, and since it's an obvious compile
fail it's annoying, so I merged it.

But really this entire commit rights thing means committer take care of
this stuff, not maintainers.

Linus, I also added tve200 to the defconfigs now.
-Daniel

> 
> Thanks, Daniel
> 
> > Cc: Linus Walleij <linus.walleij@linaro.org>
> > Cc: Janet Morgan <janet.morgan@intel.com>
> > Cc: Ben Widawsky <ben@bwidawsk.net>
> > Cc: Daniel Stone <daniels@collabora.com> (v2)
> > Cc: Liviu Dudau <Liviu.Dudau@arm.com>
> > Cc: Daniel Stone <daniels@collabora.com>
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > ---
> >  drivers/gpu/drm/tve200/tve200_display.c | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/drivers/gpu/drm/tve200/tve200_display.c b/drivers/gpu/drm/tve200/tve200_display.c
> > index 37fb333331f3..3f4b97bf2a13 100644
> > --- a/drivers/gpu/drm/tve200/tve200_display.c
> > +++ b/drivers/gpu/drm/tve200/tve200_display.c
> > @@ -336,6 +336,7 @@ int tve200_display_init(struct drm_device *drm)
> >  	ret = drm_simple_display_pipe_init(drm, &priv->pipe,
> >  					   &tve200_display_funcs,
> >  					   formats, ARRAY_SIZE(formats),
> > +					   NULL,
> >  					   &priv->connector.connector);
> >  	if (ret)
> >  		return ret;
> > -- 
> > 2.13.2
> > 
> > _______________________________________________
> > dri-devel mailing list
> > dri-devel@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/dri-devel
> 
> -- 
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
Linus Walleij Aug. 31, 2017, 9:28 a.m. UTC | #4
On Wed, Aug 30, 2017 at 9:22 AM, Daniel Vetter <daniel@ffwll.ch> wrote:
> On Mon, Aug 28, 2017 at 10:40:34AM +0200, Daniel Vetter wrote:
>> On Fri, Aug 25, 2017 at 01:16:12PM -0700, Rodrigo Vivi wrote:
>> > This Fixes build on branches where we already have format-modifier.
>> >
>> > Reference: https://lists.freedesktop.org/archives/dri-devel/2017-August/151044.html
>> > Fixes: e6fc3b68558e ("drm: Plumb modifiers through plane init")
>>
>> tve200 was merged after this patch, the correct Fixes line would be:
>>
>> Fixes: 179c02fe90a4 ("drm/tve200: Add new driver for TVE200")
>>
>> Linus, can you pls make sure that tve200 is enabled int the
>> drm-rerere/*arm*defconfig files, to avoid this in the future? They're the
>> recommended set to compile-test drm-misc (yes we should somehow bot-ify
>> this, but oh well).

Oh I was not aware of that, sorry.

> Neither Rodrigo (as the author of the patch) or Linus (as the driver
> maintainer) took action here already, and since it's an obvious compile
> fail it's annoying, so I merged it.

Thanks.

> But really this entire commit rights thing means committer take care of
> this stuff, not maintainers.
>
> Linus, I also added tve200 to the defconfigs now.

Thanks, I was just about to ask how to do it.

I will look in drm-rerere folder and try to figure out how this works so
I can get it right in the future.

Yours,
Linus Walleij
diff mbox

Patch

diff --git a/drivers/gpu/drm/tve200/tve200_display.c b/drivers/gpu/drm/tve200/tve200_display.c
index 37fb333331f3..3f4b97bf2a13 100644
--- a/drivers/gpu/drm/tve200/tve200_display.c
+++ b/drivers/gpu/drm/tve200/tve200_display.c
@@ -336,6 +336,7 @@  int tve200_display_init(struct drm_device *drm)
 	ret = drm_simple_display_pipe_init(drm, &priv->pipe,
 					   &tve200_display_funcs,
 					   formats, ARRAY_SIZE(formats),
+					   NULL,
 					   &priv->connector.connector);
 	if (ret)
 		return ret;