From patchwork Thu Feb 5 15:54:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Kumar X-Patchwork-Id: 436861 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 574BB14029E for ; Fri, 6 Feb 2015 02:50:34 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757903AbbBEPud (ORCPT ); Thu, 5 Feb 2015 10:50:33 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:55272 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757789AbbBEPub (ORCPT ); Thu, 5 Feb 2015 10:50:31 -0500 Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NJB00GXU2MB9V50@mailout3.samsung.com>; Fri, 06 Feb 2015 00:49:23 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.123]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id C9.69.19034.30193D45; Fri, 06 Feb 2015 00:49:23 +0900 (KST) X-AuditID: cbfee691-f79b86d000004a5a-2a-54d39103d7a9 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 9C.C8.20081.20193D45; Fri, 06 Feb 2015 00:49:22 +0900 (KST) Received: from chromebld-server.sisodomain.com ([107.108.73.106]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0NJB00J6C2LJCL30@mmp2.samsung.com>; Fri, 06 Feb 2015 00:49:22 +0900 (KST) From: Ajay Kumar To: dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org, devicetree@vger.kernel.org Cc: kgene.kim@samsung.com, inki.dae@samsung.com, ajaynumb@gmail.com, jy0922.shim@samsung.com, bhushan.r@samsung.com, prashanth.g@samsung.com, Ajay Kumar , Akshu Agrawal Subject: [PATCH V4] drm/exynos: Add DECON driver Date: Thu, 05 Feb 2015 21:24:04 +0530 Message-id: <1423151644-30189-1-git-send-email-ajaykumar.rs@samsung.com> X-Mailer: git-send-email 2.2.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrMLMWRmVeSWpSXmKPExsWyRsSkWpd54uUQg7WvBSwOvD/IYrHhzUJm iyvriiyWrf3HYjH/yDlWiytf37NZTLo/gcXixb2LLBa9C66yWcw4v4/JYtXhDewO3B47Z91l 97jffZzJo2/LKkaPz5vkAliiuGxSUnMyy1KL9O0SuDJuXZzIWPDiGVPF6Sk3GBsYZy9h6mLk 5JAQMJG4uL8DyhaTuHBvPRuILSSwlFFi9jQLmJoT85qA4lxA8emMEk2Lb7FCOBOYJE6ues4I UsUmoC2xbfpNli5GDg4RgRSJ53/5QGqYBW4ySvRPaWUHqREWMJCYP7mTGcRmEVCV2LurAczm FfCQOPK7kwVim5zElluP2EGaJQSms0ss3/+eCaJBQOLb5ENgCyQEZCU2HWCGqJeUOLjiBssE RsEFjAyrGEVTC5ILipPSi0z1ihNzi0vz0vWS83M3MQLD+vS/ZxN3MN4/YH2IUYCDUYmH12Lf pRAh1sSy4srcQ4ymQBsmMkuJJucDoyevJN7Q2MzIwtTE1NjI3NJMSZxXR/pnsJBAemJJanZq akFqUXxRaU5q8SFGJg5OqQbGAzf2PhNp6Fe6q6tUGBly4VaWecT1p166RZK3buvMeeWUcFXw wwPfqtwLNfzC1UcO216pkNidzqOrs3+pwieOre8e3q4+0iB5OzvJt8B6TsO/k58P1TtlBC7f HrTwy5xbbw6aPtlgPYExuP1zUcJTScWN1imH7jCfKluwi8XjykPtltUhOj5aSizFGYmGWsxF xYkAdFSk5mYCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprLIsWRmVeSWpSXmKPExsVy+t9jQV3miZdDDJYJWBx4f5DFYsObhcwW V9YVWSxb+4/FYv6Rc6wWV76+Z7OYdH8Ci8WLexdZLHoXXGWzmHF+H5PFqsMb2B24PXbOusvu cb/7OJNH35ZVjB6fN8kFsEQ1MNpkpCampBYppOYl56dk5qXbKnkHxzvHm5oZGOoaWlqYKynk Jeam2iq5+AToumXmAB2lpFCWmFMKFApILC5W0rfDNCE0xE3XAqYxQtc3JAiux8gADSSsYcy4 dXEiY8GLZ0wVp6fcYGxgnL2EqYuRk0NCwETixLwmNghbTOLCvfVANheHkMB0RommxbdYIZwJ TBInVz1nBKliE9CW2Db9JksXIweHiECKxPO/fCA1zAI3GSX6p7Syg9QICxhIzJ/cyQxiswio Suzd1QBm8wp4SBz53ckCsU1OYsutR+wTGLkXMDKsYhRNLUguKE5KzzXUK07MLS7NS9dLzs/d xAiOmmdSOxhXNlgcYhTgYFTi4bXcdylEiDWxrLgy9xCjBAezkgjvnebLIUK8KYmVValF+fFF pTmpxYcYTYG2T2SWEk3OB0Z0Xkm8obGJuamxqaWJhYmZpZI4r5J9W4iQQHpiSWp2ampBahFM HxMHp1QDo3s7Z/jVUrbCkLU3ApRy93kfXnR311mVbacFFmcs2l7E3Vj++9yP0Nt8bM8m6LMo fzz6qF9A7PX2N+9tvRmfMdUx+r9+pGR1RSd05USbmb5snAs4k06UqpTkCRhsF/K59nBNRq56 /VbJ1uWT6u7xcEw5+bj8haqanxLrEfuDM++eUlNTqoiYpsRSnJFoqMVcVJwIAIXA5tuwAgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org This patch is based on exynos-drm-next branch of Inki Dae's tree at: git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git DECON(Display and Enhancement Controller) is the new IP in exynos7 SOC for generating video signals using pixel data. DECON driver can be used to drive 2 different interfaces on Exynos7: DECON-INT(video controller) and DECON-EXT(Mixer for HDMI) The existing FIMD driver code was used as a template to create DECON driver. Only DECON-INT is supported as of now, and DECON-EXT support will be added later. The current version of the driver supports video mode displays. Signed-off-by: Akshu Agrawal Signed-off-by: Ajay Kumar --- Changes since V1: -- Address comments from Pankaj and do few cleanups. Changes since V2: -- Address more comments from Pankaj and cleanup. Changes since V3: -- Rebase on exynos-drm-next. Pull in changes from FIMD driver. -- Address comments from Inki Dae. Remove unnecessary functions and delays. Make use of i80-if-timings node to differentiate between command/video mode. .../devicetree/bindings/video/exynos7-decon.txt | 68 ++ drivers/gpu/drm/exynos/Kconfig | 13 +- drivers/gpu/drm/exynos/Makefile | 1 + drivers/gpu/drm/exynos/exynos7_drm_decon.c | 991 ++++++++++++++++++++ drivers/gpu/drm/exynos/exynos_drm_drv.c | 4 + drivers/gpu/drm/exynos/exynos_drm_drv.h | 1 + include/video/exynos7_decon.h | 349 +++++++ 7 files changed, 1424 insertions(+), 3 deletions(-) create mode 100644 Documentation/devicetree/bindings/video/exynos7-decon.txt create mode 100644 drivers/gpu/drm/exynos/exynos7_drm_decon.c create mode 100644 include/video/exynos7_decon.h diff --git a/Documentation/devicetree/bindings/video/exynos7-decon.txt b/Documentation/devicetree/bindings/video/exynos7-decon.txt new file mode 100644 index 0000000..f5f9c8d --- /dev/null +++ b/Documentation/devicetree/bindings/video/exynos7-decon.txt @@ -0,0 +1,68 @@ +Device-Tree bindings for Samsung Exynos7 SoC display controller (DECON) + +DECON (Display and Enhancement Controller) is the Display Controller for the +Exynos7 series of SoCs which transfers the image data from a video memory +buffer to an external LCD interface. + +Required properties: +- compatible: value should be "samsung,exynos7-decon"; + +- reg: physical base address and length of the DECON registers set. + +- interrupt-parent: should be the phandle of the decon controller's + parent interrupt controller. + +- interrupts: should contain a list of all DECON IP block interrupts in the + order: FIFO Level, VSYNC, LCD_SYSTEM. The interrupt specifier + format depends on the interrupt controller used. + +- interrupt-names: should contain the interrupt names: "fifo", "vsync", + "lcd_sys", in the same order as they were listed in the interrupts + property. + +- pinctrl-0: pin control group to be used for this controller. + +- pinctrl-names: must contain a "default" entry. + +- clocks: must include clock specifiers corresponding to entries in the + clock-names property. + +- clock-names: list of clock names sorted in the same order as the clocks + property. Must contain "pclk_decon0", "aclk_decon0", + "decon0_eclk", "decon0_vclk". +- i80-if-timings: timing configuration for lcd i80 interface support. + +Optional Properties: +- samsung,power-domain: a phandle to DECON power domain node. +- display-timings: timing settings for DECON, as described in document [1]. + Can be used in case timings cannot be provided otherwise + or to override timings provided by the panel. + +[1]: Documentation/devicetree/bindings/video/display-timing.txt + +Example: + +SoC specific DT entry: + + decon@13930000 { + compatible = "samsung,exynos7-decon"; + interrupt-parent = <&combiner>; + reg = <0x13930000 0x1000>; + interrupt-names = "lcd_sys", "vsync", "fifo"; + interrupts = <0 188 0>, <0 189 0>, <0 190 0>; + clocks = <&clock_disp PCLK_DECON_INT>, + <&clock_disp ACLK_DECON_INT>, + <&clock_disp SCLK_DECON_INT_ECLK>, + <&clock_disp SCLK_DECON_INT_EXTCLKPLL>; + clock-names = "pclk_decon0", "aclk_decon0", "decon0_eclk", + "decon0_vclk"; + status = "disabled"; + }; + +Board specific DT entry: + + decon@13930000 { + pinctrl-0 = <&lcd_clk &pwm1_out>; + pinctrl-names = "default"; + status = "okay"; + }; diff --git a/drivers/gpu/drm/exynos/Kconfig b/drivers/gpu/drm/exynos/Kconfig index 627aaa0..378cfd5 100644 --- a/drivers/gpu/drm/exynos/Kconfig +++ b/drivers/gpu/drm/exynos/Kconfig @@ -24,9 +24,16 @@ config DRM_EXYNOS_FIMD help Choose this option if you want to use Exynos FIMD for DRM. +config DRM_EXYNOS_DECON + bool "Exynos DRM DECON" + depends on DRM_EXYNOS + select FB_MODE_HELPERS + help + Choose this option if you want to use Exynos DECON for DRM. + config DRM_EXYNOS_DPI bool "EXYNOS DRM parallel output support" - depends on DRM_EXYNOS_FIMD + depends on (DRM_EXYNOS_FIMD || DRM_EXYNOS_DECON) select DRM_PANEL default n help @@ -34,7 +41,7 @@ config DRM_EXYNOS_DPI config DRM_EXYNOS_DSI bool "EXYNOS DRM MIPI-DSI driver support" - depends on DRM_EXYNOS_FIMD + depends on (DRM_EXYNOS_FIMD || DRM_EXYNOS_DECON) select DRM_MIPI_DSI select DRM_PANEL default n @@ -43,7 +50,7 @@ config DRM_EXYNOS_DSI config DRM_EXYNOS_DP bool "EXYNOS DRM DP driver support" - depends on DRM_EXYNOS_FIMD && ARCH_EXYNOS && (DRM_PTN3460=n || DRM_PTN3460=y || DRM_PTN3460=DRM_EXYNOS) + depends on (DRM_EXYNOS_FIMD || DRM_EXYNOS_DECON) && ARCH_EXYNOS && (DRM_PTN3460=n || DRM_PTN3460=y || DRM_PTN3460=DRM_EXYNOS) default DRM_EXYNOS select DRM_PANEL help diff --git a/drivers/gpu/drm/exynos/Makefile b/drivers/gpu/drm/exynos/Makefile index 0856891..aec058c 100644 --- a/drivers/gpu/drm/exynos/Makefile +++ b/drivers/gpu/drm/exynos/Makefile @@ -10,6 +10,7 @@ exynosdrm-y := exynos_drm_drv.o exynos_drm_encoder.o \ exynosdrm-$(CONFIG_DRM_EXYNOS_IOMMU) += exynos_drm_iommu.o exynosdrm-$(CONFIG_DRM_EXYNOS_FIMD) += exynos_drm_fimd.o +exynosdrm-$(CONFIG_DRM_EXYNOS_DECON) += exynos7_drm_decon.o exynosdrm-$(CONFIG_DRM_EXYNOS_DPI) += exynos_drm_dpi.o exynosdrm-$(CONFIG_DRM_EXYNOS_DSI) += exynos_drm_dsi.o exynosdrm-$(CONFIG_DRM_EXYNOS_DP) += exynos_dp_core.o exynos_dp_reg.o diff --git a/drivers/gpu/drm/exynos/exynos7_drm_decon.c b/drivers/gpu/drm/exynos/exynos7_drm_decon.c new file mode 100644 index 0000000..c610293 --- /dev/null +++ b/drivers/gpu/drm/exynos/exynos7_drm_decon.c @@ -0,0 +1,990 @@ +/* drivers/gpu/drm/exynos/exynos7_drm_decon.c + * + * Copyright (C) 2014 Samsung Electronics Co.Ltd + * Authors: + * Akshu Agarwal + * Ajay Kumar + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + */ +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include