From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759361AbcKCRUD (ORCPT ); Thu, 3 Nov 2016 13:20:03 -0400 Received: from foss.arm.com ([217.140.101.70]:43268 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756226AbcKCRUB (ORCPT ); Thu, 3 Nov 2016 13:20:01 -0400 Date: Thu, 3 Nov 2016 17:19:58 +0000 From: Liviu Dudau To: Stephen Rothwell Cc: Daniel Vetter , Intel Graphics , DRI , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Ville =?utf-8?B?U3lyasOkbMOk?= , Brian Starkey Subject: Re: linux-next: manual merge of the mali-dp tree with the drm-misc tree Message-ID: <20161103171958.GA17265@e106497-lin.cambridge.arm.com> References: <20161025112044.1a866eaa@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20161025112044.1a866eaa@canb.auug.org.au> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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! / --------------- ¯\_(ツ)_/¯