From patchwork Wed Dec 4 04:45:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shirish S X-Patchwork-Id: 3283041 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8E8549F37A for ; Wed, 4 Dec 2013 15:40:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BD95C204D6 for ; Wed, 4 Dec 2013 15:40:27 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 57D9F204D5 for ; Wed, 4 Dec 2013 15:40:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3AE4CFB30A; Wed, 4 Dec 2013 07:40:17 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout4.samsung.com (mailout4.samsung.com [203.254.224.34]) by gabe.freedesktop.org (Postfix) with ESMTP id 881F2FB825 for ; Tue, 3 Dec 2013 20:42:14 -0800 (PST) Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MX900BAYME50MC0@mailout4.samsung.com> for dri-devel@lists.freedesktop.org; Wed, 04 Dec 2013 13:42:05 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.126]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id B8.4A.15154.D92BE925; Wed, 04 Dec 2013 13:42:05 +0900 (KST) X-AuditID: cbfee68e-b7fee6d000003b32-97-529eb29ddd5c Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id EC.D7.15903.D92BE925; Wed, 04 Dec 2013 13:42:05 +0900 (KST) Received: from chrome-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 <0MX900G49MDU8360@mmp2.samsung.com>; Wed, 04 Dec 2013 13:42:05 +0900 (KST) From: Shirish S To: dri-devel@lists.freedesktop.org, inki.dae@samsung.com, devicetree@vger.kernel.org, t.figa@samsung.com Subject: [PATCH 4/4] drm: exynos: hdmi: Add dt support for hdmiphy settings Date: Wed, 04 Dec 2013 10:15:00 +0530 Message-id: <1386132300-29558-5-git-send-email-s.shirish@samsung.com> X-Mailer: git-send-email 1.7.10.4 In-reply-to: <1386132300-29558-1-git-send-email-s.shirish@samsung.com> References: <1386132300-29558-1-git-send-email-s.shirish@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrKLMWRmVeSWpSXmKPExsWyRsSkTnfupnlBBif2SljMP3KO1eLK1/ds FpPuT2Cx6F1wlc3i8Jt2VotpszcyWjTtOMhmsX7GaxYHDo/ZDRdZPO53H2fy6NuyitHj8ya5 AJYoLpuU1JzMstQifbsEroz3j5sYCzqNK77fPsfYwPhZo4uRk0NCwETi5PpmFghbTOLCvfVs ILaQwFJGiVNL3WBqHv59xNTFyAUUn84ocfvWSzYIp5dJomfqFnaQKjYBdYmLk1czg9giAtkS X5/fAoszC+RInOs4xQRiCwt4S8zbO5uxi5GDg0VAVeL4HD+QMK+Aq8TBRY+ZIJYpSnQ/mwB2 BKeAm8Sh5ROZIA5ylZjwaw4jyF4JgXnsEp0fvrOCJFgEBCS+TT7EAjJTQkBWYtMBZog5khIH V9xgmcAovICRYRWjaGpBckFxUnqRkV5xYm5xaV66XnJ+7iZGYJCf/vesbwfjzQPWhxiTgcZN ZJYSTc4HRkleSbyhsZmRhamJqbGRuaUZacJK4ryLHiYFCQmkJ5akZqemFqQWxReV5qQWH2Jk 4uCUamD0Dj+g37GDX1mwQmLdiTUv+Uzezn34J7SZKWehutbLVI30tj8qOZ8PWq27XuLZmcAj fmPFkSuTJzY3OaSJNLDMqK6bv3vFJtOPZnNaZV6F6R595vXBsPlSo1HXErNX3/NMKx96MIdr sTZUqp51nDHvwZvpy1iaDsyePY9vzY4fc7ouqz/S3duixFKckWioxVxUnAgA4/SZQ4gCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrMIsWRmVeSWpSXmKPExsVy+t9jQd25m+YFGVyZyGcx/8g5VosrX9+z WUy6P4HFonfBVTaLw2/aWS2mzd7IaNG04yCbxfoZr1kcODxmN1xk8bjffZzJo2/LKkaPz5vk AliiGhhtMlITU1KLFFLzkvNTMvPSbZW8g+Od403NDAx1DS0tzJUU8hJzU22VXHwCdN0yc4Du UFIoS8wpBQoFJBYXK+nbYZoQGuKmawHTGKHrGxIE12NkgAYS1jBmvH/cxFjQaVzx/fY5xgbG zxpdjJwcEgImEg//PmKCsMUkLtxbz9bFyMUhJDCdUeL2rZdQTi+TRM/ULewgVWwC6hIXJ69m BrFFBLIlvj6/BRZnFsiRONdxCmySsIC3xLy9sxm7GDk4WARUJY7P8QMJ8wq4Shxc9BhqmaJE 97MJbCA2p4CbxKHlE8HiQkA1E37NYZzAyLuAkWEVo2hqQXJBcVJ6rpFecWJucWleul5yfu4m RnAUPZPewbiqweIQowAHoxIPbwLnvCAh1sSy4srcQ4wSHMxKIrw2ZUAh3pTEyqrUovz4otKc 1OJDjMlAR01klhJNzgdGeF5JvKGxibmpsamliYWJmSVpwkrivAdbrQOFBNITS1KzU1MLUotg tjBxcEo1MHZv1J/qtX7Be7/NgoFG/y//+pwefL3vmkWJpr6S+rW8qF9NtpN2vjHScduf8PDr /gn/rlj81bwcfUzKrVbsxsFlbtclvW5IGeos/WcVZjHr3JGzvyYJPH7NM1f83duD7f4q2w+E T649FtNTcuuBw983ORGzLMzfNF/0qtk3y3JL/POy3acNU1cpsRRnJBpqMRcVJwIANfrny+YC AAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected X-Mailman-Approved-At: Wed, 04 Dec 2013 07:40:13 -0800 Cc: kgene.kim@samsung.com, shirish@chromium.org, Shirish S , s.nawrocki@samsung.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds dt support to hdmiphy config settings as it is board specific and depends on the signal pattern of board. Signed-off-by: Shirish S --- .../devicetree/bindings/video/exynos_hdmi.txt | 34 ++++++++ drivers/gpu/drm/exynos/exynos_hdmi.c | 89 ++++++++++++++++---- 2 files changed, 105 insertions(+), 18 deletions(-) diff --git a/Documentation/devicetree/bindings/video/exynos_hdmi.txt b/Documentation/devicetree/bindings/video/exynos_hdmi.txt index 323983b..0766e6e 100644 --- a/Documentation/devicetree/bindings/video/exynos_hdmi.txt +++ b/Documentation/devicetree/bindings/video/exynos_hdmi.txt @@ -13,6 +13,31 @@ Required properties: b) pin number within the gpio controller. c) optional flags and pull up/down. +Optional-but-recommended properties: +- hdmiphy-configs: following information about the hdmiphy config settings. + a) "config: config" specifies the phy configuration settings, + where 'N' denotes the number of configuration, since every + pixel clock can have its unique configuration. + "samsung,pixel-clock" specifies the pixel clock + "samsung,de-emphasis-level" provides fine control of TMDS data + pre emphasis, below shown is example for + data de-emphasis register at address 0x145D0040. + hdmiphy@38[16] for bits[3:0] permitted values are in + the range of 760 mVdiff to 1400 mVdiff at 20mVdiff + increments for every LSB + hdmiphy@38[16] for bits[7:4] permitted values are in + the range of 0dB to -7.45dB at increments of -0.45dB + for every LSB. + "samsung,clock-level" provides fine control of TMDS data + amplitude for each channel, + for example if 0x145D005C is the address of clock level + register then, + hdmiphy@38[23] for bits [1:0] permitted values are in + the range of 0 mVdiff & 60 mVdiff for each channel at + increments 20 mVdiff of amplitude levels for every LSB, + hdmiphy@38[23] for bits [7:3] permitted values are in + the range of 790 and 1430 mV at 20mV increments for + every LSB. Example: hdmi { @@ -20,4 +45,13 @@ Example: reg = <0x14530000 0x100000>; interrupts = <0 95 0>; hpd-gpio = <&gpx3 7 1>; + hdmiphy-configs { + config0: config0 { + samsung,pixel-clock = <25200000>; + samsung,de-emphasis-level = /bits/ 8 <0x26>; + samsung,clock-level = /bits/ 8 < 0x66>; + }; + + /* ... */ + } }; diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index a0e10ae..2fa0074 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c @@ -200,6 +200,9 @@ struct hdmi_context { struct hdmi_resources res; + struct hdmiphy_config *confs; + int nr_confs; + int hpd_gpio; enum hdmi_type type; @@ -259,7 +262,7 @@ static const struct hdmiphy_config hdmiphy_v13_configs[] = { }, }; -static const struct hdmiphy_config hdmiphy_v14_configs[] = { +static struct hdmiphy_config hdmiphy_v14_configs[] = { { .pixel_clock = 25200000, .conf = { @@ -771,20 +774,10 @@ static struct edid *hdmi_get_edid(void *ctx, struct drm_connector *connector) static int hdmi_find_phy_conf(struct hdmi_context *hdata, u32 pixel_clock) { - const struct hdmiphy_config *confs; - int count, i; - - if (hdata->type == HDMI_TYPE13) { - confs = hdmiphy_v13_configs; - count = ARRAY_SIZE(hdmiphy_v13_configs); - } else if (hdata->type == HDMI_TYPE14) { - confs = hdmiphy_v14_configs; - count = ARRAY_SIZE(hdmiphy_v14_configs); - } else - return -EINVAL; + int i; - for (i = 0; i < count; i++) - if (confs[i].pixel_clock == pixel_clock) + for (i = 0; i < hdata->nr_confs; i++) + if (hdata->confs[i].pixel_clock == pixel_clock) return i; DRM_DEBUG_KMS("Could not find phy config for %d\n", pixel_clock); @@ -1363,10 +1356,7 @@ static void hdmiphy_conf_apply(struct hdmi_context *hdata) return; } - if (hdata->type == HDMI_TYPE13) - hdmiphy_data = hdmiphy_v13_configs[i].conf; - else - hdmiphy_data = hdmiphy_v14_configs[i].conf; + hdmiphy_data = hdata->confs[i].conf; memcpy(buffer, hdmiphy_data, 32); ret = i2c_master_send(hdata->hdmiphy_port, buffer, 32); @@ -1858,6 +1848,62 @@ void hdmi_attach_hdmiphy_client(struct i2c_client *hdmiphy) hdmi_hdmiphy = hdmiphy; } +static int drm_hdmi_dt_parse_phy_conf(struct platform_device *pdev, + struct hdmi_context *hdata) +{ + struct device *dev = &pdev->dev; + struct device_node *dev_np = dev->of_node; + struct device_node *phy_conf, *cfg_np; + int i, pixel_clock = 0; + + /* Initialize with default config */ + switch (hdata->type) { + case HDMI_TYPE13: + hdata->confs = hdmiphy_v13_configs; + hdata->nr_confs = ARRAY_SIZE(hdmiphy_v13_configs); + break; + case HDMI_TYPE14: + hdata->confs = hdmiphy_v14_configs; + hdata->nr_confs = ARRAY_SIZE(hdmiphy_v14_configs); + break; + default: + DRM_ERROR("Did not find valid HDMI version\n"); + break; + } + + phy_conf = of_get_child_by_name(dev_np, "hdmiphy-configs"); + if (phy_conf == NULL) { + DRM_ERROR("Did not find hdmiphy-configs node\n"); + return -ENODEV; + } + + for_each_child_of_node(phy_conf, cfg_np) { + if (of_property_read_u32(cfg_np, "samsung,pixel-clock", + &pixel_clock)) + continue; + + for (i = 0; i < ARRAY_SIZE(hdata->nr_confs); i++) { + if (hdata->confs[i].pixel_clock == pixel_clock) + /* Update the data de-emphasis and data level */ + if (of_property_read_u8_array(cfg_np, + "samsung,config-de-emphasis-level", + &hdata->confs[i].conf[16], 1)) { + DRM_ERROR("Failed to get conf\n"); + return -EINVAL; + } + /* Update the clock level diff */ + if (of_property_read_u8_array(cfg_np, + "samsung,config-clock-level", + &hdata->confs[i].conf[23], 1)) { + DRM_ERROR("Failed to get conf\n"); + return -EINVAL; + } + } + } + return 0; + +} + static struct s5p_hdmi_platform_data *drm_hdmi_dt_parse_pdata (struct device *dev) { @@ -1986,6 +2032,13 @@ static int hdmi_probe(struct platform_device *pdev) goto err_hdmiphy; } + /* assign hdmiphy configurations */ + ret = drm_hdmi_dt_parse_phy_conf(pdev, hdata); + if (ret) { + DRM_ERROR("failed to get user defined config,will use + default configs, eye diagram tests may fail\n"); + } + /* Attach HDMI Driver to common hdmi. */ exynos_hdmi_drv_attach(drm_hdmi_ctx);