Merge branch 'drm-rockchip-next-2015-12-28' of https://github.com/markyzq/kernel-drm-rockchip into drm-next

Browse source

These patches convert drm/rockchip to atomic API and add rk3036 vop support.

* 'drm-rockchip-next-2015-12-28' of https://github.com/markyzq/kernel-drm-rockchip:
  dt-bindings: add document for rk3036-vop
  drm/rockchip: vop: add rk3036 vop support
  drm/rockchip: vop: spilt scale regsters
  drm/rockchip: vop: spilt register related into rockchip_reg_vop.c
  drm/rockchip: vop: move interrupt registers into vop_data
  drm/rockchip: vop: merge vop cfg_done into vop_data
  drm/rockchip: dw_hdmi: use encoder enable function
  drm: bridge/dw_hdmi: add atomic API support
  drm/rockchip: direct config connecter gate and out_mode
  drm/rockchip: support atomic asynchronous commit
  drm/rockchip: Optimization vop mode set
  drm/rockchip: Convert to support atomic API
  drm/rockchip: vop: replace dpms with enable/disable
  drm/rockchip: Use new vblank api drm_crtc_vblank_*

...

This commit is contained in:

Dave Airlie 2015-12-30 07:18:12 +10:00

parent 20f8e032e6 d4d3c6cbc2

commit df83690ec2

11 changed files with 1191 additions and 922 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

Documentation/devicetree/bindings/display/rockchip/rockchip-vop.txt

View file

23

drivers/gpu/drm/bridge/dw-hdmi.c

View file

3

drivers/gpu/drm/rockchip/Makefile

View file

14

drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c

View file

21

drivers/gpu/drm/rockchip/rockchip_drm_drv.c

View file

20

drivers/gpu/drm/rockchip/rockchip_drm_drv.h

View file

123

drivers/gpu/drm/rockchip/rockchip_drm_fb.c

View file

1221

drivers/gpu/drm/rockchip/rockchip_drm_vop.c

View file

230

drivers/gpu/drm/rockchip/rockchip_drm_vop.h

View file

316

drivers/gpu/drm/rockchip/rockchip_vop_reg.c

View file

169

drivers/gpu/drm/rockchip/rockchip_vop_reg.h

View file