Merge branch 'primary-plane' of git://people.freedesktop.org/~robclark/linux into drm-next
Here's the latest iteration of the universal planes work, which I believe is finally ready for merging. Aside from the minor driver patches to use the new drm_for_each_legacy_plane() macro for plane loops, these should all have an r-b from Rob Clark now. Actual userspace-visibility is currently hidden behind a drm.universal_planes module parameter so that we can do some experimental testing of this before flipping it on universally. * 'primary-plane' of git://people.freedesktop.org/~robclark/linux: drm/doc: Update plane documentation and add plane helper library drm: Allow userspace to ask for universal plane list (v2) drm: Remove unused drm_crtc->fb drm: Replace crtc fb with primary plane fb (v3) drm/msm: Switch to universal plane API's drm: Add drm_crtc_init_with_planes() (v2) drm: Add plane type property (v2) drm: Add drm_universal_plane_init() drm: Add primary plane helpers (v3) drm: Make drm_crtc_check_viewport non-static drm/shmobile: Restrict plane loops to only operate on legacy planes drm/i915: Restrict plane loops to only operate on overlay planes (v2) drm/exynos: Restrict plane loops to only operate on overlay planes (v2) drm: Add support for multiple plane types (v2)
No related branches found
No related tags found
Showing
- Documentation/DocBook/drm.tmpl 43 additions, 7 deletionsDocumentation/DocBook/drm.tmpl
- drivers/gpu/drm/Makefile 2 additions, 1 deletiondrivers/gpu/drm/Makefile
- drivers/gpu/drm/armada/armada_crtc.c 12 additions, 11 deletionsdrivers/gpu/drm/armada/armada_crtc.c
- drivers/gpu/drm/ast/ast_mode.c 6 additions, 6 deletionsdrivers/gpu/drm/ast/ast_mode.c
- drivers/gpu/drm/bochs/bochs_kms.c 2 additions, 2 deletionsdrivers/gpu/drm/bochs/bochs_kms.c
- drivers/gpu/drm/cirrus/cirrus_mode.c 5 additions, 5 deletionsdrivers/gpu/drm/cirrus/cirrus_mode.c
- drivers/gpu/drm/drm_crtc.c 138 additions, 51 deletionsdrivers/gpu/drm/drm_crtc.c
- drivers/gpu/drm/drm_crtc_helper.c 10 additions, 10 deletionsdrivers/gpu/drm/drm_crtc_helper.c
- drivers/gpu/drm/drm_fb_helper.c 5 additions, 4 deletionsdrivers/gpu/drm/drm_fb_helper.c
- drivers/gpu/drm/drm_ioctl.c 7 additions, 0 deletionsdrivers/gpu/drm/drm_ioctl.c
- drivers/gpu/drm/drm_plane_helper.c 333 additions, 0 deletionsdrivers/gpu/drm/drm_plane_helper.c
- drivers/gpu/drm/drm_stub.c 5 additions, 0 deletionsdrivers/gpu/drm/drm_stub.c
- drivers/gpu/drm/exynos/exynos_drm_crtc.c 11 additions, 11 deletionsdrivers/gpu/drm/exynos/exynos_drm_crtc.c
- drivers/gpu/drm/exynos/exynos_drm_encoder.c 1 addition, 1 deletiondrivers/gpu/drm/exynos/exynos_drm_encoder.c
- drivers/gpu/drm/gma500/cdv_intel_display.c 1 addition, 1 deletiondrivers/gpu/drm/gma500/cdv_intel_display.c
- drivers/gpu/drm/gma500/cdv_intel_dp.c 1 addition, 1 deletiondrivers/gpu/drm/gma500/cdv_intel_dp.c
- drivers/gpu/drm/gma500/cdv_intel_hdmi.c 1 addition, 1 deletiondrivers/gpu/drm/gma500/cdv_intel_hdmi.c
- drivers/gpu/drm/gma500/cdv_intel_lvds.c 1 addition, 1 deletiondrivers/gpu/drm/gma500/cdv_intel_lvds.c
- drivers/gpu/drm/gma500/gma_display.c 8 additions, 8 deletionsdrivers/gpu/drm/gma500/gma_display.c
- drivers/gpu/drm/gma500/mdfld_dsi_output.c 1 addition, 1 deletiondrivers/gpu/drm/gma500/mdfld_dsi_output.c
Loading
Please register or sign in to comment