On Fri, May 03, 2019 at 10:29:48AM +0100, Liviu Dudau wrote:
> On Fri, May 03, 2019 at 11:15:23AM +0200, Daniel Vetter wrote:
> > On Fri, May 3, 2019 at 11:11 AM Liviu Dudau <Liviu.Dudau@xxxxxxx> wrote:
> > >
> > > On Fri, May 03, 2019 at 09:54:35AM +1000, Dave Airlie wrote:
> > > > On Thu, 2 May 2019 at 20:45, Liviu Dudau <Liviu.Dudau@xxxxxxx> wrote:
> > > > >
> > > > > Hi DRM maintainers,
> > > > >
> > > > > This is the 2nd pull request for the malidp-next. The new patches add
> > > > > additional support for Arm Mali D71 so that it can now be enabled
> > > > > correctly and brought up on any SoC that contains the IP. From now on
> > > > > we will start focusing on adding writeback, scaling and other useful
> > > > > features to bring the driver to the same level of maturity as mali-dp.
> > > > >
> > > > > Please pull,
> > > > > Liviu
> > > > >
> > > > >
> > > > >
> > > > > The following changes since commit 7c13e5cc2391950541f41fc9ab0336aae77c7f63:
> > > > >
> > > > > Merge tag 'drm-intel-next-fixes-2019-04-25' of git://anongit.freedesktop.org/drm/drm-intel into drm-next (2019-04-26 11:35:59 +1000)
> > > > >
> > > > > are available in the Git repository at:
> > > > >
> > > > > git://linux-arm.org/linux-ld.git for-upstream/mali-dp
> > > >
> > > > This branch contains:
> > > > commit 04c8a1ec395b22f060b836b72d2d4480e7e859f8
> > > > Author: Liviu Dudau <Liviu.Dudau@xxxxxxx>
> > > > Date: Tue Mar 26 10:23:40 2019 +0000
> > > >
> > > > MAINTAINERS: Fix pattern for Documentation path for Arm Mali Komeda
> > > >
> > > > as it's head, did you forget to push?
> > >
> > > From my home computer I see a different commit as the head:
> > >
> > >
> > > commit 96f9574666861e7c5902d412474d3ff28123c7d1 (liviu-arm/for-upstream/mali-dp)
> > > Author: YueHaibing <yuehaibing@xxxxxxxxxx>
> > > Date: Sat Apr 27 00:42:02 2019 +0800
> > >
> > > drm/komeda: remove set but not used variable 'kcrtc'
> > >
> > > Fixes gcc '-Wunused-but-set-variable' warning:
> > >
> > > drivers/gpu/drm/arm/display/komeda/komeda_plane.c: In function komeda_plane_atomic_check:
> > > drivers/gpu/drm/arm/display/komeda/komeda_plane.c:49:22: warning: variable kcrtc set but not used [-Wunused-but-set-variable]
> > >
> > > It is never used since introduction in
> > > commit 7d31b9e7a550 ("drm/komeda: Add komeda_plane/plane_helper_funcs")
> > >
> > > Signed-off-by: YueHaibing <yuehaibing@xxxxxxxxxx>
> > > Reviewed-by: James Qian Wang (Arm Technology China) <james.qian.wang@xxxxxxx>
> > > Signed-off-by: Liviu Dudau <liviu.dudau@xxxxxxx>
> > >
> > >
> > > Maybe resync?
> >
> >
> > >daniel@phenom:~/linux/src$ git fetch git://linux-arm.org/linux-ld.git for-upstream/mali-dp
> > From git://linux-arm.org/linux-ld
> > * branch refs/for-upstream/mali-dp -> FETCH_HEAD
> > daniel@phenom:~/linux/src$ git show FETCH_HEAD
> > commit 04c8a1ec395b22f060b836b72d2d4480e7e859f8
> >
> > Whatever it is you're looking at, it's not the remote sha1 everyone
> > else gets :-)
> > -Daniel
>
> Hmm, I'm getting the same as you if I follow your steps. However, if I do:
>
>
> $ git remote update
> Fetching origin
> remote: Counting objects: 3905, done.
> remote: Compressing objects: 100% (2010/2010), done.
> remote: Total 3905 (delta 2278), reused 2978 (delta 1879)
> Receiving objects: 100% (3905/3905), 8.06 MiB | 589.00 KiB/s, done.
> Resolving deltas: 100% (2278/2278), done.
> From git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
> 618d919cae2f..ea9866793d1e master -> origin/master
> * [new tag] v5.1-rc6 -> v5.1-rc6
> * [new tag] v5.1-rc7 -> v5.1-rc7
> Fetching liviu-arm
> remote: Counting objects: 22370, done.
> remote: Compressing objects: 100% (4315/4315), done.
> remote: Total 19137 (delta 16417), reused 17145 (delta 14805)
> Receiving objects: 100% (19137/19137), 4.53 MiB | 6.21 MiB/s, done.
> Resolving deltas: 100% (16417/16417), completed with 1338 local objects.
> From git://linux-arm.org/linux-ld
> * [new branch] development/malidp -> liviu-arm/development/malidp
> * [new branch] for-upstream/documentation -> liviu-arm/for-upstream/documentation
> * [new branch] for-upstream/drm-cleanup -> liviu-arm/for-upstream/drm-cleanup
> * [new branch] for-upstream/hdlcd -> liviu-arm/for-upstream/hdlcd
> * [new branch] for-upstream/juno-dts -> liviu-arm/for-upstream/juno-dts
> * [new branch] for-upstream/juno-pcie -> liviu-arm/for-upstream/juno-pcie
> * [new branch] for-upstream/mali-dp -> liviu-arm/for-upstream/mali-dp
> * [new branch] for-upstream/malidp-fixes -> liviu-arm/for-upstream/malidp-fixes
> * [new branch] for-upstream/pci -> liviu-arm/for-upstream/pci
> * [new branch] for-upstream/pci-next -> liviu-arm/for-upstream/pci-next
> * [new tag] hdlcd-for-v4.13-v3 -> hdlcd-for-v4.13-v3
> [dliviu@burro kernel]$ git show liviu-arm/for-upstream/mali-dp
> commit 96f9574666861e7c5902d412474d3ff28123c7d1 (liviu-arm/for-upstream/mali-dp)
> Author: YueHaibing <yuehaibing@xxxxxxxxxx>
> Date: Sat Apr 27 00:42:02 2019 +0800
>
> drm/komeda: remove set but not used variable 'kcrtc'
>
> Fixes gcc '-Wunused-but-set-variable' warning:
>
> drivers/gpu/drm/arm/display/komeda/komeda_plane.c: In function komeda_plane_atomic_check:
> drivers/gpu/drm/arm/display/komeda/komeda_plane.c:49:22: warning: variable kcrtc set but not used [-Wunused-but-set-variable]
>
> It is never used since introduction in
> commit 7d31b9e7a550 ("drm/komeda: Add komeda_plane/plane_helper_funcs")
>
> Signed-off-by: YueHaibing <yuehaibing@xxxxxxxxxx>
> Reviewed-by: James Qian Wang (Arm Technology China) <james.qian.wang@xxxxxxx>
> Signed-off-by: Liviu Dudau <liviu.dudau@xxxxxxx>
>
> diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_plane.c b/drivers/gpu/drm/arm/display/komeda/komeda_plane.c
> index 07ed0cc1bc44..0753892b98d2 100644
> --- a/drivers/gpu/drm/arm/display/komeda/komeda_plane.c
> +++ b/drivers/gpu/drm/arm/display/komeda/komeda_plane.c
> @@ -55,7 +55,6 @@ komeda_plane_atomic_check(struct drm_plane *plane,
> struct komeda_plane_state *kplane_st = to_kplane_st(state);
> struct komeda_layer *layer = kplane->layer;
> struct drm_crtc_state *crtc_st;
> - struct komeda_crtc *kcrtc;
> struct komeda_crtc_state *kcrtc_st;
> struct komeda_data_flow_cfg dflow;
> int err;
> @@ -73,7 +72,6 @@ komeda_plane_atomic_check(struct drm_plane *plane,
> if (!crtc_st->active)
> return 0;
>
> - kcrtc = to_kcrtc(state->crtc);
> kcrtc_st = to_kcrtc_st(crtc_st);
>
> err = komeda_plane_init_data_flow(state, &dflow);
>
>
> I'm baffled. Any suggestion what I need to do to sync up the two views?
It's not my server, so no idea. On fd.o it can happen that the syncing
from private/ssh repos to anongit fails, and then I even know which people
to poke. Probably the same going on here, we pull with git://, you push
with ssh://.
-Daniel
>
> Best regards,
> Liviu
>
>
> > --
> > Daniel Vetter
> > Software Engineer, Intel Corporation
> > +41 (0) 79 365 57 48 - http://blog.ffwll.ch
>
> --
> ====================
> | I would like to |
> | fix the world, |
> | but they're not |
> | giving me the |
> \ source code! /
> ---------------
> ¯\_(ツ)_/¯
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
