From: "Heiko Stübner" <heiko@sntech.de>
To: Mark yao <mark.yao@rock-chips.com>
Cc: "Dave Airlie" <airlied@gmail.com>,
"Boris BREZILLON" <boris.brezillon@free-electrons.com>,
"Rob Clark" <robdclark@gmail.com>,
"Daniel Vetter" <daniel@ffwll.ch>,
"Rob Herring" <robh+dt@kernel.org>,
"Pawel Moll" <pawel.moll@arm.com>,
"Mark Rutland" <mark.rutland@arm.com>,
"Ian Campbell" <ijc+devicetree@hellion.org.uk>,
"Kumar Gala" <galak@codeaurora.org>,
"Randy Dunlap" <rdunlap@infradead.org>,
"Grant Likely" <grant.likely@linaro.org>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"John Stultz" <john.stultz@linaro.org>,
"Rom Lemarchand" <romlem@google.com>,
"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
linux-doc@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
dri-devel <dri-devel@lists.freedesktop.org>,
linux-api@vger.kernel.org, linux-rockchip@lists.infradead.org,
dianders@chromium.org,
"Stéphane Marchesin" <marcheu@chromium.org>,
dbehr@chromium.orgO
Subject: Re: [PATCH v11 0/3] Add drm driver for Rockchip Socs
Date: Fri, 17 Oct 2014 10:25:19 +0200 [thread overview]
Message-ID: <4044646.m0RgIJvLdJ@phil> (raw)
In-Reply-To: <5440D041.9020300@rock-chips.com>
Am Freitag, 17. Oktober 2014, 16:16:01 schrieb Mark yao:
> On 2014年10月17日 14:24, Heiko Stübner wrote:
> > Hi Mark,
> >
> > Am Freitag, 17. Oktober 2014, 12:22:53 schrieb Mark yao:
> >> On 2014年10月17日 08:46, Dave Airlie wrote:
> >>> On 17 October 2014 10:40, Mark yao <mark.yao@rock-chips.com> wrote:
> >>>> Hi
> >>>> I think Rockchip drm driver is ready now, can it land?
> >>>
> >>> I probably want to wait until -rc1 though I suppose since its a new
> >>> driver and self contained we might be able to see if Linus is
> >>> interested in squeezing it in.
> >>>
> >>> Can you send me a git pull request for it against drm-next or even 3.17.
> >>>
> >>> Dave.
> >>
> >> Hi, Dave
> >>
> >> the git pull request:
> >> The following changes since commit
4db36870b92cdf5a79615aeabc68efc97df13918:
> > I think this needs a fix. Your commit 4db36870b is the pending iommu
> > driver. Which isn't part of neither the mainline kernel nor the drm tree
> > Dave meant.
> >
> > What Dave meant was to base your patches on top of his "drm-next" branch
> > or
> > the raw 3.17 release.
> >
> > So either base the branch on drm-next from
> >
> > http://cgit.freedesktop.org/~airlied/linux/log/?h=drm-next
> >
> > or the 3.17 release tag from Linus Torvalds. Apply your patches on top and
> > create pull from there.
> >
> > I've just checked ... your drm patches apply cleanly against 3.17, so your
> > branch to be pulled should probably look something like
> >
> > https://github.com/mmind/linux-rockchip/commits/tmp/drmtest
> >
> > Heiko
>
> Hi Heiko
> thanks for you check.
>
> Hi Dave
> I have reupload a branch cleanly against 3.17:
sorry, but I think this might need another round.
Your current base commit 0429fbc0bdc2 is already part of the current 3.18
merge window - which Dave won't have in his tree I guess. The commit you
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
>
> The following changes since commit 0429fbc0bdc297d64188483ba029a23773ae07b0:
>
> 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)
>
> are available in the git repository at:
>
>
> https://github.com/markyzq/kernel-drm-rockchip.git drmupstream
>
> for you to fetch changes up to f92714d79376a4168ea3ae0b13ccd0b90a640f35:
>
> dt-bindings: video: Add documentation for rockchip vop (2014-10-17
> 16:09:23 +0800)
>
> ----------------------------------------------------------------
> 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
>
> .../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
next prev parent reply other threads:[~2014-10-17 8:25 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-08 10:23 [PATCH v11 0/3] Add drm driver for Rockchip Socs Mark Yao
[not found] ` <1412763781-31533-1-git-send-email-mark.yao-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2014-10-08 10:23 ` [PATCH v11 1/3] drm: rockchip: Add basic drm driver Mark Yao
2014-10-17 0:40 ` [PATCH v11 0/3] Add drm driver for Rockchip Socs Mark yao
[not found] ` <5440658D.6020504-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2014-10-17 0:46 ` Dave Airlie
2014-10-17 4:22 ` Mark yao
2014-10-17 6:24 ` Heiko Stübner
2014-10-17 8:16 ` Mark yao
2014-10-17 8:25 ` Heiko Stübner [this message]
2014-10-17 8:42 ` Mark yao
[not found] ` <5440D68E.4070103-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2014-10-20 11:45 ` Heiko Stübner
2014-10-08 10:24 ` [PATCH v11 2/3] dt-bindings: video: Add for rockchip display subsytem Mark Yao
2014-10-08 10:24 ` [PATCH v11 3/3] dt-bindings: video: Add documentation for rockchip vop Mark Yao
2014-10-21 0:43 ` [GIT PULL] core drm support for Rockchip SoCs Mark yao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4044646.m0RgIJvLdJ@phil \
--to=heiko@sntech.de \
--cc=airlied@gmail.com \
--cc=boris.brezillon@free-electrons.com \
--cc=daniel@ffwll.ch \
--cc=dbehr@chromium.orgO \
--cc=devicetree@vger.kernel.org \
--cc=dianders@chromium.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=galak@codeaurora.org \
--cc=grant.likely@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=john.stultz@linaro.org \
--cc=linux-api@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=marcheu@chromium.org \
--cc=mark.rutland@arm.com \
--cc=mark.yao@rock-chips.com \
--cc=pawel.moll@arm.com \
--cc=rdunlap@infradead.org \
--cc=robdclark@gmail.com \
--cc=robh+dt@kernel.org \
--cc=romlem@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).