topic/drm-misc
Hi Dave,
More misc stuff all over:
- best_encoder cleanup from Boris.
- drm_simple_display_pipe helpers from Noralf. Looks really neat imo, and there's 2-3 in-flight drivers which look like they could/should use it. Anyway, with this we have now helpers and everything in place to write drivers for simple hw with fewer complexity in the driver than what fbdev would need. That was the last complaint I've heard from embedded folks after we made atomic happen. Mission accomplished!
- nonblocking commit helpers for atomic, plus a bunch of driver patches for that.
- Prep patch from Laurent for cleaned up pixel format functions.
- More of Gustavo's cleanup for drm vblank functions.
- and a few oddball things in between
Plus the merge of docs-next to prep the docbook->sphinx conversion as discussed. Jon cc'ed as fyi.
A bit much for -misc, but I also thinks that's it with bigger core stuff for 4.8, it should all be much calmer. Only things outstanding:
- Thierry is working on a small series to make delayed fbdev setup (to handle armsoc init ordering fun with componentized drivers better) generic, and nuke the driver copypasta.
- Laurent has some pixel format cleanup, not sure when that'll be ready, but also small.
- fences for atomic, but looks like the userspace (hwc) is a hold-up because google doesn't want to release it early. oh well. Maybe a bit more prep work from Gustavo in that area ...
Oh and this pull contains one patch committed by Thierry, we're starting to play around with group maintainership and what makes sense and what not. If it does make sense, then longer-term I think we'll create a new drm-misc.git for it.
Cheers, Daniel
The following changes since commit 3c85f20a289d044f303f473ee6ab7502303fc3b0:
Merge tag 'omapdrm-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-next (2016-06-09 12:20:11 +1000)
are available in the git repository at:
git://anongit.freedesktop.org/drm-intel tags/topic/drm-misc-2016-06-14
for you to fetch changes up to 0d841ac0ec213f70ab59d65129e80f229846fadf:
drm/virtio: Don't reinvent a flipping wheel (2016-06-14 16:32:47 +0200)
----------------------------------------------------------------
Boris Brezillon (19):
drm: mediatek: Rely on the default ->best_encoder() behavior
drm: msm: Rely on the default ->best_encoder() behavior where appropriate
drm: sti: Rely on the default ->best_encoder() behavior
drm: arc: Rely on the default ->best_encoder() behavior
drm: atmel-hlcdc: Rely on the default ->best_encoder() behavior
drm: exynos: Rely on the default ->best_encoder() behavior
drm: fsl-dcu: Rely on the default ->best_encoder() behavior
drm: rcar-du: Rely on the default ->best_encoder() behavior
drm: rockchip: Rely on the default ->best_encoder() behavior
drm: sun4i: Rely on the default ->best_encoder() behavior
drm: tegra: Rely on the default ->best_encoder() behavior
drm: vc4: Rely on the default ->best_encoder() behavior
drm: virtgpu: Rely on the default ->best_encoder() behavior
drm: omap: Rely on the default ->best_encoder() behavior
drm/bridge: anx78xx: Rely on the default ->best_encoder() behavior
drm/bridge: ptn3460: Rely on the default ->best_encoder() behavior
drm/bridge: ps8622: Rely on the default ->best_encoder() behavior
drm/bridge: dw-hdmi: Use drm_atomic_helper_best_encoder()
drm: i915: Rely on the default ->best_encoder() behavior where appropriateBrian Norris (1):
drm/rockchip: fix compile warnings for 64-bit
Daniel Vetter (19):
drm/atomic-helper: Annotate a bunch more RETURNS: sections
drm: Replace fb_helper->atomic with mode_config->atomic_commit drm/arc: Nuke event_list
drm/fsl-du: Implement some semblance of vblank event handling drm/hisilicon: Implement some semblance of vblank event handling drm/atomic: kerneldoc for drm_atomic_crtc_needs_modeset drm/atomic-helper: Massage swap_state signature somewhat drm/arc: Actually bother with handling atomic events. drm/sun4i: Implement some semblance of vblank event handling drm/atomic: Add struct drm_crtc_commit to track async updates drm/atomic-helper: roll out commit synchronization drm/atomic-helper: nonblocking commit support drm/arc: Implement nonblocking commit correctly drm/hdlcd: Use helper support for nonblocking commits drm/rockchip: Disarm vop->is_enabled
drm/rockchip: Fix crtc_state->event signalling drm/rockchip: convert to helper nonblocking atomic commit drm/rockchip: Nuke pending event handling in preclose drm/virtio: Don't reinvent a flipping wheel
Gustavo Padovan (9):
drm/nouveau: replace legacy vblank helpers
drm: remove legacy drm_send_vblank_event()
drm: remove legacy drm_arm_vblank_event()
drm: make drm_vblank_{get,put}() static drm/amdgpu: use drm_crtc_vblank_{on,off}() drm/radeon: use drm_crtc_vblank_{on,off}() drm/amdgpu: use crtc directly in drm_crtc_vblank_put() drm/radeon: use crtc directly in drm_crtc_vblank_put() drm/gma500: use drm_crtc_vblank_{on,off}()
Laurent Pinchart (1):
drm: Move format-related helpers to drm_fourcc.c
Liviu Dudau (1):
drm: Fix comment making reference to non-existing function
Lukas Wunner (1):
drm: Remove dev_pm_ops from drm_class
Noralf Trønnes (1):
drm: Add helper for simple display pipeline
Rob Clark (1):
drm/prime: fix error path deadlock fail
Sudip Mukherjee (1):
drm: fb: cma: fix memory leak
Thierry Reding (1):
drm/dsi: Add uevent callback
Tobias Jakobi (1):
drm/exynos: use logical AND in exynos_drm_plane_check_size()
Tomeu Vizoso (3):
drm/rockchip: Drop drm_driver.load/unload callbacks drm/rockchip: Use atomic PM helpers drm/rockchip: Resume DP early
Wei Yongjun (1):
drm/i915: Fix missing unlock on error in i915_ppgtt_info()
Documentation/DocBook/gpu.tmpl | 11 + drivers/gpu/drm/Makefile | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 4 +- drivers/gpu/drm/arc/arcpgu.h | 1 - drivers/gpu/drm/arc/arcpgu_crtc.c | 16 +- drivers/gpu/drm/arc/arcpgu_drv.c | 27 +- drivers/gpu/drm/arc/arcpgu_hdmi.c | 18 - drivers/gpu/drm/arm/hdlcd_drv.c | 8 +- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 +- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 12 - drivers/gpu/drm/bridge/analogix-anx78xx.c | 8 - drivers/gpu/drm/bridge/dw-hdmi.c | 11 +- drivers/gpu/drm/bridge/nxp-ptn3460.c | 8 - drivers/gpu/drm/bridge/parade-ps8622.c | 10 - drivers/gpu/drm/drm_atomic.c | 22 + drivers/gpu/drm/drm_atomic_helper.c | 493 +++++++++++++++++++-- drivers/gpu/drm/drm_crtc.c | 292 +----------- drivers/gpu/drm/drm_drv.c | 2 - drivers/gpu/drm/drm_fb_cma_helper.c | 1 + drivers/gpu/drm/drm_fb_helper.c | 6 +- drivers/gpu/drm/drm_fops.c | 6 + drivers/gpu/drm/drm_fourcc.c | 320 +++++++++++++ drivers/gpu/drm/drm_irq.c | 80 +--- drivers/gpu/drm/drm_mipi_dsi.c | 16 + drivers/gpu/drm/drm_prime.c | 10 +- drivers/gpu/drm/drm_simple_kms_helper.c | 205 +++++++++ drivers/gpu/drm/drm_sysfs.c | 71 --- drivers/gpu/drm/exynos/exynos_drm_dpi.c | 9 - drivers/gpu/drm/exynos/exynos_drm_drv.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 9 - drivers/gpu/drm/exynos/exynos_drm_plane.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 8 - drivers/gpu/drm/exynos/exynos_hdmi.c | 8 - drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 23 +- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 9 - drivers/gpu/drm/gma500/gma_display.c | 2 +- drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 20 +- drivers/gpu/drm/i915/i915_debugfs.c | 4 +- drivers/gpu/drm/i915/intel_crt.c | 1 - drivers/gpu/drm/i915/intel_display.c | 10 +- drivers/gpu/drm/i915/intel_dp.c | 1 - drivers/gpu/drm/i915/intel_drv.h | 1 - drivers/gpu/drm/i915/intel_dsi.c | 1 - drivers/gpu/drm/i915/intel_dvo.c | 1 - drivers/gpu/drm/i915/intel_fbdev.c | 2 - drivers/gpu/drm/i915/intel_hdmi.c | 1 - drivers/gpu/drm/i915/intel_lvds.c | 1 - drivers/gpu/drm/i915/intel_sdvo.c | 1 - drivers/gpu/drm/i915/intel_tv.c | 1 - drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +- drivers/gpu/drm/mediatek/mtk_dsi.c | 9 - drivers/gpu/drm/msm/edp/edp_connector.c | 10 - drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 8 - drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c | 9 - drivers/gpu/drm/msm/msm_atomic.c | 2 +- drivers/gpu/drm/nouveau/nouveau_display.c | 22 +- drivers/gpu/drm/nouveau/nouveau_display.h | 3 +- drivers/gpu/drm/omapdrm/omap_connector.c | 10 - drivers/gpu/drm/omapdrm/omap_drv.c | 2 +- drivers/gpu/drm/radeon/atombios_crtc.c | 4 +- drivers/gpu/drm/radeon/radeon_display.c | 2 +- drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 4 +- drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 12 - drivers/gpu/drm/rcar-du/rcar_du_encoder.h | 3 - drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c | 1 - drivers/gpu/drm/rcar-du/rcar_du_kms.c | 2 +- drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 1 - drivers/gpu/drm/rcar-du/rcar_du_vgacon.c | 3 - drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 15 +- drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 9 - drivers/gpu/drm/rockchip/inno_hdmi.c | 9 - drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 194 +++----- drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 12 +- drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 72 +-- drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 5 +- drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 2 +- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 68 +-- drivers/gpu/drm/sti/sti_drv.c | 2 +- drivers/gpu/drm/sti/sti_dvo.c | 10 - drivers/gpu/drm/sti/sti_hda.c | 10 - drivers/gpu/drm/sti/sti_hdmi.c | 10 - drivers/gpu/drm/sun4i/sun4i_crtc.c | 12 + drivers/gpu/drm/sun4i/sun4i_rgb.c | 10 - drivers/gpu/drm/sun4i/sun4i_tv.c | 9 - drivers/gpu/drm/tegra/drm.c | 2 +- drivers/gpu/drm/tegra/drm.h | 2 - drivers/gpu/drm/tegra/dsi.c | 1 - drivers/gpu/drm/tegra/hdmi.c | 1 - drivers/gpu/drm/tegra/output.c | 8 - drivers/gpu/drm/tegra/rgb.c | 1 - drivers/gpu/drm/tegra/sor.c | 1 - drivers/gpu/drm/vc4/vc4_dpi.c | 9 - drivers/gpu/drm/vc4/vc4_hdmi.c | 9 - drivers/gpu/drm/vc4/vc4_kms.c | 2 +- drivers/gpu/drm/virtio/virtgpu_display.c | 81 +--- include/drm/drmP.h | 10 +- include/drm/drm_atomic.h | 16 + include/drm/drm_atomic_helper.h | 14 +- include/drm/drm_crtc.h | 161 ++++++- include/drm/drm_fb_helper.h | 11 - include/drm/drm_fourcc.h | 37 ++ include/drm/drm_mipi_dsi.h | 2 + include/drm/drm_modeset_helper_vtables.h | 39 ++ include/drm/drm_simple_kms_helper.h | 94 ++++ 107 files changed, 1609 insertions(+), 1242 deletions(-) create mode 100644 drivers/gpu/drm/drm_fourcc.c create mode 100644 drivers/gpu/drm/drm_simple_kms_helper.c create mode 100644 include/drm/drm_fourcc.h create mode 100644 include/drm/drm_simple_kms_helper.h
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 30 lines · Daniel Vetter
Hi Dave,
More misc stuff all over:
-best_encodercleanup from Boris.
-drm_simple_display_pipehelpers from Noralf. Looks really neat imo, and there's 2-3 in-flight drivers which look like they could/should use it. Anyway, with this we have now helpers and everything in place to write drivers for simple hw with fewer complexity in the driver than what fbdev would need. That was the last complaint I've heard from embedded folks after we made atomic happen. Mission accomplished!
- nonblocking commit helpers for atomic, plus a bunch of driver patches for that.
- Prep patch from Laurent for cleaned up pixel format functions.
- More of Gustavo's cleanup for drm vblank functions.
- and a few oddball things in betweenPlus the merge of docs-next to prep the
docbook->sphinxconversion as discussed. Jon cc'ed as fyi.A bit much for -misc, but I also thinks that's it with bigger core stuff for 4.8, it should all be much calmer. Only things outstanding:
- Thierry is working on a small series to make delayed fbdev setup (to handle armsoc init ordering fun with componentized drivers better) generic, and nuke the driver copypasta.
- Laurent has some pixel format cleanup, not sure when that'll be ready, but also small.
- fences for atomic, but looks like the userspace (hwc) is a hold-up because google doesn't want to release it early. oh well. Maybe a bit more prep work from Gustavo in that area ...
Quoted 4 lines
Oh and this pull contains one patch committed by Thierry, we're starting to play around with group maintainership and what makes sense and what not. If it does make sense, then longer-term I think we'll create a new drm-misc.git for it.
Argh, just realized that I tagged this before the docs-next merge. Will regenrate the pull request since I'd like that included. -Daniel
Quoted 222 lines
Cheers, Daniel
The following changes since commit
3c85f20a289d044f303f473ee6ab7502303fc3b0:Merge tag 'omapdrm-4.8' of
git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linuxinto drm-next (2016-06-09 12:20:11 +1000)are available in the git repository at:
git://anongit.freedesktop.org/drm-inteltags/topic/drm-misc-2016-06-14for you to fetch changes up to
0d841ac0ec213f70ab59d65129e80f229846fadf:drm/virtio: Don't reinvent a flipping wheel (2016-06-14 16:32:47 +0200)
----------------------------------------------------------------
Boris Brezillon (19):drm: mediatek: Rely on the default ->best_encoder() behavior drm: msm: Rely on the default ->best_encoder() behavior where appropriate drm: sti: Rely on the default ->best_encoder() behavior drm: arc: Rely on the default ->best_encoder() behavior drm: atmel-hlcdc: Rely on the default ->best_encoder() behavior drm: exynos: Rely on the default ->best_encoder() behavior drm: fsl-dcu: Rely on the default ->best_encoder() behavior drm: rcar-du: Rely on the default ->best_encoder() behavior drm: rockchip: Rely on the default ->best_encoder() behavior drm: sun4i: Rely on the default ->best_encoder() behavior drm: tegra: Rely on the default ->best_encoder() behavior drm: vc4: Rely on the default ->best_encoder() behavior drm: virtgpu: Rely on the default ->best_encoder() behavior drm: omap: Rely on the default ->best_encoder() behavior drm/bridge: anx78xx: Rely on the default ->best_encoder() behavior drm/bridge: ptn3460: Rely on the default ->best_encoder() behavior drm/bridge: ps8622: Rely on the default ->best_encoder() behavior drm/bridge: dw-hdmi: Use drm_atomic_helper_best_encoder() drm: i915: Rely on the default ->best_encoder() behavior where appropriateBrian Norris (1):
drm/rockchip: fix compile warnings for 64-bitDaniel Vetter (19):
drm/atomic-helper: Annotate a bunch more RETURNS: sections
drm: Replacefb_helper->atomicwithmode_config->atomic_commitdrm/arc: Nukeevent_list
drm/fsl-du: Implement some semblance of vblank event handling drm/hisilicon: Implement some semblance of vblank event handling drm/atomic: kerneldoc fordrm_atomic_crtc_needs_modesetdrm/atomic-helper: Massageswap_statesignature somewhat drm/arc: Actually bother with handling atomic events. drm/sun4i: Implement some semblance of vblank event handling drm/atomic: Add structdrm_crtc_committo track async updates drm/atomic-helper: roll out commit synchronization drm/atomic-helper: nonblocking commit support drm/arc: Implement nonblocking commit correctly drm/hdlcd: Use helper support for nonblocking commits drm/rockchip: Disarmvop->is_enabled
drm/rockchip: Fixcrtc_state->eventsignalling drm/rockchip: convert to helper nonblocking atomic commit drm/rockchip: Nuke pending event handling in preclose drm/virtio: Don't reinvent a flipping wheelGustavo Padovan (9):
drm/nouveau: replace legacy vblank helpers
drm: remove legacydrm_send_vblank_event()
drm: remove legacydrm_arm_vblank_event()
drm: make drm_vblank_{get,put}() static drm/amdgpu: use drm_crtc_vblank_{on,off}() drm/radeon: use drm_crtc_vblank_{on,off}() drm/amdgpu: use crtc directly indrm_crtc_vblank_put()drm/radeon: use crtc directly indrm_crtc_vblank_put()drm/gma500: use drm_crtc_vblank_{on,off}()Laurent Pinchart (1):
drm: Move format-related helpers todrm_fourcc.cLiviu Dudau (1):
drm: Fix comment making reference to non-existing functionLukas Wunner (1):
drm: Removedev_pm_opsfromdrm_classNoralf Trønnes (1):
drm: Add helper for simple display pipelineRob Clark (1):
drm/prime: fix error path deadlock failSudip Mukherjee (1):
drm: fb: cma: fix memory leakThierry Reding (1):
drm/dsi: Add uevent callbackTobias Jakobi (1):
drm/exynos: use logical AND inexynos_drm_plane_check_size()Tomeu Vizoso (3):
drm/rockchip: Drop drm_driver.load/unload callbacks drm/rockchip: Use atomic PM helpers drm/rockchip: Resume DP earlyWei Yongjun (1):
drm/i915: Fix missing unlock on error ini915_ppgtt_info()Documentation/DocBook/gpu.tmpl | 11 + drivers/gpu/drm/Makefile | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 4 +- drivers/gpu/drm/arc/arcpgu.h | 1 - drivers/gpu/drm/arc/arcpgu_crtc.c | 16 +- drivers/gpu/drm/arc/arcpgu_drv.c | 27 +- drivers/gpu/drm/arc/arcpgu_hdmi.c | 18 - drivers/gpu/drm/arm/hdlcd_drv.c | 8 +- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 +- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 12 - drivers/gpu/drm/bridge/analogix-anx78xx.c | 8 - drivers/gpu/drm/bridge/dw-hdmi.c | 11 +- drivers/gpu/drm/bridge/nxp-ptn3460.c | 8 - drivers/gpu/drm/bridge/parade-ps8622.c | 10 - drivers/gpu/drm/drm_atomic.c | 22 + drivers/gpu/drm/drm_atomic_helper.c | 493 +++++++++++++++++++-- drivers/gpu/drm/drm_crtc.c | 292 +----------- drivers/gpu/drm/drm_drv.c | 2 - drivers/gpu/drm/drm_fb_cma_helper.c | 1 + drivers/gpu/drm/drm_fb_helper.c | 6 +- drivers/gpu/drm/drm_fops.c | 6 + drivers/gpu/drm/drm_fourcc.c | 320 +++++++++++++ drivers/gpu/drm/drm_irq.c | 80 +--- drivers/gpu/drm/drm_mipi_dsi.c | 16 + drivers/gpu/drm/drm_prime.c | 10 +- drivers/gpu/drm/drm_simple_kms_helper.c | 205 +++++++++ drivers/gpu/drm/drm_sysfs.c | 71 --- drivers/gpu/drm/exynos/exynos_drm_dpi.c | 9 - drivers/gpu/drm/exynos/exynos_drm_drv.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 9 - drivers/gpu/drm/exynos/exynos_drm_plane.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 8 - drivers/gpu/drm/exynos/exynos_hdmi.c | 8 - drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 23 +- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 9 - drivers/gpu/drm/gma500/gma_display.c | 2 +- drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 20 +- drivers/gpu/drm/i915/i915_debugfs.c | 4 +- drivers/gpu/drm/i915/intel_crt.c | 1 - drivers/gpu/drm/i915/intel_display.c | 10 +- drivers/gpu/drm/i915/intel_dp.c | 1 - drivers/gpu/drm/i915/intel_drv.h | 1 - drivers/gpu/drm/i915/intel_dsi.c | 1 - drivers/gpu/drm/i915/intel_dvo.c | 1 - drivers/gpu/drm/i915/intel_fbdev.c | 2 - drivers/gpu/drm/i915/intel_hdmi.c | 1 - drivers/gpu/drm/i915/intel_lvds.c | 1 - drivers/gpu/drm/i915/intel_sdvo.c | 1 - drivers/gpu/drm/i915/intel_tv.c | 1 - drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +- drivers/gpu/drm/mediatek/mtk_dsi.c | 9 - drivers/gpu/drm/msm/edp/edp_connector.c | 10 - drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 8 - drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c | 9 - drivers/gpu/drm/msm/msm_atomic.c | 2 +- drivers/gpu/drm/nouveau/nouveau_display.c | 22 +- drivers/gpu/drm/nouveau/nouveau_display.h | 3 +- drivers/gpu/drm/omapdrm/omap_connector.c | 10 - drivers/gpu/drm/omapdrm/omap_drv.c | 2 +- drivers/gpu/drm/radeon/atombios_crtc.c | 4 +- drivers/gpu/drm/radeon/radeon_display.c | 2 +- drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 4 +- drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 12 - drivers/gpu/drm/rcar-du/rcar_du_encoder.h | 3 - drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c | 1 - drivers/gpu/drm/rcar-du/rcar_du_kms.c | 2 +- drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 1 - drivers/gpu/drm/rcar-du/rcar_du_vgacon.c | 3 - drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 15 +- drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 9 - drivers/gpu/drm/rockchip/inno_hdmi.c | 9 - drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 194 +++----- drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 12 +- drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 72 +-- drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 5 +- drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 2 +- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 68 +-- drivers/gpu/drm/sti/sti_drv.c | 2 +- drivers/gpu/drm/sti/sti_dvo.c | 10 - drivers/gpu/drm/sti/sti_hda.c | 10 - drivers/gpu/drm/sti/sti_hdmi.c | 10 - drivers/gpu/drm/sun4i/sun4i_crtc.c | 12 + drivers/gpu/drm/sun4i/sun4i_rgb.c | 10 - drivers/gpu/drm/sun4i/sun4i_tv.c | 9 - drivers/gpu/drm/tegra/drm.c | 2 +- drivers/gpu/drm/tegra/drm.h | 2 - drivers/gpu/drm/tegra/dsi.c | 1 - drivers/gpu/drm/tegra/hdmi.c | 1 - drivers/gpu/drm/tegra/output.c | 8 - drivers/gpu/drm/tegra/rgb.c | 1 - drivers/gpu/drm/tegra/sor.c | 1 - drivers/gpu/drm/vc4/vc4_dpi.c | 9 - drivers/gpu/drm/vc4/vc4_hdmi.c | 9 - drivers/gpu/drm/vc4/vc4_kms.c | 2 +- drivers/gpu/drm/virtio/virtgpu_display.c | 81 +--- include/drm/drmP.h | 10 +- include/drm/drm_atomic.h | 16 + include/drm/drm_atomic_helper.h | 14 +- include/drm/drm_crtc.h | 161 ++++++- include/drm/drm_fb_helper.h | 11 - include/drm/drm_fourcc.h | 37 ++ include/drm/drm_mipi_dsi.h | 2 + include/drm/drm_modeset_helper_vtables.h | 39 ++ include/drm/drm_simple_kms_helper.h | 94 ++++ 107 files changed, 1609 insertions(+), 1242 deletions(-) create mode 100644 drivers/gpu/drm/drm_fourcc.c create mode 100644 drivers/gpu/drm/drm_simple_kms_helper.c create mode 100644 include/drm/drm_fourcc.h create mode 100644 include/drm/drm_simple_kms_helper.hSignature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 30 lines · Daniel Vetter
Hi Dave,
More misc stuff all over:
-best_encodercleanup from Boris.
-drm_simple_display_pipehelpers from Noralf. Looks really neat imo, and there's 2-3 in-flight drivers which look like they could/should use it. Anyway, with this we have now helpers and everything in place to write drivers for simple hw with fewer complexity in the driver than what fbdev would need. That was the last complaint I've heard from embedded folks after we made atomic happen. Mission accomplished!
- nonblocking commit helpers for atomic, plus a bunch of driver patches for that.
- Prep patch from Laurent for cleaned up pixel format functions.
- More of Gustavo's cleanup for drm vblank functions.
- and a few oddball things in betweenPlus the merge of docs-next to prep the
docbook->sphinxconversion as discussed. Jon cc'ed as fyi.A bit much for -misc, but I also thinks that's it with bigger core stuff for 4.8, it should all be much calmer. Only things outstanding:
- Thierry is working on a small series to make delayed fbdev setup (to handle armsoc init ordering fun with componentized drivers better) generic, and nuke the driver copypasta.
- Laurent has some pixel format cleanup, not sure when that'll be ready, but also small.
- fences for atomic, but looks like the userspace (hwc) is a hold-up because google doesn't want to release it early. oh well. Maybe a bit more prep work from Gustavo in that area ...
Quoted 4 lines
Oh and this pull contains one patch committed by Thierry, we're starting to play around with group maintainership and what makes sense and what not. If it does make sense, then longer-term I think we'll create a new drm-misc.git for it.
Updated pull request below, actually looks correct this time around.
Cheers, Daniel
The following changes since commit 3c85f20a289d044f303f473ee6ab7502303fc3b0:
Merge tag 'omapdrm-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-next (2016-06-09 12:20:11 +1000)
are available in the git repository at:
git://anongit.freedesktop.org/drm-intel tags/topic/drm-misc-2016-06-15
for you to fetch changes up to 7deef7f1ae5d0bf98c1ec9eb4bc87b29478c2adb:
drm/atomic-helpers: Clear up cleanup_done a bit (2016-06-15 17:25:36 +0200)
----------------------------------------------------------------
Andy Deng (1):
Documentation/zh_CN: update Chinese version CodingStyle
Boris Brezillon (19):
drm: mediatek: Rely on the default ->best_encoder() behavior
drm: msm: Rely on the default ->best_encoder() behavior where appropriate
drm: sti: Rely on the default ->best_encoder() behavior
drm: arc: Rely on the default ->best_encoder() behavior
drm: atmel-hlcdc: Rely on the default ->best_encoder() behavior
drm: exynos: Rely on the default ->best_encoder() behavior
drm: fsl-dcu: Rely on the default ->best_encoder() behavior
drm: rcar-du: Rely on the default ->best_encoder() behavior
drm: rockchip: Rely on the default ->best_encoder() behavior
drm: sun4i: Rely on the default ->best_encoder() behavior
drm: tegra: Rely on the default ->best_encoder() behavior
drm: vc4: Rely on the default ->best_encoder() behavior
drm: virtgpu: Rely on the default ->best_encoder() behavior
drm: omap: Rely on the default ->best_encoder() behavior
drm/bridge: anx78xx: Rely on the default ->best_encoder() behavior
drm/bridge: ptn3460: Rely on the default ->best_encoder() behavior
drm/bridge: ps8622: Rely on the default ->best_encoder() behavior
drm/bridge: dw-hdmi: Use drm_atomic_helper_best_encoder()
drm: i915: Rely on the default ->best_encoder() behavior where appropriateBrian Norris (2):
doc: clarify that trace_events= takes a comma-separated list drm/rockchip: fix compile warnings for 64-bit
Daniel Vetter (28):
doc/sphinx: Pass right filename as source scripts/kernel-doc: Remove duplicated DOC: start handling doc/sphinx: Stop touching state_machine internals scripts/kernel-doc: Also give functions symbolic names scripts/kernel-doc: Add option to inject line numbers doc/sphinx: Track line-number of starting blocks drm/atomic-helper: Annotate a bunch more RETURNS: sections
drm: Replace fb_helper->atomic with mode_config->atomic_commit drm/arc: Nuke event_list
drm/fsl-du: Implement some semblance of vblank event handling drm/hisilicon: Implement some semblance of vblank event handling drm/atomic: kerneldoc for drm_atomic_crtc_needs_modeset drm/atomic-helper: Massage swap_state signature somewhat drm/arc: Actually bother with handling atomic events. drm/sun4i: Implement some semblance of vblank event handling drm/atomic: Add struct drm_crtc_commit to track async updates drm/atomic-helper: roll out commit synchronization drm/atomic-helper: nonblocking commit support
drm/arc: Implement nonblocking commit correctly drm/hdlcd: Use helper support for nonblocking commits drm/rockchip: Disarm vop->is_enabled
drm/rockchip: Fix crtc_state->event signalling drm/rockchip: convert to helper nonblocking atomic commit drm/rockchip: Nuke pending event handling in preclose drm/virtio: Don't reinvent a flipping wheel
Merge tag 'sphinx-4.8' of git://git.lwn.net/linux into topic/drm-misc drm/atomic-helpers: Stall on the right commit drm/atomic-helpers: Clear up cleanup_done a bit
Gustavo Padovan (9):
drm/nouveau: replace legacy vblank helpers
drm: remove legacy drm_send_vblank_event()
drm: remove legacy drm_arm_vblank_event()
drm: make drm_vblank_{get,put}() static drm/amdgpu: use drm_crtc_vblank_{on,off}() drm/radeon: use drm_crtc_vblank_{on,off}() drm/amdgpu: use crtc directly in drm_crtc_vblank_put() drm/radeon: use crtc directly in drm_crtc_vblank_put() drm/gma500: use drm_crtc_vblank_{on,off}()
Jani Nikula (31):
kernel-doc/rst: fix use of uninitialized value
kernel-doc: support printing exported and non-exported symbols Documentation/sphinx: add basic working Sphinx configuration and build
Documentation: add .gitignore
Documentation/sphinx: add Sphinx kernel-doc directive extension Documentation/sphinx: configure the kernel-doc extension Documentation/sphinx: set version and release properly
sphinx: update docbook->rst conversion script match C domain spec Documentation/sphinx: nicer referencing of struct in docbook->rst conversion
kernel-doc: add names for states and substates
kernel-doc: add names for output selection
kernel-doc/rst: do not output DOC: section titles for requested ones kernel-doc/rst: reference functions according to C domain spec kernel-doc/rst: &foo references are more universal than structs kernel-doc/rst: add support for &union foo and &typedef foo references kernel-doc/rst: add support for struct/union/enum member references kernel-doc/rst: drop redundant unescape in highlighting kernel-doc/rst: highlight function/struct/enum purpose lines too
kernel-doc: do not regard $, %, or & prefixes as special in section names
kernel-doc: fix wrong code indentation
kernel-doc/rst: blank lines in output are not needed
kernel-doc: strip leading blank lines from inline doc comments kernel-doc/rst: change the output layout
kernel-doc: improve handling of whitespace on the first line param description
kernel-doc: strip leading whitespace from continued param descs kernel-doc/rst: use *undescribed* instead of _undescribed_ kernel-doc/rst: remove fixme comment
kernel-doc: limit the "section header:" detection to a select few
kernel-doc: concatenate contents of colliding sections
kernel-doc: reset contents and section harder Documentation/sphinx: fix kernel-doc extension on python3
Javier Martinez Canillas (1):
Documentation: Fix some grammar mistakes in sync_file.txt
Jonathan Corbet (3):
sphinx: cheesy script to convert .tmpl files
Merge branch 'sphinx-for-docs-next' into doc/4.8
docs: kernel-doc: Add "example" and "note" to the magic section types
Kees Cook (1):
docs: self-protection: rename "leak" to "exposure"
Laurent Pinchart (1):
drm: Move format-related helpers to drm_fourcc.c
Liviu Dudau (1):
drm: Fix comment making reference to non-existing function
Lukas Wunner (1):
drm: Remove dev_pm_ops from drm_class
Mike Danese (1):
mpssd: fix buffer overflow warning
Niklas Söderlund (1):
Documentation: dmaengine: fix typo for device_resume
Noralf Trønnes (1):
drm: Add helper for simple display pipeline
Paul Bolle (1):
drm/vmwgfx: use *_32_bits() macros
Rob Clark (1):
drm/prime: fix error path deadlock fail
Sudip Mukherjee (1):
drm: fb: cma: fix memory leak
Thierry Reding (1):
drm/dsi: Add uevent callback
Tobias Jakobi (1):
drm/exynos: use logical AND in exynos_drm_plane_check_size()
Tomeu Vizoso (3):
drm/rockchip: Drop drm_driver.load/unload callbacks drm/rockchip: Use atomic PM helpers drm/rockchip: Resume DP early
Wei Yongjun (1):
drm/i915: Fix missing unlock on error in i915_ppgtt_info()
Documentation/.gitignore | 1 + Documentation/DocBook/Makefile | 7 +- Documentation/DocBook/gpu.tmpl | 11 + Documentation/Makefile.sphinx | 63 +++ Documentation/conf.py | 414 +++++++++++++++ Documentation/dmaengine/provider.txt | 2 +- Documentation/index.rst | 23 + Documentation/kernel-parameters.txt | 5 +- Documentation/mic/mpssd/mpssd.c | 4 +- Documentation/security/self-protection.txt | 28 +- Documentation/sphinx/convert_template.sed | 18 + Documentation/sphinx/kernel-doc.py | 127 +++++ Documentation/sphinx/post_convert.sed | 23 + Documentation/sphinx/tmplcvt | 19 + Documentation/sync_file.txt | 6 +- Documentation/zh_CN/CodingStyle | 581 +++++++++++++-------- Makefile | 5 +- drivers/gpu/drm/Makefile | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 4 +- drivers/gpu/drm/arc/arcpgu.h | 1 - drivers/gpu/drm/arc/arcpgu_crtc.c | 16 +- drivers/gpu/drm/arc/arcpgu_drv.c | 27 +- drivers/gpu/drm/arc/arcpgu_hdmi.c | 18 - drivers/gpu/drm/arm/hdlcd_drv.c | 8 +- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 +- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 12 - drivers/gpu/drm/bridge/analogix-anx78xx.c | 8 - drivers/gpu/drm/bridge/dw-hdmi.c | 11 +- drivers/gpu/drm/bridge/nxp-ptn3460.c | 8 - drivers/gpu/drm/bridge/parade-ps8622.c | 10 - drivers/gpu/drm/drm_atomic.c | 22 + drivers/gpu/drm/drm_atomic_helper.c | 491 +++++++++++++++-- drivers/gpu/drm/drm_crtc.c | 292 +---------- drivers/gpu/drm/drm_drv.c | 2 - drivers/gpu/drm/drm_fb_cma_helper.c | 1 + drivers/gpu/drm/drm_fb_helper.c | 6 +- drivers/gpu/drm/drm_fops.c | 6 + drivers/gpu/drm/drm_fourcc.c | 320 ++++++++++++ drivers/gpu/drm/drm_irq.c | 80 +-- drivers/gpu/drm/drm_mipi_dsi.c | 16 + drivers/gpu/drm/drm_prime.c | 10 +- drivers/gpu/drm/drm_simple_kms_helper.c | 205 ++++++++ drivers/gpu/drm/drm_sysfs.c | 71 --- drivers/gpu/drm/exynos/exynos_drm_dpi.c | 9 - drivers/gpu/drm/exynos/exynos_drm_drv.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 9 - drivers/gpu/drm/exynos/exynos_drm_plane.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 8 - drivers/gpu/drm/exynos/exynos_hdmi.c | 8 - drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 23 +- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 9 - drivers/gpu/drm/gma500/gma_display.c | 2 +- drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 20 +- drivers/gpu/drm/i915/i915_debugfs.c | 4 +- drivers/gpu/drm/i915/intel_crt.c | 1 - drivers/gpu/drm/i915/intel_display.c | 10 +- drivers/gpu/drm/i915/intel_dp.c | 1 - drivers/gpu/drm/i915/intel_drv.h | 1 - drivers/gpu/drm/i915/intel_dsi.c | 1 - drivers/gpu/drm/i915/intel_dvo.c | 1 - drivers/gpu/drm/i915/intel_fbdev.c | 2 - drivers/gpu/drm/i915/intel_hdmi.c | 1 - drivers/gpu/drm/i915/intel_lvds.c | 1 - drivers/gpu/drm/i915/intel_sdvo.c | 1 - drivers/gpu/drm/i915/intel_tv.c | 1 - drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +- drivers/gpu/drm/mediatek/mtk_dsi.c | 9 - drivers/gpu/drm/msm/edp/edp_connector.c | 10 - drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 8 - drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c | 9 - drivers/gpu/drm/msm/msm_atomic.c | 2 +- drivers/gpu/drm/nouveau/nouveau_display.c | 22 +- drivers/gpu/drm/nouveau/nouveau_display.h | 3 +- drivers/gpu/drm/omapdrm/omap_connector.c | 10 - drivers/gpu/drm/omapdrm/omap_drv.c | 2 +- drivers/gpu/drm/radeon/atombios_crtc.c | 4 +- drivers/gpu/drm/radeon/radeon_display.c | 2 +- drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 4 +- drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 12 - drivers/gpu/drm/rcar-du/rcar_du_encoder.h | 3 - drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c | 1 - drivers/gpu/drm/rcar-du/rcar_du_kms.c | 2 +- drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 1 - drivers/gpu/drm/rcar-du/rcar_du_vgacon.c | 3 - drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 15 +- drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 9 - drivers/gpu/drm/rockchip/inno_hdmi.c | 9 - drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 194 +++---- drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 12 +- drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 72 +-- drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 5 +- drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 2 +- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 68 +-- drivers/gpu/drm/sti/sti_drv.c | 2 +- drivers/gpu/drm/sti/sti_dvo.c | 10 - drivers/gpu/drm/sti/sti_hda.c | 10 - drivers/gpu/drm/sti/sti_hdmi.c | 10 - drivers/gpu/drm/sun4i/sun4i_crtc.c | 12 + drivers/gpu/drm/sun4i/sun4i_rgb.c | 10 - drivers/gpu/drm/sun4i/sun4i_tv.c | 9 - drivers/gpu/drm/tegra/drm.c | 2 +- drivers/gpu/drm/tegra/drm.h | 2 - drivers/gpu/drm/tegra/dsi.c | 1 - drivers/gpu/drm/tegra/hdmi.c | 1 - drivers/gpu/drm/tegra/output.c | 8 - drivers/gpu/drm/tegra/rgb.c | 1 - drivers/gpu/drm/tegra/sor.c | 1 - drivers/gpu/drm/vc4/vc4_dpi.c | 9 - drivers/gpu/drm/vc4/vc4_hdmi.c | 9 - drivers/gpu/drm/vc4/vc4_kms.c | 2 +- drivers/gpu/drm/virtio/virtgpu_display.c | 81 +-- drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 7 +- include/drm/drmP.h | 10 +- include/drm/drm_atomic.h | 16 + include/drm/drm_atomic_helper.h | 14 +- include/drm/drm_crtc.h | 161 +++++- include/drm/drm_fb_helper.h | 11 - include/drm/drm_fourcc.h | 37 ++ include/drm/drm_mipi_dsi.h | 2 + include/drm/drm_modeset_helper_vtables.h | 39 ++ include/drm/drm_simple_kms_helper.h | 94 ++++ scripts/kernel-doc | 393 +++++++++----- 125 files changed, 2935 insertions(+), 1640 deletions(-) create mode 100644 Documentation/.gitignore create mode 100644 Documentation/Makefile.sphinx create mode 100644 Documentation/conf.py create mode 100644 Documentation/index.rst create mode 100644 Documentation/sphinx/convert_template.sed create mode 100644 Documentation/sphinx/kernel-doc.py create mode 100644 Documentation/sphinx/post_convert.sed create mode 100755 Documentation/sphinx/tmplcvt create mode 100644 drivers/gpu/drm/drm_fourcc.c create mode 100644 drivers/gpu/drm/drm_simple_kms_helper.c create mode 100644 include/drm/drm_fourcc.h create mode 100644 include/drm/drm_simple_kms_helper.h
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx