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 at 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: 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
