From mboxrd@z Thu Jan 1 00:00:00 1970 From: Inki Dae Subject: [GIT PULL] exynos-drm-next Date: Fri, 21 Mar 2014 17:27:32 +0900 Message-ID: <1395390452-9576-1-git-send-email-inki.dae@samsung.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mailout1.samsung.com (mailout1.samsung.com [203.254.224.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 1D54D6E272 for ; Fri, 21 Mar 2014 01:27:34 -0700 (PDT) Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N2S00F6T25XGE00@mailout1.samsung.com> for dri-devel@lists.freedesktop.org; Fri, 21 Mar 2014 17:27:33 +0900 (KST) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: airlied@linux.ie, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org Hi Dave, This pull request includes some features and big changes for 3.15. Highlights ---------- Re-factoring works over the exynos drm framework. - drm_crtc, drm_encoder/drm_connector are implemented by sub drivers directly. - Removing pm interfaces from each sub driver, and implementing them at top level of exynos drm. Add DisplayPort Transmitter driver. - Just moving existing driver from drivers/vides/exynos into drivers/gpu/drm/exynos. Add new LVDS bridge driver, PTN3460. - Placed in drivers/gpu/drm/bridge, and this device is used to transfer image signal from DP(DisplayPort) to LVDS Panel. So this driver will be used with DP driver moved into exynos drm. Add parallel panel support - With the re-factoring patch series, existing parallel panel support was broken by moving exynos_drm_display ops into each real connector driver, DP. So this patch series adds a new parallel panel module, exynos_drm_dpi, for supporting parallel panel, and also adds relevant bindings. Some fixups and cleanups. Please kindly let me know if there is any problem. Thanks, Inki Dae The following changes since commit e84c20aff1ce7493bce26b75f1db363bb3f05979: drm/radeon/kms: merge conflicted badly (2014-03-20 11:09:10 +1000) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos exynos-drm-next for you to fetch changes up to ec6f53d3115258a4af6b7f4f07173a8336bad785: drm/exynos: fimd: remove unused variable (2014-03-21 15:12:10 +0900) ---------------------------------------------------------------- Andrzej Hajda (7): drm/exynos: delay fbdev initialization until an output is connected drm/exynos: init kms poll after creation of connectors drm/exynos: correct timing porch conversion exynos/fimd: add parallel output related bindings drm/exynos: restore parallel output interface support ARM: dts: exynos4210-universal: add exynos/fimd node drm/exynos: fimd: remove unused variable Daniel Kurtz (2): drm/exynos: Fix (more) freeing issues in exynos_drm_drv.c drm/exynos: hdmi: remove the i2c drivers and use Inki Dae (3): drm/exynos: hdmi: consider APB PHY drm/exynos: hdmi: use i2c_adapter instead of i2c_client drm/exynos: fix unnecessary resource cleanup Sean Paul (30): drm/exynos: Merge overlay_ops into manager_ops drm/exynos: Add an initialize function to manager and display drm/exynos: Use manager_op initialize in fimd drm/exynos: hdmi: Implement initialize op for hdmi drm/exynos: Pass exynos_drm_manager in manager ops instead of dev drm/exynos: Remove apply manager callback drm/exynos: Remove dpms link between encoder/connector drm/exynos: Rename display_op power_on to dpms drm/exynos: Don't keep dpms state in encoder drm/exynos: Use unsigned long for possible_crtcs drm/exynos: Split manager/display/subdrv drm/exynos: Remove exynos_drm_hdmi shim drm/exynos: Use drm_mode_copy to copy modes drm/exynos: Disable unused crtc planes from crtc drm/exynos: Add mode_set manager operation drm/exynos: Implement mode_fixup manager operation drm/exynos: Use mode_set to configure fimd drm/exynos: Remove unused/useless fimd_context members drm/exynos: Move dp driver from video/ to drm/ drm/exynos: Move display implementation into dp drm/exynos: Implement dpms display callback in DP drm/exynos: Clean up FIMD power on/off routines drm/exynos: Consolidate suspend/resume in drm_drv drm/exynos: Add create_connector callback drm/exynos: Implement drm_connector in hdmi directly drm/exynos: Implement drm_connector directly in dp driver drm/exynos: Implement drm_connector directly in vidi driver drm/bridge: Add PTN3460 bridge driver drm/exynos: Implement lvds bridge discovery to DP driver drm/exynos: Remove the exynos_drm_connector shim Shirish S (2): drm/exynos: add phy settings for RB resolutions drm/exynos: set the active aspect ratio as per mode Stephane Marchesin (1): drm/exynos: Remove useless slab.h include .../devicetree/bindings/drm/bridge/ptn3460.txt | 27 + .../devicetree/bindings/video/exynos_dp.txt | 17 + .../devicetree/bindings/video/exynos_hdmi.txt | 5 + .../devicetree/bindings/video/samsung-fimd.txt | 17 + MAINTAINERS | 6 - arch/arm/boot/dts/exynos4210-universal_c210.dts | 27 + drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/bridge/Kconfig | 4 + drivers/gpu/drm/bridge/Makefile | 3 + drivers/gpu/drm/bridge/ptn3460.c | 349 ++++++++++ drivers/gpu/drm/exynos/Kconfig | 15 + drivers/gpu/drm/exynos/Makefile | 8 +- drivers/{video => gpu/drm}/exynos/exynos_dp_core.c | 303 +++++++-- drivers/{video => gpu/drm}/exynos/exynos_dp_core.h | 9 + drivers/{video => gpu/drm}/exynos/exynos_dp_reg.c | 0 drivers/{video => gpu/drm}/exynos/exynos_dp_reg.h | 0 drivers/gpu/drm/exynos/exynos_drm_connector.c | 92 +-- drivers/gpu/drm/exynos/exynos_drm_connector.h | 4 - drivers/gpu/drm/exynos/exynos_drm_core.c | 193 ++++-- drivers/gpu/drm/exynos/exynos_drm_crtc.c | 139 +++- drivers/gpu/drm/exynos/exynos_drm_crtc.h | 20 +- drivers/gpu/drm/exynos/exynos_drm_dpi.c | 339 ++++++++++ drivers/gpu/drm/exynos/exynos_drm_drv.c | 192 ++++-- drivers/gpu/drm/exynos/exynos_drm_drv.h | 162 +++-- drivers/gpu/drm/exynos/exynos_drm_encoder.c | 357 +--------- drivers/gpu/drm/exynos/exynos_drm_encoder.h | 18 +- drivers/gpu/drm/exynos/exynos_drm_fb.c | 7 +- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 700 ++++++++------------ drivers/gpu/drm/exynos/exynos_drm_hdmi.c | 439 ------------ drivers/gpu/drm/exynos/exynos_drm_hdmi.h | 67 -- drivers/gpu/drm/exynos/exynos_drm_plane.c | 17 +- drivers/gpu/drm/exynos/exynos_drm_plane.h | 2 +- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 441 ++++++------ drivers/gpu/drm/exynos/exynos_hdmi.c | 472 +++++++------ drivers/gpu/drm/exynos/exynos_mixer.c | 573 +++++++--------- drivers/gpu/drm/exynos/exynos_mixer.h | 20 + drivers/video/exynos/Kconfig | 7 - drivers/video/exynos/Makefile | 1 - include/drm/bridge/ptn3460.h | 37 ++ 40 files changed, 2761 insertions(+), 2331 deletions(-) create mode 100644 Documentation/devicetree/bindings/drm/bridge/ptn3460.txt create mode 100644 drivers/gpu/drm/bridge/Kconfig create mode 100644 drivers/gpu/drm/bridge/Makefile create mode 100644 drivers/gpu/drm/bridge/ptn3460.c rename drivers/{video => gpu/drm}/exynos/exynos_dp_core.c (83%) rename drivers/{video => gpu/drm}/exynos/exynos_dp_core.h (97%) rename drivers/{video => gpu/drm}/exynos/exynos_dp_reg.c (100%) rename drivers/{video => gpu/drm}/exynos/exynos_dp_reg.h (100%) create mode 100644 drivers/gpu/drm/exynos/exynos_drm_dpi.c delete mode 100644 drivers/gpu/drm/exynos/exynos_drm_hdmi.c delete mode 100644 drivers/gpu/drm/exynos/exynos_drm_hdmi.h create mode 100644 drivers/gpu/drm/exynos/exynos_mixer.h create mode 100644 include/drm/bridge/ptn3460.h