| Message ID | 20190502104548.GX15144@e110455-lin.cambridge.arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [PULL] 2nd pull for malidp-next | expand |
On Thu, 2 May 2019 at 20:45, Liviu Dudau <Liviu.Dudau@arm.com> 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@arm.com> 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? Dave.
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@arm.com> 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@arm.com> > 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@huawei.com> 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@huawei.com> Reviewed-by: James Qian Wang (Arm Technology China) <james.qian.wang@arm.com> Signed-off-by: Liviu Dudau <liviu.dudau@arm.com> Maybe resync? Best regards, Liviu > > Dave.
On Fri, May 3, 2019 at 11:11 AM Liviu Dudau <Liviu.Dudau@arm.com> 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@arm.com> 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@arm.com> > > 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@huawei.com> > 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@huawei.com> > Reviewed-by: James Qian Wang (Arm Technology China) <james.qian.wang@arm.com> > Signed-off-by: Liviu Dudau <liviu.dudau@arm.com> > > > 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
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@arm.com> 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@arm.com> 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@arm.com> > > > 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@huawei.com> > > 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@huawei.com> > > Reviewed-by: James Qian Wang (Arm Technology China) <james.qian.wang@arm.com> > > Signed-off-by: Liviu Dudau <liviu.dudau@arm.com> > > > > > > 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@huawei.com> 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@huawei.com> Reviewed-by: James Qian Wang (Arm Technology China) <james.qian.wang@arm.com> Signed-off-by: Liviu Dudau <liviu.dudau@arm.com> 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? Best regards, Liviu > -- > Daniel Vetter > Software Engineer, Intel Corporation > +41 (0) 79 365 57 48 - http://blog.ffwll.ch
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@arm.com> 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@arm.com> 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@arm.com> > > > 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@huawei.com> > > 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@huawei.com> > > Reviewed-by: James Qian Wang (Arm Technology China) <james.qian.wang@arm.com> > > Signed-off-by: Liviu Dudau <liviu.dudau@arm.com> > > > > > > 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 $ git fetch git://linux-arm.org/linux-ld.git refs/heads/for-upstream/mali-dp From git://linux-arm.org/linux-ld * branch for-upstream/mali-dp -> FETCH_HEAD [dliviu@burro kernel]$ git show FETCH_HEAD commit 96f9574666861e7c5902d412474d3ff28123c7d1 (liviu-arm/for-upstream/mali-dp) Author: YueHaibing <yuehaibing@huawei.com> 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@huawei.com> Reviewed-by: James Qian Wang (Arm Technology China) <james.qian.wang@arm.com> Signed-off-by: Liviu Dudau <liviu.dudau@arm.com> So it looks like I have a for/upstream/mali-dp and refs/heads/for-upstream/mali-dp and not sure how I got there :( Best regards, Liviu > -- > Daniel Vetter > Software Engineer, Intel Corporation > +41 (0) 79 365 57 48 - http://blog.ffwll.ch
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@arm.com> 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@arm.com> > 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? Sorry about that, it looks like I've head another refspec with the same name, it should have pointed to refs/heads/for-upstream/mali-dp. I should have now sorted it. Best regards, Liviu > > Dave.
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@arm.com> 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@arm.com> 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@arm.com> > > > > 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@huawei.com> > > > 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@huawei.com> > > > Reviewed-by: James Qian Wang (Arm Technology China) <james.qian.wang@arm.com> > > > Signed-off-by: Liviu Dudau <liviu.dudau@arm.com> > > > > > > > > > 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@huawei.com> > 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@huawei.com> > Reviewed-by: James Qian Wang (Arm Technology China) <james.qian.wang@arm.com> > Signed-off-by: Liviu Dudau <liviu.dudau@arm.com> > > 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! / > --------------- > ¯\_(ツ)_/¯
On Fri, 3 May 2019 at 22:17, Daniel Vetter <daniel@ffwll.ch> wrote: > > 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@arm.com> 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@arm.com> 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 So I get commits now, but I also get: Pulling git://linux-arm.org/linux-ld.git for-upstream/mali-dp ... From git://linux-arm.org/linux-ld * branch for-upstream/mali-dp -> FETCH_HEAD dim: 09918bb1ff8c ("drm/komeda: Use memset to initialize config_id"): SHA1 in fixes line not found: dim: 4cc734cb79a8 ("drm/komeda: Add sysfs attribute: core_id and config_id") dim: d9fcab4a131d ("drm/komeda: Mark the local functions as static"): author Signed-off-by missing. dim: ERROR: issues in commits detected, aborting Please fix the fixes tag, though since that is all in the one pull request you should probably squash the fix into the offending commit. Dave.
On Tue, May 07, 2019 at 09:50:19AM +1000, Dave Airlie wrote: > On Fri, 3 May 2019 at 22:17, Daniel Vetter <daniel@ffwll.ch> wrote: > > > > 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@arm.com> 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@arm.com> 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 > > So I get commits now, but I also get: > > Pulling git://linux-arm.org/linux-ld.git for-upstream/mali-dp ... > From git://linux-arm.org/linux-ld > * branch for-upstream/mali-dp -> FETCH_HEAD > dim: 09918bb1ff8c ("drm/komeda: Use memset to initialize config_id"): > SHA1 in fixes line not found: > dim: 4cc734cb79a8 ("drm/komeda: Add sysfs attribute: core_id and config_id") > dim: d9fcab4a131d ("drm/komeda: Mark the local functions as static"): > author Signed-off-by missing. > dim: ERROR: issues in commits detected, aborting > > Please fix the fixes tag, though since that is all in the one pull > request you should probably squash the fix into the offending commit. > > Dave. Hi Dave, I have rolled the 09918bb1ff8c ("drm/komeda: Use memset to initialize config_id") commit into the offending one and fixed the Signed-off-by ID for James, please pull the updated tree. Best regards, 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 for you to fetch changes up to 15e9122d9b5c745024f2d9d5653caed1f37c185f: drm/komeda: Mark the local functions as static (2019-05-07 11:26:47 +0100) ---------------------------------------------------------------- james qian wang (Arm Technology China) (18): drm: Add drm_atomic_get_old/new_private_obj_state drm/komeda: Add komeda_pipeline/component_get_state_and_set_user drm/komeda: Initialize komeda component as drm private object drm/komeda: Add komeda_build_layer_data_flow drm/komeda: Add komeda_plane/plane_helper_funcs drm/komeda: Add komeda_build_display_data_flow drm/komeda: Add komeda_release_unclaimed_resources drm/komeda: Add komeda_crtc_atomic_flush drm/komeda: Add komeda_crtc_mode_valid/fixup drm/komeda: Add komeda_crtc_prepare/unprepare drm/komeda: Add komeda_crtc_atomic_enable/disable drm/komeda: Add komeda_crtc_vblank_enable/disable drm/komeda: Add komeda_crtc_funcs drm/komeda: Add komeda_kms_check drm/komeda: Add sysfs attribute: core_id and config_id drm/komeda: Expose bus_width to Komeda-CORE drm/komeda: Fixed warning: Function parameter or member not described drm/komeda: Mark the local functions as static .../gpu/drm/arm/display/include/malidp_product.h | 12 + drivers/gpu/drm/arm/display/komeda/Makefile | 1 + .../gpu/drm/arm/display/komeda/d71/d71_component.c | 9 +- drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c | 54 ++ drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 395 ++++++++++++- drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 52 ++ drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 44 +- drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 9 +- .../drm/arm/display/komeda/komeda_framebuffer.h | 9 +- drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 39 +- drivers/gpu/drm/arm/display/komeda/komeda_kms.h | 21 +- .../gpu/drm/arm/display/komeda/komeda_pipeline.c | 2 +- .../gpu/drm/arm/display/komeda/komeda_pipeline.h | 81 ++- .../drm/arm/display/komeda/komeda_pipeline_state.c | 610 +++++++++++++++++++++ drivers/gpu/drm/arm/display/komeda/komeda_plane.c | 139 +++++ .../drm/arm/display/komeda/komeda_private_obj.c | 220 +++++++- drivers/gpu/drm/drm_atomic.c | 45 +- include/drm/drm_atomic.h | 6 + 18 files changed, 1700 insertions(+), 48 deletions(-) create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c
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 for you to fetch changes up to 96f9574666861e7c5902d412474d3ff28123c7d1: drm/komeda: remove set but not used variable 'kcrtc' (2019-04-29 14:51:11 +0100) ---------------------------------------------------------------- Nathan Chancellor (1): drm/komeda: Use memset to initialize config_id YueHaibing (1): drm/komeda: remove set but not used variable 'kcrtc' james qian wang (Arm Technology China) (18): drm: Add drm_atomic_get_old/new_private_obj_state drm/komeda: Add komeda_pipeline/component_get_state_and_set_user drm/komeda: Initialize komeda component as drm private object drm/komeda: Add komeda_build_layer_data_flow drm/komeda: Add komeda_plane/plane_helper_funcs drm/komeda: Add komeda_build_display_data_flow drm/komeda: Add komeda_release_unclaimed_resources drm/komeda: Add komeda_crtc_atomic_flush drm/komeda: Add komeda_crtc_mode_valid/fixup drm/komeda: Add komeda_crtc_prepare/unprepare drm/komeda: Add komeda_crtc_atomic_enable/disable drm/komeda: Add komeda_crtc_vblank_enable/disable drm/komeda: Add komeda_crtc_funcs drm/komeda: Add komeda_kms_check drm/komeda: Add sysfs attribute: core_id and config_id drm/komeda: Expose bus_width to Komeda-CORE drm/komeda: Fixed warning: Function parameter or member not described drm/komeda: Mark the local functions as static .../gpu/drm/arm/display/include/malidp_product.h | 12 + drivers/gpu/drm/arm/display/komeda/Makefile | 1 + .../gpu/drm/arm/display/komeda/d71/d71_component.c | 9 +- drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c | 54 ++ drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 395 ++++++++++++- drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 52 ++ drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 44 +- drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 9 +- .../drm/arm/display/komeda/komeda_framebuffer.h | 9 +- drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 39 +- drivers/gpu/drm/arm/display/komeda/komeda_kms.h | 21 +- .../gpu/drm/arm/display/komeda/komeda_pipeline.c | 2 +- .../gpu/drm/arm/display/komeda/komeda_pipeline.h | 81 ++- .../drm/arm/display/komeda/komeda_pipeline_state.c | 610 +++++++++++++++++++++ drivers/gpu/drm/arm/display/komeda/komeda_plane.c | 137 +++++ .../drm/arm/display/komeda/komeda_private_obj.c | 220 +++++++- drivers/gpu/drm/drm_atomic.c | 45 +- include/drm/drm_atomic.h | 6 + 18 files changed, 1698 insertions(+), 48 deletions(-) create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c