From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiko =?ISO-8859-1?Q?St=FCbner?= Subject: Re: [PATCH v11 0/3] Add drm driver for Rockchip Socs Date: Fri, 17 Oct 2014 10:25:19 +0200 Message-ID: <4044646.m0RgIJvLdJ@phil> References: <1412763781-31533-1-git-send-email-mark.yao@rock-chips.com> <282711393.zuCWIeu2Oz@phil> <5440D041.9020300@rock-chips.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <5440D041.9020300@rock-chips.com> Sender: linux-doc-owner@vger.kernel.org To: Mark yao Cc: Dave Airlie , Boris BREZILLON , Rob Clark , Daniel Vetter , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Randy Dunlap , Grant Likely , Greg Kroah-Hartman , John Stultz , Rom Lemarchand , "devicetree@vger.kernel.org" , linux-doc@vger.kernel.org, LKML , dri-devel , linux-api@vger.kernel.org, linux-rockchip@lists.infradead.org, dianders@chromium.org, =?ISO-8859-1?Q?St=E9phane?= Marchesin , dbehr@chromium.orgO List-Id: linux-api@vger.kernel.org Am Freitag, 17. Oktober 2014, 16:16:01 schrieb Mark yao: > On 2014=E5=B9=B410=E6=9C=8817=E6=97=A5 14:24, Heiko St=C3=BCbner wrot= e: > > Hi Mark, > >=20 > > Am Freitag, 17. Oktober 2014, 12:22:53 schrieb Mark yao: > >> On 2014=E5=B9=B410=E6=9C=8817=E6=97=A5 08:46, Dave Airlie wrote: > >>> On 17 October 2014 10:40, Mark yao wrot= e: > >>>> Hi > >>>> I think Rockchip drm driver is ready now, can it land? > >>>=20 > >>> I probably want to wait until -rc1 though I suppose since its a n= ew > >>> driver and self contained we might be able to see if Linus is > >>> interested in squeezing it in. > >>>=20 > >>> Can you send me a git pull request for it against drm-next or eve= n 3.17. > >>>=20 > >>> Dave. > >>=20 > >> Hi, Dave > >>=20 > >> the git pull request: > >> The following changes since commit=20 4db36870b92cdf5a79615aeabc68efc97df13918: > > I think this needs a fix. Your commit 4db36870b is the pending iomm= u > > driver. Which isn't part of neither the mainline kernel nor the drm= tree > > Dave meant. > >=20 > > What Dave meant was to base your patches on top of his "drm-next" b= ranch > > or > > the raw 3.17 release. > >=20 > > So either base the branch on drm-next from > >=20 > > http://cgit.freedesktop.org/~airlied/linux/log/?h=3Ddrm-next > >=20 > > or the 3.17 release tag from Linus Torvalds. Apply your patches on = top and > > create pull from there. > >=20 > > I've just checked ... your drm patches apply cleanly against 3.17, = so your > > branch to be pulled should probably look something like > >=20 > > https://github.com/mmind/linux-rockchip/commits/tmp/drmtest > >=20 > > Heiko >=20 > Hi Heiko > thanks for you check. >=20 > Hi Dave > I have reupload a branch cleanly against 3.17: sorry, but I think this might need another round.=20 Your current base commit 0429fbc0bdc2 is already part of the current 3.= 18=20 merge window - which Dave won't have in his tree I guess. The commit yo= u=20 should base your patches on is bfe01a5ba249 - the 3.17 release. Simply do a git checkout v3.17 git checkout -b drmupstream apply your patches and send the pull request with v3.17 as base. Heiko >=20 > The following changes since commit 0429fbc0bdc297d64188483ba029a23773= ae07b0: >=20 > Merge branch 'for-3.18-consistent-ops' of > git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu (2014-10-15 > 07:48:18 +0200) >=20 > are available in the git repository at: >=20 >=20 > https://github.com/markyzq/kernel-drm-rockchip.git drmupstream >=20 > for you to fetch changes up to f92714d79376a4168ea3ae0b13ccd0b90a640f= 35: >=20 > dt-bindings: video: Add documentation for rockchip vop (2014-10-17 > 16:09:23 +0800) >=20 > ---------------------------------------------------------------- > Mark yao (3): > drm: rockchip: Add basic drm driver > dt-bindings: video: Add for rockchip display subsytem > dt-bindings: video: Add documentation for rockchip vop >=20 > .../devicetree/bindings/video/rockchip-drm.txt | 19 + > .../devicetree/bindings/video/rockchip-vop.txt | 58 + > drivers/gpu/drm/Kconfig | 2 + > drivers/gpu/drm/Makefile | 1 + > drivers/gpu/drm/rockchip/Kconfig | 17 + > drivers/gpu/drm/rockchip/Makefile | 8 + > drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 449 ++++++ > drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 54 + > drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 200 +++ > drivers/gpu/drm/rockchip/rockchip_drm_fb.h | 28 + > drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 210 +++ > drivers/gpu/drm/rockchip/rockchip_drm_fbdev.h | 20 + > drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 293 ++++ > drivers/gpu/drm/rockchip/rockchip_drm_gem.h | 54 + > drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 1427 > ++++++++++++++++++++ > drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 196 +++ > 16 files changed, 3036 insertions(+) > create mode 100644 > Documentation/devicetree/bindings/video/rockchip-drm.txt > create mode 100644 > Documentation/devicetree/bindings/video/rockchip-vop.txt > create mode 100644 drivers/gpu/drm/rockchip/Kconfig > create mode 100644 drivers/gpu/drm/rockchip/Makefile > create mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_drv.c > create mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_drv.h > create mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_fb.c > create mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_fb.h > create mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c > create mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_fbdev.h > create mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_gem.c > create mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_gem.h > create mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_vop.c > create mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_vop.h