topic/drm-misc
Hi Dave,
Again a pile of things all over
- Conversion to rst from docbook from Jani. Looks real pretty, and the source is now actually readable (compared to horrible, horrible docbook xml)! https://01.org/linuxgraphics/gfx-docs/drm/
- device register/unregister rework from Chris, with follow-up work from Benjamin. Allows more drivers to demidlayer load/unload and others to remove a bit of boilerplate.
- master/auth related cleanup, with docs
- some dma-buf polish, merged by Sumit
- small stuff all over (like build fixes from Arnd)
Group maintainership seems to slowly take off, with both Thierry and Sumit pushing a few things. No hiccups thus far.
I'll be on vacation starting this Fri for two weeks, so pls take a look right away in case I need to fix up something. Thierry agreed to merge the oddball patches and if needed also try to send a pull request. So all covered. Pending stuff:
- delayed fbdev init from Thierry
- pixel format rework from Laurent
- zpos from Benjamin
There's a small conflict with the arm tree and Benjamin's sti init rework.
I'd also like to backmerge this to drm-intel before I head off, so that Chris can move the i915 demidlayering forward.
Cheers, Daniel
The following changes since commit a0877f52035280370707bdefeddc6faa6478b892:
Merge tag 'topic/drm-misc-2016-06-15' of git://anongit.freedesktop.org/drm-intel into drm-next (2016-06-16 05:49:32 +1000)
are available in the git repository at:
git://anongit.freedesktop.org/drm-intel tags/topic/drm-misc-2016-06-22
for you to fetch changes up to fa7d81bb3c269a2ee38b6e4d569d9eb8be1a78ad:
drm/fb-helper: Reduce READ_ONCE(master) to lockless_dereference (2016-06-22 10:07:28 +0200)
----------------------------------------------------------------
Arnd Bergmann (2):
drm: rockchip: select DRM_GEM_CMA_HELPER
drm/mediatek: Remove IOMMU_DMA select
Benjamin Gaignard (3):
drm: Add callbacks for late registering
drm: sti: use late_register and early_unregister callbacks
drm: sti: rework init sequence
Chris Wilson (22):
drm: Export drm_dev_init() for subclassing
drm: Add a callback from connector registering
drm: Make drm_connector_register() safe against multiple calls
drm: Automatically unregister the connector during cleanup
drm: Pass the drm_dp_aux->hw_mutex to i2c for its locking
drm: Minimally initialise drm_dp_aux
drm: Automatically register/unregister all connectors
drm: Protect drm_connector_register_all() under DRIVER_MODESET drm/i915: Move intel_connector->unregister to connector->early_unregister drm/i915: Move backlight unregistration to connector unregistration drm/i915: Avoid use-after-free of intel_encoder in intel_dp_connector_destrpy
drm: Prevent NULL deref in drm_name_info()
drm/arc: Remove redundant calls to drm_connector_register_all() drm/atmel-hlcdc: Remove redundant calls to drm_connector_register_all() drm/hisilicon: Remove redundant calls to drm_connector_register_all() drm/mediatek: Remove redundant calls to drm_connector_register_all() drm/msm: Remove redundant calls to drm_connector_register_all() drm/rcar-du: Remove redundant calls to drm_connector_register_all() drm/atmel-hlcdc: Remove redundant call to drm_connector_unregister_all() drm/vc4: Remove open-coded drm_connector_register_all() drm/sun4i: Remove open-coded drm_connector_register_all() drm/fb-helper: Reduce READ_ONCE(master) to lockless_dereference
Daniel Vetter (26):
drm: Nuke legacy maps debugfs files
drm: Hide hw.lock cleanup in filp->release better
drm: Link directly from drm_master to drm_device
drm: Move master functions into drm_auth.c
drm: Extract drm_master_open
drm: Extract drm_master_relase
drm/sti: Don't call drm_helper_disable_unused_functions
drm: Only do the hw.lock cleanup in master_relase for !MODESET
drm: Move authmagic cleanup into drm_master_release
drm: Protect authmagic with master_mutex
drm: Mark authmagic ioctls as unlocked
drm: Mark set/drop master ioctl as unlocked. drm/omapdrm: don't call drm_helper_disable_unused_functions drm/crtc-helper: disable_unused_functions really isn't for atomic drm/amdkfd: Clean up inline handling
drm: Move master pointer from drm_minor to drm_device
drm: Clean up drm_crtc.h
drm: Use dev->name as fallback for dev->unique drm/vgem: Stop calling drm_drv_set_unique
drm: Don't call drm_dev_set_unique from platform drivers
drm: Nuke SET_UNIQUE ioctl
drm: Lobotomize set_busid nonsense for !pci drivers
drm: Refactor drop/set master code a bit
drm: Extract drm_is_current_master
drm: Clear up master tracking booleans
drm: document drm_auth.c
Jani Nikula (7):
Documentation/gpu: add new gpu.rst converted from DocBook gpu.tmpl Documentation/gpu: split up the gpu documentation
MAINTAINERS: add Documentation/gpu and Documentation/gpu/i915.rst Documentation/gpu: use recommended order of heading markers Documentation/gpu: convert the KMS properties table to CSV Documentation/gpu: split up mm, kms and kms-helpers from internals Documentation/DocBook: remove gpu.tmpl
Mathias Krause (3):
dma-buf: propagate errors from dma_buf_describe() on debugfs read
dma-buf: remove dma_buf directory on bufinfo file creation errors
dma-buf: remove dma_buf_debugfs_create_file()
Matthew Auld (1):
drm: fix send_vblank_event use-after-free error
Stefan Agner (1):
drm/fsl-dcu: use drm_mode_config_cleanup on initialization errors
Tomasz Figa (1):
drm/rockchip: Finish initialization before registering DRM device
Ville Syrjälä (1):
drm: Deal with rotation in drm_plane_helper_check_update()
Documentation/DocBook/Makefile | 2 +- Documentation/DocBook/gpu.tmpl | 3528 -------------------- Documentation/gpu/drm-internals.rst | 378 +++ Documentation/gpu/drm-kms-helpers.rst | 260 ++ Documentation/gpu/drm-kms.rst | 656 ++++ Documentation/gpu/drm-mm.rst | 454 +++ Documentation/gpu/drm-uapi.rst | 111 + Documentation/gpu/i915.rst | 347 ++ Documentation/gpu/index.rst | 14 + Documentation/gpu/introduction.rst | 51 + Documentation/gpu/kms-properties.csv | 128 + Documentation/gpu/vga-switcheroo.rst | 102 + Documentation/index.rst | 1 + MAINTAINERS | 3 +- drivers/dma-buf/dma-buf.c | 44 +- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 4 +- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 3 - drivers/gpu/drm/arc/arcpgu_drv.c | 8 - drivers/gpu/drm/armada/armada_drv.c | 1 - drivers/gpu/drm/armada/armada_overlay.c | 1 + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 15 - drivers/gpu/drm/drm_auth.c | 285 +- drivers/gpu/drm/drm_bufs.c | 8 +- drivers/gpu/drm/drm_crtc.c | 164 +- drivers/gpu/drm/drm_crtc_helper.c | 3 + drivers/gpu/drm/drm_crtc_internal.h | 88 +- drivers/gpu/drm/drm_debugfs.c | 3 - drivers/gpu/drm/drm_dp_helper.c | 56 +- drivers/gpu/drm/drm_drv.c | 239 +- drivers/gpu/drm/drm_fb_helper.c | 2 +- drivers/gpu/drm/drm_fops.c | 125 +- drivers/gpu/drm/drm_info.c | 117 +- drivers/gpu/drm/drm_internal.h | 21 +- drivers/gpu/drm/drm_ioctl.c | 124 +- drivers/gpu/drm/drm_irq.c | 4 +- drivers/gpu/drm/drm_legacy.h | 8 +- drivers/gpu/drm/drm_lock.c | 240 +- drivers/gpu/drm/drm_pci.c | 51 - drivers/gpu/drm/drm_plane_helper.c | 28 +- drivers/gpu/drm/drm_platform.c | 18 - drivers/gpu/drm/drm_simple_kms_helper.c | 1 + drivers/gpu/drm/drm_vm.c | 54 - drivers/gpu/drm/etnaviv/etnaviv_drv.c | 1 - drivers/gpu/drm/exynos/exynos_drm_drv.c | 1 - drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_kms.c | 13 +- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 9 - drivers/gpu/drm/i915/i915_drv.h | 3 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 4 +- drivers/gpu/drm/i915/intel_crt.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 15 +- drivers/gpu/drm/i915/intel_dp.c | 22 +- drivers/gpu/drm/i915/intel_dp_mst.c | 4 +- drivers/gpu/drm/i915/intel_drv.h | 17 +- drivers/gpu/drm/i915/intel_dsi.c | 2 +- drivers/gpu/drm/i915/intel_dvo.c | 2 +- drivers/gpu/drm/i915/intel_hdmi.c | 2 +- drivers/gpu/drm/i915/intel_lvds.c | 2 +- drivers/gpu/drm/i915/intel_panel.c | 13 +- drivers/gpu/drm/i915/intel_sdvo.c | 26 +- drivers/gpu/drm/i915/intel_tv.c | 2 +- drivers/gpu/drm/imx/imx-drm-core.c | 1 - drivers/gpu/drm/mediatek/Kconfig | 1 - drivers/gpu/drm/mediatek/mtk_drm_drv.c | 9 - drivers/gpu/drm/mediatek/mtk_drm_plane.c | 1 + drivers/gpu/drm/msm/msm_drv.c | 9 - drivers/gpu/drm/nouveau/nouveau_drm.c | 1 - drivers/gpu/drm/omapdrm/omap_drv.c | 1 - drivers/gpu/drm/omapdrm/omap_fbdev.c | 3 - drivers/gpu/drm/rcar-du/rcar_du_drv.c | 7 - drivers/gpu/drm/rockchip/Kconfig | 1 + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 21 +- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 1 + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 1 - drivers/gpu/drm/sis/sis_mm.c | 2 +- drivers/gpu/drm/sti/sti_compositor.c | 20 + drivers/gpu/drm/sti/sti_compositor.h | 3 + drivers/gpu/drm/sti/sti_crtc.c | 12 + drivers/gpu/drm/sti/sti_cursor.c | 32 +- drivers/gpu/drm/sti/sti_drv.c | 138 +- drivers/gpu/drm/sti/sti_drv.h | 1 + drivers/gpu/drm/sti/sti_dvo.c | 25 +- drivers/gpu/drm/sti/sti_gdp.c | 32 +- drivers/gpu/drm/sti/sti_hda.c | 26 +- drivers/gpu/drm/sti/sti_hdmi.c | 40 +- drivers/gpu/drm/sti/sti_hqvdp.c | 32 +- drivers/gpu/drm/sti/sti_mixer.c | 5 +- drivers/gpu/drm/sti/sti_mixer.h | 2 + drivers/gpu/drm/sti/sti_plane.c | 24 +- drivers/gpu/drm/sti/sti_plane.h | 7 +- drivers/gpu/drm/sti/sti_tvout.c | 36 +- drivers/gpu/drm/sti/sti_vid.c | 5 +- drivers/gpu/drm/sti/sti_vid.h | 2 + drivers/gpu/drm/sun4i/sun4i_drv.c | 38 - drivers/gpu/drm/tilcdc/tilcdc_drv.c | 1 - drivers/gpu/drm/vc4/vc4_drv.c | 12 - drivers/gpu/drm/vgem/vgem_drv.c | 2 - drivers/gpu/drm/via/via_mm.c | 2 +- drivers/gpu/drm/virtio/virtgpu_drm_bus.c | 10 - drivers/gpu/drm/virtio/virtgpu_drv.c | 1 - drivers/gpu/drm/virtio/virtgpu_drv.h | 1 - drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 5 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 + include/drm/drmP.h | 56 +- include/drm/drm_auth.h | 59 + include/drm/drm_crtc.h | 294 +- include/drm/drm_dp_helper.h | 1 + include/drm/drm_legacy.h | 2 + include/drm/drm_plane_helper.h | 1 + include/linux/dma-buf.h | 2 - 109 files changed, 4018 insertions(+), 4861 deletions(-) delete mode 100644 Documentation/DocBook/gpu.tmpl create mode 100644 Documentation/gpu/drm-internals.rst create mode 100644 Documentation/gpu/drm-kms-helpers.rst create mode 100644 Documentation/gpu/drm-kms.rst create mode 100644 Documentation/gpu/drm-mm.rst create mode 100644 Documentation/gpu/drm-uapi.rst create mode 100644 Documentation/gpu/i915.rst create mode 100644 Documentation/gpu/index.rst create mode 100644 Documentation/gpu/introduction.rst create mode 100644 Documentation/gpu/kms-properties.csv create mode 100644 Documentation/gpu/vga-switcheroo.rst create mode 100644 include/drm/drm_auth.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 24 lines · Daniel Vetter
Hi Dave,
Again a pile of things all over
- Conversion to rst from docbook from Jani. Looks real pretty, and the source is now actually readable (compared to horrible, horrible docbook xml)! https://01.org/linuxgraphics/gfx-docs/drm/
- device register/unregister rework from Chris, with follow-up work from Benjamin. Allows more drivers to demidlayer load/unload and others to remove a bit of boilerplate.
- master/auth related cleanup, with docs
- some dma-buf polish, merged by Sumit
- small stuff all over (like build fixes from Arnd)Group maintainership seems to slowly take off, with both Thierry and Sumit pushing a few things. No hiccups thus far.
I'll be on vacation starting this Fri for two weeks, so pls take a look right away in case I need to fix up something. Thierry agreed to merge the oddball patches and if needed also try to send a pull request. So all covered. Pending stuff:
- delayed fbdev init from Thierry
- pixel format rework from Laurent
- zpos from Benjamin
Quoted 4 lines
There's a small conflict with the arm tree and Benjamin's sti init rework.
I'd also like to backmerge this to drm-intel before I head off, so that Chris can move the i915 demidlayering forward.
ofc right when I hit send 0day reports the gcc warning I failed to spot. Will respin with a fixup patch on top.
-Daniel
Quoted 231 lines
Cheers, Daniel
The following changes since commit
a0877f52035280370707bdefeddc6faa6478b892:Merge tag 'topic/drm-misc-2016-06-15' of
git://anongit.freedesktop.org/drm-intelinto drm-next (2016-06-16 05:49:32 +1000)are available in the git repository at:
git://anongit.freedesktop.org/drm-inteltags/topic/drm-misc-2016-06-22for you to fetch changes up to
fa7d81bb3c269a2ee38b6e4d569d9eb8be1a78ad:drm/fb-helper: Reduce
READ_ONCE(master)tolockless_dereference(2016-06-22 10:07:28 +0200)----------------------------------------------------------------
Arnd Bergmann (2):
drm: rockchip: selectDRM_GEM_CMA_HELPER
drm/mediatek: RemoveIOMMU_DMAselectBenjamin Gaignard (3):
drm: Add callbacks for late registering
drm: sti: uselate_registerandearly_unregistercallbacks
drm: sti: rework init sequenceChris Wilson (22):
drm: Exportdrm_dev_init()for subclassing
drm: Add a callback from connector registering
drm: Makedrm_connector_register()safe against multiple calls
drm: Automatically unregister the connector during cleanup
drm: Pass thedrm_dp_aux->hw_mutexto i2c for its locking
drm: Minimally initialisedrm_dp_aux
drm: Automatically register/unregister all connectors
drm: Protectdrm_connector_register_all()underDRIVER_MODESETdrm/i915: Moveintel_connector->unregistertoconnector->early_unregisterdrm/i915: Move backlight unregistration to connector unregistration drm/i915: Avoid use-after-free ofintel_encoderinintel_dp_connector_destrpy
drm: Prevent NULL deref indrm_name_info()
drm/arc: Remove redundant calls todrm_connector_register_all()drm/atmel-hlcdc: Remove redundant calls todrm_connector_register_all()drm/hisilicon: Remove redundant calls todrm_connector_register_all()drm/mediatek: Remove redundant calls todrm_connector_register_all()drm/msm: Remove redundant calls todrm_connector_register_all()drm/rcar-du: Remove redundant calls todrm_connector_register_all()drm/atmel-hlcdc: Remove redundant call todrm_connector_unregister_all()drm/vc4: Remove open-codeddrm_connector_register_all()drm/sun4i: Remove open-codeddrm_connector_register_all()drm/fb-helper: ReduceREAD_ONCE(master)tolockless_dereferenceDaniel Vetter (26):
drm: Nuke legacy maps debugfs files
drm: Hide hw.lock cleanup infilp->releasebetter
drm: Link directly fromdrm_mastertodrm_device
drm: Move master functions intodrm_auth.c
drm: Extractdrm_master_open
drm: Extractdrm_master_relase
drm/sti: Don't calldrm_helper_disable_unused_functions
drm: Only do the hw.lock cleanup inmaster_relasefor !MODESET
drm: Move authmagic cleanup intodrm_master_release
drm: Protect authmagic withmaster_mutex
drm: Mark authmagic ioctls as unlocked
drm: Mark set/drop master ioctl as unlocked. drm/omapdrm: don't calldrm_helper_disable_unused_functionsdrm/crtc-helper:disable_unused_functionsreally isn't for atomic drm/amdkfd: Clean up inline handling
drm: Move master pointer fromdrm_minortodrm_device
drm: Clean updrm_crtc.h
drm: Usedev->nameas fallback fordev->uniquedrm/vgem: Stop callingdrm_drv_set_unique
drm: Don't calldrm_dev_set_uniquefrom platform drivers
drm: NukeSET_UNIQUEioctl
drm: Lobotomizeset_busidnonsense for !pci drivers
drm: Refactor drop/set master code a bit
drm: Extractdrm_is_current_master
drm: Clear up master tracking booleans
drm: documentdrm_auth.cJani Nikula (7):
Documentation/gpu: add newgpu.rstconverted from DocBook gpu.tmplDocumentation/gpu: split up the gpu documentation
MAINTAINERS: addDocumentation/gpuandDocumentation/gpu/i915.rstDocumentation/gpu: use recommended order of heading markersDocumentation/gpu: convert the KMS properties table to CSVDocumentation/gpu: split up mm, kms and kms-helpers from internalsDocumentation/DocBook: remove gpu.tmplMathias Krause (3):
dma-buf: propagate errors fromdma_buf_describe()on debugfs read
dma-buf: removedma_bufdirectory on bufinfo file creation errors
dma-buf: removedma_buf_debugfs_create_file()Matthew Auld (1):
drm: fixsend_vblank_eventuse-after-free errorStefan Agner (1):
drm/fsl-dcu: usedrm_mode_config_cleanupon initialization errorsTomasz Figa (1):
drm/rockchip: Finish initialization before registering DRM deviceVille Syrjälä (1):
drm: Deal with rotation indrm_plane_helper_check_update()Documentation/DocBook/Makefile | 2 +- Documentation/DocBook/gpu.tmpl | 3528 -------------------- Documentation/gpu/drm-internals.rst | 378 +++ Documentation/gpu/drm-kms-helpers.rst | 260 ++ Documentation/gpu/drm-kms.rst | 656 ++++ Documentation/gpu/drm-mm.rst | 454 +++ Documentation/gpu/drm-uapi.rst | 111 + Documentation/gpu/i915.rst | 347 ++ Documentation/gpu/index.rst | 14 + Documentation/gpu/introduction.rst | 51 + Documentation/gpu/kms-properties.csv | 128 + Documentation/gpu/vga-switcheroo.rst | 102 + Documentation/index.rst | 1 + MAINTAINERS | 3 +- drivers/dma-buf/dma-buf.c | 44 +- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 4 +- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 3 - drivers/gpu/drm/arc/arcpgu_drv.c | 8 - drivers/gpu/drm/armada/armada_drv.c | 1 - drivers/gpu/drm/armada/armada_overlay.c | 1 + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 15 - drivers/gpu/drm/drm_auth.c | 285 +- drivers/gpu/drm/drm_bufs.c | 8 +- drivers/gpu/drm/drm_crtc.c | 164 +- drivers/gpu/drm/drm_crtc_helper.c | 3 + drivers/gpu/drm/drm_crtc_internal.h | 88 +- drivers/gpu/drm/drm_debugfs.c | 3 - drivers/gpu/drm/drm_dp_helper.c | 56 +- drivers/gpu/drm/drm_drv.c | 239 +- drivers/gpu/drm/drm_fb_helper.c | 2 +- drivers/gpu/drm/drm_fops.c | 125 +- drivers/gpu/drm/drm_info.c | 117 +- drivers/gpu/drm/drm_internal.h | 21 +- drivers/gpu/drm/drm_ioctl.c | 124 +- drivers/gpu/drm/drm_irq.c | 4 +- drivers/gpu/drm/drm_legacy.h | 8 +- drivers/gpu/drm/drm_lock.c | 240 +- drivers/gpu/drm/drm_pci.c | 51 - drivers/gpu/drm/drm_plane_helper.c | 28 +- drivers/gpu/drm/drm_platform.c | 18 - drivers/gpu/drm/drm_simple_kms_helper.c | 1 + drivers/gpu/drm/drm_vm.c | 54 - drivers/gpu/drm/etnaviv/etnaviv_drv.c | 1 - drivers/gpu/drm/exynos/exynos_drm_drv.c | 1 - drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_kms.c | 13 +- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 9 - drivers/gpu/drm/i915/i915_drv.h | 3 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 4 +- drivers/gpu/drm/i915/intel_crt.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 15 +- drivers/gpu/drm/i915/intel_dp.c | 22 +- drivers/gpu/drm/i915/intel_dp_mst.c | 4 +- drivers/gpu/drm/i915/intel_drv.h | 17 +- drivers/gpu/drm/i915/intel_dsi.c | 2 +- drivers/gpu/drm/i915/intel_dvo.c | 2 +- drivers/gpu/drm/i915/intel_hdmi.c | 2 +- drivers/gpu/drm/i915/intel_lvds.c | 2 +- drivers/gpu/drm/i915/intel_panel.c | 13 +- drivers/gpu/drm/i915/intel_sdvo.c | 26 +- drivers/gpu/drm/i915/intel_tv.c | 2 +- drivers/gpu/drm/imx/imx-drm-core.c | 1 - drivers/gpu/drm/mediatek/Kconfig | 1 - drivers/gpu/drm/mediatek/mtk_drm_drv.c | 9 - drivers/gpu/drm/mediatek/mtk_drm_plane.c | 1 + drivers/gpu/drm/msm/msm_drv.c | 9 - drivers/gpu/drm/nouveau/nouveau_drm.c | 1 - drivers/gpu/drm/omapdrm/omap_drv.c | 1 - drivers/gpu/drm/omapdrm/omap_fbdev.c | 3 - drivers/gpu/drm/rcar-du/rcar_du_drv.c | 7 - drivers/gpu/drm/rockchip/Kconfig | 1 + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 21 +- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 1 + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 1 - drivers/gpu/drm/sis/sis_mm.c | 2 +- drivers/gpu/drm/sti/sti_compositor.c | 20 + drivers/gpu/drm/sti/sti_compositor.h | 3 + drivers/gpu/drm/sti/sti_crtc.c | 12 + drivers/gpu/drm/sti/sti_cursor.c | 32 +- drivers/gpu/drm/sti/sti_drv.c | 138 +- drivers/gpu/drm/sti/sti_drv.h | 1 + drivers/gpu/drm/sti/sti_dvo.c | 25 +- drivers/gpu/drm/sti/sti_gdp.c | 32 +- drivers/gpu/drm/sti/sti_hda.c | 26 +- drivers/gpu/drm/sti/sti_hdmi.c | 40 +- drivers/gpu/drm/sti/sti_hqvdp.c | 32 +- drivers/gpu/drm/sti/sti_mixer.c | 5 +- drivers/gpu/drm/sti/sti_mixer.h | 2 + drivers/gpu/drm/sti/sti_plane.c | 24 +- drivers/gpu/drm/sti/sti_plane.h | 7 +- drivers/gpu/drm/sti/sti_tvout.c | 36 +- drivers/gpu/drm/sti/sti_vid.c | 5 +- drivers/gpu/drm/sti/sti_vid.h | 2 + drivers/gpu/drm/sun4i/sun4i_drv.c | 38 - drivers/gpu/drm/tilcdc/tilcdc_drv.c | 1 - drivers/gpu/drm/vc4/vc4_drv.c | 12 - drivers/gpu/drm/vgem/vgem_drv.c | 2 - drivers/gpu/drm/via/via_mm.c | 2 +- drivers/gpu/drm/virtio/virtgpu_drm_bus.c | 10 - drivers/gpu/drm/virtio/virtgpu_drv.c | 1 - drivers/gpu/drm/virtio/virtgpu_drv.h | 1 - drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 5 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 + include/drm/drmP.h | 56 +- include/drm/drm_auth.h | 59 + include/drm/drm_crtc.h | 294 +- include/drm/drm_dp_helper.h | 1 + include/drm/drm_legacy.h | 2 + include/drm/drm_plane_helper.h | 1 + include/linux/dma-buf.h | 2 - 109 files changed, 4018 insertions(+), 4861 deletions(-) delete mode 100644 Documentation/DocBook/gpu.tmpl create mode 100644 Documentation/gpu/drm-internals.rst create mode 100644 Documentation/gpu/drm-kms-helpers.rst create mode 100644 Documentation/gpu/drm-kms.rst create mode 100644 Documentation/gpu/drm-mm.rst create mode 100644 Documentation/gpu/drm-uapi.rst create mode 100644 Documentation/gpu/i915.rst create mode 100644 Documentation/gpu/index.rst create mode 100644 Documentation/gpu/introduction.rst create mode 100644 Documentation/gpu/kms-properties.csv create mode 100644 Documentation/gpu/vga-switcheroo.rst create mode 100644 include/drm/drm_auth.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 24 lines · Daniel Vetter
Hi Dave,
Again a pile of things all over
- Conversion to rst from docbook from Jani. Looks real pretty, and the source is now actually readable (compared to horrible, horrible docbook xml)! https://01.org/linuxgraphics/gfx-docs/drm/
- device register/unregister rework from Chris, with follow-up work from Benjamin. Allows more drivers to demidlayer load/unload and others to remove a bit of boilerplate.
- master/auth related cleanup, with docs
- some dma-buf polish, merged by Sumit
- small stuff all over (like build fixes from Arnd)Group maintainership seems to slowly take off, with both Thierry and Sumit pushing a few things. No hiccups thus far.
I'll be on vacation starting this Fri for two weeks, so pls take a look right away in case I need to fix up something. Thierry agreed to merge the oddball patches and if needed also try to send a pull request. So all covered. Pending stuff:
- delayed fbdev init from Thierry
- pixel format rework from Laurent
- zpos from Benjamin
Quoted 4 lines
There's a small conflict with the arm tree and Benjamin's sti init rework.
I'd also like to backmerge this to drm-intel before I head off, so that Chris can move the i915 demidlayering forward.
Updated pull request.
-Daniel
The following changes since commit a0877f52035280370707bdefeddc6faa6478b892:
Merge tag 'topic/drm-misc-2016-06-15' of git://anongit.freedesktop.org/drm-intel into drm-next (2016-06-16 05:49:32 +1000)
are available in the git repository at:
git://anongit.freedesktop.org/drm-intel tags/topic/drm-misc-2016-06-22-updated
for you to fetch changes up to f510f34c12f65105146ace5561969e5003f6c007:
drm/vc4: Remove unused connector (2016-06-22 12:41:47 +0200)
----------------------------------------------------------------
Arnd Bergmann (2):
drm: rockchip: select DRM_GEM_CMA_HELPER
drm/mediatek: Remove IOMMU_DMA select
Benjamin Gaignard (3):
drm: Add callbacks for late registering
drm: sti: use late_register and early_unregister callbacks
drm: sti: rework init sequence
Chris Wilson (22):
drm: Export drm_dev_init() for subclassing
drm: Add a callback from connector registering
drm: Make drm_connector_register() safe against multiple calls
drm: Automatically unregister the connector during cleanup
drm: Pass the drm_dp_aux->hw_mutex to i2c for its locking
drm: Minimally initialise drm_dp_aux
drm: Automatically register/unregister all connectors
drm: Protect drm_connector_register_all() under DRIVER_MODESET drm/i915: Move intel_connector->unregister to connector->early_unregister drm/i915: Move backlight unregistration to connector unregistration drm/i915: Avoid use-after-free of intel_encoder in intel_dp_connector_destrpy
drm: Prevent NULL deref in drm_name_info()
drm/arc: Remove redundant calls to drm_connector_register_all() drm/atmel-hlcdc: Remove redundant calls to drm_connector_register_all() drm/hisilicon: Remove redundant calls to drm_connector_register_all() drm/mediatek: Remove redundant calls to drm_connector_register_all() drm/msm: Remove redundant calls to drm_connector_register_all() drm/rcar-du: Remove redundant calls to drm_connector_register_all() drm/atmel-hlcdc: Remove redundant call to drm_connector_unregister_all() drm/vc4: Remove open-coded drm_connector_register_all() drm/sun4i: Remove open-coded drm_connector_register_all() drm/fb-helper: Reduce READ_ONCE(master) to lockless_dereference
Daniel Vetter (27):
drm: Nuke legacy maps debugfs files
drm: Hide hw.lock cleanup in filp->release better
drm: Link directly from drm_master to drm_device
drm: Move master functions into drm_auth.c
drm: Extract drm_master_open
drm: Extract drm_master_relase
drm/sti: Don't call drm_helper_disable_unused_functions
drm: Only do the hw.lock cleanup in master_relase for !MODESET
drm: Move authmagic cleanup into drm_master_release
drm: Protect authmagic with master_mutex
drm: Mark authmagic ioctls as unlocked
drm: Mark set/drop master ioctl as unlocked. drm/omapdrm: don't call drm_helper_disable_unused_functions drm/crtc-helper: disable_unused_functions really isn't for atomic drm/amdkfd: Clean up inline handling
drm: Move master pointer from drm_minor to drm_device
drm: Clean up drm_crtc.h
drm: Use dev->name as fallback for dev->unique drm/vgem: Stop calling drm_drv_set_unique
drm: Don't call drm_dev_set_unique from platform drivers
drm: Nuke SET_UNIQUE ioctl
drm: Lobotomize set_busid nonsense for !pci drivers
drm: Refactor drop/set master code a bit
drm: Extract drm_is_current_master
drm: Clear up master tracking booleans
drm: document drm_auth.c
drm/vc4: Remove unused connector
Jani Nikula (7):
Documentation/gpu: add new gpu.rst converted from DocBook gpu.tmpl Documentation/gpu: split up the gpu documentation
MAINTAINERS: add Documentation/gpu and Documentation/gpu/i915.rst Documentation/gpu: use recommended order of heading markers Documentation/gpu: convert the KMS properties table to CSV Documentation/gpu: split up mm, kms and kms-helpers from internals Documentation/DocBook: remove gpu.tmpl
Mathias Krause (3):
dma-buf: propagate errors from dma_buf_describe() on debugfs read
dma-buf: remove dma_buf directory on bufinfo file creation errors
dma-buf: remove dma_buf_debugfs_create_file()
Matthew Auld (1):
drm: fix send_vblank_event use-after-free error
Stefan Agner (1):
drm/fsl-dcu: use drm_mode_config_cleanup on initialization errors
Tomasz Figa (1):
drm/rockchip: Finish initialization before registering DRM device
Ville Syrjälä (1):
drm: Deal with rotation in drm_plane_helper_check_update()
Documentation/DocBook/Makefile | 2 +- Documentation/DocBook/gpu.tmpl | 3528 ------------------------------------------------------------------------- Documentation/gpu/drm-internals.rst | 378 ++++++++ Documentation/gpu/drm-kms-helpers.rst | 260 ++++++ Documentation/gpu/drm-kms.rst | 656 ++++++++++++++ Documentation/gpu/drm-mm.rst | 454 ++++++++++ Documentation/gpu/drm-uapi.rst | 111 +++ Documentation/gpu/i915.rst | 347 ++++++++ Documentation/gpu/index.rst | 14 + Documentation/gpu/introduction.rst | 51 ++ Documentation/gpu/kms-properties.csv | 128 +++ Documentation/gpu/vga-switcheroo.rst | 102 +++ Documentation/index.rst | 1 + MAINTAINERS | 3 +- drivers/dma-buf/dma-buf.c | 44 +- drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 4 +- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 3 - drivers/gpu/drm/arc/arcpgu_drv.c | 8 - drivers/gpu/drm/armada/armada_drv.c | 1 - drivers/gpu/drm/armada/armada_overlay.c | 1 + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 15 - drivers/gpu/drm/drm_auth.c | 285 +++++- drivers/gpu/drm/drm_bufs.c | 8 +- drivers/gpu/drm/drm_crtc.c | 164 +++- drivers/gpu/drm/drm_crtc_helper.c | 3 + drivers/gpu/drm/drm_crtc_internal.h | 88 +- drivers/gpu/drm/drm_debugfs.c | 3 - drivers/gpu/drm/drm_dp_helper.c | 56 +- drivers/gpu/drm/drm_drv.c | 239 ++--- drivers/gpu/drm/drm_fb_helper.c | 2 +- drivers/gpu/drm/drm_fops.c | 125 +-- drivers/gpu/drm/drm_info.c | 117 +-- drivers/gpu/drm/drm_internal.h | 21 +- drivers/gpu/drm/drm_ioctl.c | 124 +-- drivers/gpu/drm/drm_irq.c | 4 +- drivers/gpu/drm/drm_legacy.h | 8 +- drivers/gpu/drm/drm_lock.c | 240 ++--- drivers/gpu/drm/drm_pci.c | 51 -- drivers/gpu/drm/drm_plane_helper.c | 28 +- drivers/gpu/drm/drm_platform.c | 18 - drivers/gpu/drm/drm_simple_kms_helper.c | 1 + drivers/gpu/drm/drm_vm.c | 54 -- drivers/gpu/drm/etnaviv/etnaviv_drv.c | 1 - drivers/gpu/drm/exynos/exynos_drm_drv.c | 1 - drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_kms.c | 13 +- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 9 - drivers/gpu/drm/i915/i915_drv.h | 3 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 4 +- drivers/gpu/drm/i915/intel_crt.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 15 +- drivers/gpu/drm/i915/intel_dp.c | 22 +- drivers/gpu/drm/i915/intel_dp_mst.c | 4 +- drivers/gpu/drm/i915/intel_drv.h | 17 +- drivers/gpu/drm/i915/intel_dsi.c | 2 +- drivers/gpu/drm/i915/intel_dvo.c | 2 +- drivers/gpu/drm/i915/intel_hdmi.c | 2 +- drivers/gpu/drm/i915/intel_lvds.c | 2 +- drivers/gpu/drm/i915/intel_panel.c | 13 +- drivers/gpu/drm/i915/intel_sdvo.c | 26 +- drivers/gpu/drm/i915/intel_tv.c | 2 +- drivers/gpu/drm/imx/imx-drm-core.c | 1 - drivers/gpu/drm/mediatek/Kconfig | 1 - drivers/gpu/drm/mediatek/mtk_drm_drv.c | 9 - drivers/gpu/drm/mediatek/mtk_drm_plane.c | 1 + drivers/gpu/drm/msm/msm_drv.c | 9 - drivers/gpu/drm/nouveau/nouveau_drm.c | 1 - drivers/gpu/drm/omapdrm/omap_drv.c | 1 - drivers/gpu/drm/omapdrm/omap_fbdev.c | 3 - drivers/gpu/drm/rcar-du/rcar_du_drv.c | 7 - drivers/gpu/drm/rockchip/Kconfig | 1 + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 21 +- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 1 + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 1 - drivers/gpu/drm/sis/sis_mm.c | 2 +- drivers/gpu/drm/sti/sti_compositor.c | 20 + drivers/gpu/drm/sti/sti_compositor.h | 3 + drivers/gpu/drm/sti/sti_crtc.c | 12 + drivers/gpu/drm/sti/sti_cursor.c | 32 +- drivers/gpu/drm/sti/sti_drv.c | 138 ++- drivers/gpu/drm/sti/sti_drv.h | 1 + drivers/gpu/drm/sti/sti_dvo.c | 25 +- drivers/gpu/drm/sti/sti_gdp.c | 32 +- drivers/gpu/drm/sti/sti_hda.c | 26 +- drivers/gpu/drm/sti/sti_hdmi.c | 40 +- drivers/gpu/drm/sti/sti_hqvdp.c | 32 +- drivers/gpu/drm/sti/sti_mixer.c | 5 +- drivers/gpu/drm/sti/sti_mixer.h | 2 + drivers/gpu/drm/sti/sti_plane.c | 24 +- drivers/gpu/drm/sti/sti_plane.h | 7 +- drivers/gpu/drm/sti/sti_tvout.c | 36 +- drivers/gpu/drm/sti/sti_vid.c | 5 +- drivers/gpu/drm/sti/sti_vid.h | 2 + drivers/gpu/drm/sun4i/sun4i_drv.c | 38 - drivers/gpu/drm/tilcdc/tilcdc_drv.c | 1 - drivers/gpu/drm/vc4/vc4_drv.c | 13 - drivers/gpu/drm/vgem/vgem_drv.c | 2 - drivers/gpu/drm/via/via_mm.c | 2 +- drivers/gpu/drm/virtio/virtgpu_drm_bus.c | 10 - drivers/gpu/drm/virtio/virtgpu_drv.c | 1 - drivers/gpu/drm/virtio/virtgpu_drv.h | 1 - drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 5 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 + include/drm/drmP.h | 56 +- include/drm/drm_auth.h | 59 ++ include/drm/drm_crtc.h | 294 ++++--- include/drm/drm_dp_helper.h | 1 + include/drm/drm_legacy.h | 2 + include/drm/drm_plane_helper.h | 1 + include/linux/dma-buf.h | 2 - 109 files changed, 4018 insertions(+), 4862 deletions(-) delete mode 100644 Documentation/DocBook/gpu.tmpl create mode 100644 Documentation/gpu/drm-internals.rst create mode 100644 Documentation/gpu/drm-kms-helpers.rst create mode 100644 Documentation/gpu/drm-kms.rst create mode 100644 Documentation/gpu/drm-mm.rst create mode 100644 Documentation/gpu/drm-uapi.rst create mode 100644 Documentation/gpu/i915.rst create mode 100644 Documentation/gpu/index.rst create mode 100644 Documentation/gpu/introduction.rst create mode 100644 Documentation/gpu/kms-properties.csv create mode 100644 Documentation/gpu/vga-switcheroo.rst create mode 100644 include/drm/drm_auth.h
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel