Re: linux-next: manual merge of the mali-dp tree with the drm-misc tree

Liviu Dudau
2016-11-03T17:19:58Z

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! /
---------------
¯\_(ツ)_/¯
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org