mirror of https://gitee.com/openkylin/linux.git
1dda8d02ac
Merge the rcar stable branch that is being shared with the arm-soc tree. Signed-off-by: Dave Airlie <airlied@redhat.com> * pfdo/drm-rcar-for-v3.12: (220 commits) drm/rcar-du: Add FBDEV emulation support drm/rcar-du: Add internal LVDS encoder support drm/rcar-du: Configure RGB output routing to DPAD0 drm/rcar-du: Rework output routing support drm/rcar-du: Add support for DEFR8 register drm/rcar-du: Add support for multiple groups drm/rcar-du: Fix buffer pitch alignment for R8A7790 DU drm/rcar-du: Add support for the R8A7790 DU drm/rcar-du: Move output routing configuration to group drm/rcar-du: Remove register definitions for the second channel drm/rcar-du: Use dynamic number of CRTCs instead of CRTCs array size drm/rcar-du: Introduce CRTCs groups drm/rcar-du: Rename rcar_du_plane_(init|register) to rcar_du_planes_* drm/rcar-du: Create rcar_du_planes structure drm/rcar-du: Rename platform data fields to match what they describe drm/rcar-du: Merge LVDS and VGA encoder code drm/rcar-du: Split VGA encoder and connector drm/rcar-du: Split LVDS encoder and connector drm/rcar-du: Clarify comment regarding plane Y source coordinate drm/rcar-du: Support per-CRTC clock and IRQ ... Conflicts: drivers/gpu/drm/i915/i915_dma.c drivers/gpu/drm/i915/intel_pm.c drivers/gpu/drm/qxl/qxl_release.c |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| rcar_du_crtc.c | ||
| rcar_du_crtc.h | ||
| rcar_du_drv.c | ||
| rcar_du_drv.h | ||
| rcar_du_encoder.c | ||
| rcar_du_encoder.h | ||
| rcar_du_group.c | ||
| rcar_du_group.h | ||
| rcar_du_kms.c | ||
| rcar_du_kms.h | ||
| rcar_du_lvdscon.c | ||
| rcar_du_lvdscon.h | ||
| rcar_du_lvdsenc.c | ||
| rcar_du_lvdsenc.h | ||
| rcar_du_plane.c | ||
| rcar_du_plane.h | ||
| rcar_du_regs.h | ||
| rcar_du_vgacon.c | ||
| rcar_du_vgacon.h | ||
| rcar_lvds_regs.h | ||