[GIT,PULL] core drm support for Rockchip SoCs v14

Hi Dave

     this pull request is for rockchip drm v14, based on Joerg's iommu 
arm/rockchip branch.

The following changes since commit 656d7077d8ffd1c2492d4a0a354367ab2e545059:

   dt-bindings: iommu: Add documentation for rockchip iommu (2014-11-03 
17:29:09 +0100)

are available in the git repository at:

   https://github.com/markyzq/kernel-drm-rockchip.git drm_iommu

for you to fetch changes up to aab18af3a93353bc43897b716fd7e12d5998b9bc:

   dt-bindings: video: Add documentation for rockchip vop (2014-11-27 
13:38:17 +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        |  483 +++++++
  drivers/gpu/drm/rockchip/rockchip_drm_drv.h        |   55 +
  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      |   21 +
  drivers/gpu/drm/rockchip/rockchip_drm_gem.c        |  294 ++++
  drivers/gpu/drm/rockchip/rockchip_drm_gem.h        |   54 +
  drivers/gpu/drm/rockchip/rockchip_drm_vop.c        | 1459 
++++++++++++++++++++
  drivers/gpu/drm/rockchip/rockchip_drm_vop.h        |  201 +++
  16 files changed, 3110 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


--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

On 27 November 2014 at 17:01, Mark yao <mark.yao@rock-chips.com> wrote:
> Hi Dave
>
>     this pull request is for rockchip drm v14, based on Joerg's iommu
> arm/rockchip branch.
>
> The following changes since commit 656d7077d8ffd1c2492d4a0a354367ab2e545059:
>
>   dt-bindings: iommu: Add documentation for rockchip iommu (2014-11-03
> 17:29:09 +0100)
>
> are available in the git repository at:
>
>   https://github.com/markyzq/kernel-drm-rockchip.git drm_iommu
>
> for you to fetch changes up to aab18af3a93353bc43897b716fd7e12d5998b9bc:
>
>   dt-bindings: video: Add documentation for rockchip vop (2014-11-27

For list prosperity, now that I can build this, I find it can't build
as a module

 LD [M]  drivers/gpu/drm/rockchip/rockchipdrm.o
drivers/gpu/drm/rockchip/rockchip_drm_vop.o: In function `init_module':
rockchip_drm_vop.c:(.init.text+0x0): multiple definition of `init_module'
drivers/gpu/drm/rockchip/rockchip_drm_drv.o:rockchip_drm_drv.c:(.init.text+0x0):
first defined here
drivers/gpu/drm/rockchip/rockchip_drm_vop.o: In function `cleanup_module':
rockchip_drm_vop.c:(.exit.text+0x0): multiple definition of `cleanup_module'
drivers/gpu/drm/rockchip/rockchip_drm_drv.o:rockchip_drm_drv.c:(.exit.text+0x0):
first defined here

not sure what your plan for the vop.c variant should be, is it an extra module,
or just part of rockchipdrm?

Dave.
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html