[GIT PULL] drm-hisilicon-next-2016-04-18 for 4.7

[Xinliang Liu]

Hi Dave,

Have fixed the module compilation error and warnings in this commit:
3d76c7e5bbdd drm/hisilicon: Add designware dsi encoder driver

Please help to pull the new tag drm-hisilicon-next-2016-04-28 and let
me know if there is any problem.

Thanks,
-xinliang


The following changes since commit 152ef5fa9e14e93e7efc43adad7dbcf35d7780f5:

  drm: Switch blobs to the new generic modeset obj refcounting
(2016-04-27 09:58:05 +1000)

are available in the git repository at:

  git at github.com:xin3liang/linux.git tags/drm-hisilicon-next-2016-04-28

for you to fetch changes up to 4f65fd49d7184bda4e3abddc04d5965109832b4f:

  MAINTAINERS: Add maintainer for hisilicon DRM driver (2016-04-28
11:06:54 +0800)

----------------------------------------------------------------
drm-hisilicon-next for 4.7

Add new hisilicon kirin drm driver:
- Add maintainer for hisilicon DRM driver
- Add support for external bridge
- Add designware dsi host driver
- Add designware dsi encoder driver
- Add cma fbdev and hotplug
- Add vblank driver for ADE
- Add plane driver for ADE
- Add crtc driver for ADE
- Add hisilicon kirin drm master driver
- Add device tree binding for hi6220 display subsystem

----------------------------------------------------------------
Xinliang Liu (10):
      drm/hisilicon: Add device tree binding for hi6220 display subsystem
      drm/hisilicon: Add hisilicon kirin drm master driver
      drm/hisilicon: Add crtc driver for ADE
      drm/hisilicon: Add plane driver for ADE
      drm/hisilicon: Add vblank driver for ADE
      drm/hisilicon: Add cma fbdev and hotplug
      drm/hisilicon: Add designware dsi encoder driver
      drm/hisilicon: Add designware dsi host driver
      drm/hisilicon: Add support for external bridge
      MAINTAINERS: Add maintainer for hisilicon DRM driver

 .../bindings/display/hisilicon/dw-dsi.txt          |   72 ++
 .../bindings/display/hisilicon/hisi-ade.txt        |   64 ++
 MAINTAINERS                                        |   10 +
 drivers/gpu/drm/Kconfig                            |    2 +
 drivers/gpu/drm/Makefile                           |    1 +
 drivers/gpu/drm/hisilicon/Kconfig                  |    5 +
 drivers/gpu/drm/hisilicon/Makefile                 |    5 +
 drivers/gpu/drm/hisilicon/kirin/Kconfig            |   18 +
 drivers/gpu/drm/hisilicon/kirin/Makefile           |    6 +
 drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c       |  857 ++++++++++++++++
 drivers/gpu/drm/hisilicon/kirin/dw_dsi_reg.h       |  103 ++
 drivers/gpu/drm/hisilicon/kirin/kirin_ade_reg.h    |  230 +++++
 drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c    | 1057 ++++++++++++++++++++
 drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c    |  367 +++++++
 drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h    |   31 +
 15 files changed, 2828 insertions(+)
 create mode 100644
Documentation/devicetree/bindings/display/hisilicon/dw-dsi.txt
 create mode 100644
Documentation/devicetree/bindings/display/hisilicon/hisi-ade.txt
 create mode 100644 drivers/gpu/drm/hisilicon/Kconfig
 create mode 100644 drivers/gpu/drm/hisilicon/Makefile
 create mode 100644 drivers/gpu/drm/hisilicon/kirin/Kconfig
 create mode 100644 drivers/gpu/drm/hisilicon/kirin/Makefile
 create mode 100644 drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c
 create mode 100644 drivers/gpu/drm/hisilicon/kirin/dw_dsi_reg.h
 create mode 100644 drivers/gpu/drm/hisilicon/kirin/kirin_ade_reg.h
 create mode 100644 drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
 create mode 100644 drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
 create mode 100644 drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h

On 27 April 2016 at 07:43, Dave Airlie <airlied at gmail.com> wrote:
> On 19 April 2016 at 19:03, Xinliang Liu <xinliang.liu at linaro.org> wrote:
>> Hi Dave,
>>
>> This is the first pull request from drm-hisilicon and for 4.7.
>>
>> The patches add new hisilicon drm driver.
>>
>> The patches were reviewed here:
>> http://www.spinics.net/lists/dri-devel/msg104437.html
>>
>> DT binding docs were acked by Rob Herring <robh at kernel.org> here:
>> https://lists.freedesktop.org/archives/dri-devel/2016-March/102135.html
>>
>> Please kindly let me know if there is any problem.
>
>  CC [M]  drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.o
> /home/airlied/devel/kernel/drm-next/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c:
> In function ‘ade_init’:
> /home/airlied/devel/kernel/drm-next/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c:169:134:
> warning: left shift count >= width of type [-Wshift-count-overflow]
> /home/airlied/devel/kernel/drm-next/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c:170:134:
> warning: left shift count >= width of type [-Wshift-count-overflow]
> /home/airlied/devel/kernel/drm-next/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c:171:134:
> warning: left shift count >= width of type [-Wshift-count-overflow]
> /home/airlied/devel/kernel/drm-next/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c:172:134:
> warning: left shift count >= width of type [-Wshift-count-overflow]
>   DTC     drivers/gpu/drm/tilcdc/tilcdc_slave_compat.dtb
>   LD [M]  drivers/gpu/drm/hisilicon/kirin/kirin-drm.o
> drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.o: In function `init_module':
> dw_drm_dsi.c:(.init.text+0x0): multiple definition of `init_module'
> drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.o:kirin_drm_drv.c:(.init.text+0x0):
> first defined here
> drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.o: In function `cleanup_module':
> dw_drm_dsi.c:(.exit.text+0x0): multiple definition of `cleanup_module'
> drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.o:kirin_drm_drv.c:(.exit.text+0x0):
> first defined here
> /home/airlied/devel/kernel/drm-next/scripts/Makefile.build:428: recipe
> for target 'drivers/gpu/drm/hisilicon/kirin/kirin-drm.o' failed
> make[6]: *** [drivers/gpu/drm/hisilicon/kirin/kirin-drm.o] Error 1
> /home/airlied/devel/kernel/drm-next/scripts/Makefile.build:440: recipe
> for target 'drivers/gpu/drm/hisilicon/kirin' fai
>
> Please fix module compilation and the above warnings and resubmit.
>
> Dave.