Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1514718 > unrolled thread
| Started by | Liviu Dudau <Liviu.Dudau@arm.com> |
|---|---|
| First post | 2016-11-03 18:30 +0100 |
| Last post | 2016-11-04 18:00 +0100 |
| Articles | 5 — 2 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
Re: linux-next: manual merge of the mali-dp tree with the drm-misc tree Liviu Dudau <Liviu.Dudau@arm.com> - 2016-11-03 18:30 +0100
Re: linux-next: manual merge of the mali-dp tree with the drm-misc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-11-04 06:40 +0100
Re: linux-next: manual merge of the mali-dp tree with the drm-misc tree Liviu Dudau <Liviu.Dudau@arm.com> - 2016-11-04 16:50 +0100
Re: linux-next: manual merge of the mali-dp tree with the drm-misc tree Liviu Dudau <Liviu.Dudau@arm.com> - 2016-11-04 18:00 +0100
Re: linux-next: manual merge of the mali-dp tree with the drm-misc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-11-04 18:00 +0100
| From | Liviu Dudau <Liviu.Dudau@arm.com> |
|---|---|
| Date | 2016-11-03 18:30 +0100 |
| Subject | Re: linux-next: manual merge of the mali-dp tree with the drm-misc tree |
| Message-ID | <sztZT-6TG-15@gated-at.bofh.it> |
On Tue, Oct 25, 2016 at 11:20:44AM +1100, Stephen Rothwell wrote:
> Hi Liviu,
Hi Stephen,
>
> Today's linux-next merge of the mali-dp tree got a conflict in:
>
> drivers/gpu/drm/arm/malidp_planes.c
>
> between commit:
>
> ea0e1ce20f73 ("drm/arm: Use per-plane rotation property")
>
> from the drm-misc tree and commit:
>
> 9ebb89762c30 ("drm: mali-dp: Refactor plane initialisation")
>
> from the mali-dp 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.
Sorry for delay in answering, I was on holiday.
I have revamped the mali-dp tree and rebased it on the newer
version of drm-next (which includes the drm-misc change) and pushed the
updated patch in my tree.
Best regards,
Liviu
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/gpu/drm/arm/malidp_planes.c
> index abaca03b9d36,9020c0d8399c..000000000000
> --- a/drivers/gpu/drm/arm/malidp_planes.c
> +++ b/drivers/gpu/drm/arm/malidp_planes.c
> @@@ -254,23 -284,33 +284,30 @@@ int malidp_de_planes_init(struct drm_de
> if (ret < 0)
> goto cleanup;
>
> + drm_plane_helper_add(&plane->base,
> + &malidp_de_plane_helper_funcs);
> + plane->hwdev = malidp->dev;
> + plane->layer = &map->layers[i];
> +
> + /* Skip the features which the SMART layer doesn't have */
> + if (id == DE_SMART)
> + continue;
> +
> - if (!drm->mode_config.rotation_property) {
> + /* SMART layer can't be rotated */
> + if (id != DE_SMART) {
> unsigned long flags = DRM_ROTATE_0 |
> DRM_ROTATE_90 |
> DRM_ROTATE_180 |
> DRM_ROTATE_270 |
> DRM_REFLECT_X |
> DRM_REFLECT_Y;
> - drm->mode_config.rotation_property =
> - drm_mode_create_rotation_property(drm, flags);
> + drm_plane_create_rotation_property(&plane->base,
> + DRM_ROTATE_0,
> + flags);
> }
>
> - drm_plane_helper_add(&plane->base,
> - &malidp_de_plane_helper_funcs);
> - plane->hwdev = malidp->dev;
> - plane->layer = &map->layers[i];
> - if (drm->mode_config.rotation_property)
> - drm_object_attach_property(&plane->base.base,
> - drm->mode_config.rotation_property,
> - DRM_ROTATE_0);
> -
> + malidp_hw_write(malidp->dev, MALIDP_ALPHA_LUT,
> + plane->layer->base + MALIDP_LAYER_COMPOSE);
> }
>
> kfree(formats);
>
--
====================
| I would like to |
| fix the world, |
| but they're not |
| giving me the |
\ source code! /
---------------
¯\_(ツ)_/¯
[toc] | [next] | [standalone]
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2016-11-04 06:40 +0100 |
| Message-ID | <szFom-5NS-1@gated-at.bofh.it> |
| In reply to | #1514718 |
Hi Liviu, On Thu, 3 Nov 2016 17:19:58 +0000 Liviu Dudau <Liviu.Dudau@arm.com> wrote: > > I have revamped the mali-dp tree and rebased it on the newer > version of drm-next (which includes the drm-misc change) and pushed the > updated patch in my tree. Thanks for that. However, several of the commits in your tree now have no Signed-off-by from you as the committer :-( -- Cheers, Stephen Rothwell
[toc] | [prev] | [next] | [standalone]
| From | Liviu Dudau <Liviu.Dudau@arm.com> |
|---|---|
| Date | 2016-11-04 16:50 +0100 |
| Message-ID | <szOUG-3Dx-19@gated-at.bofh.it> |
| In reply to | #1515016 |
On Fri, Nov 04, 2016 at 04:38:54PM +1100, Stephen Rothwell wrote:
> Hi Liviu,
>
> On Thu, 3 Nov 2016 17:19:58 +0000 Liviu Dudau <Liviu.Dudau@arm.com> wrote:
> >
> > I have revamped the mali-dp tree and rebased it on the newer
> > version of drm-next (which includes the drm-misc change) and pushed the
> > updated patch in my tree.
>
> Thanks for that. However, several of the commits in your tree now have
> no Signed-off-by from you as the committer :-(
Brian Starkey is a co-maintainer for the Mali DP tree, so his Signed-off-by
alone should be good. Baoyou's patch is in my tree to stop him repeatedly
send me the same patch over and over again :) But yes, I will add my
Signed-off-by for that one.
Many thanks,
Liviu
>
> --
> Cheers,
> Stephen Rothwell
--
====================
| I would like to |
| fix the world, |
| but they're not |
| giving me the |
\ source code! /
---------------
¯\_(ツ)_/¯
[toc] | [prev] | [next] | [standalone]
| From | Liviu Dudau <Liviu.Dudau@arm.com> |
|---|---|
| Date | 2016-11-04 18:00 +0100 |
| Message-ID | <szQ0q-4l3-5@gated-at.bofh.it> |
| In reply to | #1515267 |
On Sat, Nov 05, 2016 at 03:55:03AM +1100, Stephen Rothwell wrote:
> Hi Liviu,
>
> On Fri, 4 Nov 2016 15:48:02 +0000 Liviu Dudau <Liviu.Dudau@arm.com> wrote:
> >
> > Brian Starkey is a co-maintainer for the Mali DP tree, so his Signed-off-by
> > alone should be good. Baoyou's patch is in my tree to stop him repeatedly
> > send me the same patch over and over again :) But yes, I will add my
> > Signed-off-by for that one.
>
> Sorry, but this is not sufficient. Please read section 11 of
> Documentation/SubmittingPatches (or
> Documentation/process/submitting-patches.rst where it has been moved
> recently). If you are in the path of a patch to Linus, you must add a
> Signed-off-by line, and as the person who committed those patches to
> the tree, you are in the path.
Thanks for correcting me. I will add my Signed-off-bys to the relevant
patches.
Best regards,
Liviu
> --
> Cheers,
> Stephen Rothwell
--
====================
| I would like to |
| fix the world, |
| but they're not |
| giving me the |
\ source code! /
---------------
¯\_(ツ)_/¯
[toc] | [prev] | [next] | [standalone]
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2016-11-04 18:00 +0100 |
| Message-ID | <szQ0q-4l3-7@gated-at.bofh.it> |
| In reply to | #1515267 |
Hi Liviu, On Fri, 4 Nov 2016 15:48:02 +0000 Liviu Dudau <Liviu.Dudau@arm.com> wrote: > > Brian Starkey is a co-maintainer for the Mali DP tree, so his Signed-off-by > alone should be good. Baoyou's patch is in my tree to stop him repeatedly > send me the same patch over and over again :) But yes, I will add my > Signed-off-by for that one. Sorry, but this is not sufficient. Please read section 11 of Documentation/SubmittingPatches (or Documentation/process/submitting-patches.rst where it has been moved recently). If you are in the path of a patch to Linus, you must add a Signed-off-by line, and as the person who committed those patches to the tree, you are in the path. -- Cheers, Stephen Rothwell
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web