From patchwork Wed Apr 27 20:23:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akshay Bhat X-Patchwork-Id: 8962601 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9F7049F1C1 for ; Wed, 27 Apr 2016 20:24:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A64022026C for ; Wed, 27 Apr 2016 20:24:12 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id CC25F20263 for ; Wed, 27 Apr 2016 20:24:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0E01C6E0A7; Wed, 27 Apr 2016 20:24:06 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk0-x229.google.com (mail-qk0-x229.google.com [IPv6:2607:f8b0:400d:c09::229]) by gabe.freedesktop.org (Postfix) with ESMTPS id F36EA6E0A7 for ; Wed, 27 Apr 2016 20:24:02 +0000 (UTC) Received: by mail-qk0-x229.google.com with SMTP id q76so21230231qke.2 for ; Wed, 27 Apr 2016 13:24:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=timesys-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=J3lYLkFlVg/niDpmEc6IaHFMVFWN8aTVoKvw/puRCOw=; b=Qdhcw0LPPS97jcfw7x5LcWLc3BLjBJOQQScpoL2q6ylUrFp4CuGYRTN3PNA4Ucnc5I zqrAOrSyvmnMVdeTaU4fzH3QMqbr/KOFAs3nswcIATENpdGbYIR3wSwnOq+GaCH1VcC5 +Yn6YgyA2osMX5AvFT2hpouzW5jl+4O5wTJf8x52+R/9BoepVMCHbk4ca6UbtmN3PP9X qYcqBa3c8LhtG4oxsGMFlLMdzbNIzp3S0a05IFygEkPlhOP19x8Tt9BInsiJFEGJqMlV HOX86K7vFIr9kWeQDOy9oyShZUU/iGhxpjac60ptAKgwhTlT40V3akIg8w+Ex4V6MNfj 3vAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=J3lYLkFlVg/niDpmEc6IaHFMVFWN8aTVoKvw/puRCOw=; b=afPQ8lMSpt/+zBo/kYAWj/aEo4KB9u4h2DKDVVwTb78hjU1669Tvwu7YVkXgO4FORG lCtvjJ4mWRneVuym/B2TGWRfWKXt2vnjOT8XifPX/LZMMcDdXlnMFhNjHiw29ni3f+uj Bb5mMRAedtX4XUqgkKp0c8tnPa1LNdzOFySZkEGyWIZHFVMLyxSwcM5lpZPxvHBYmCLI SqYcNASqKO98TFqi948L0WA0O72a98bZqkuC6GK7HcNIwBpR8z8aKUn1UaCxIJSUa0bJ nM8lBWfSc215pDT9gAHthq6s14a3XOFBBDLSsWYv82/4Jz6oMEBx6irXkqaCGklkbvWw 47vw== X-Gm-Message-State: AOPr4FWixf76XWwHTcjZvJXbRDj9gcOuVnZ/vHRTK1cCPcV8d/mH47zc0Xb4zDBXAyt+/Zd8 X-Received: by 10.55.160.215 with SMTP id j206mr10829790qke.108.1461788641200; Wed, 27 Apr 2016 13:24:01 -0700 (PDT) Received: from timesysab.timesys.com ([96.94.100.129]) by smtp.gmail.com with ESMTPSA id y12sm1706630qkb.42.2016.04.27.13.24.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 27 Apr 2016 13:24:00 -0700 (PDT) From: Akshay Bhat To: p.zabel@pengutronix.de Subject: [PATCH v3 1/2] drm/imx: imx-ldb: Add DDC support Date: Wed, 27 Apr 2016 16:23:33 -0400 Message-Id: <1461788614-7784-1-git-send-email-akshay.bhat@timesys.com> X-Mailer: git-send-email 2.8.1 Cc: devicetree@vger.kernel.org, steve_longerbeam@mentor.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, robh+dt@kernel.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 From: Steve Longerbeam Add support for reading EDID over Display Data Channel. If no DDC adapter is available, falls back to hardcoded EDID or display-timings node as before. Signed-off-by: Steve Longerbeam Signed-off-by: Akshay Bhat Acked-by: Philipp Zabel --- Hi Philipp, I have addressed all your comments on v2 Patch. Thanks, Akshay v3: Move ddc_node pointer definition Warn and perform a probe deferral on failing to get ddc i2c adapter by node v2: Rebase to 4.6-rc5 Add check for channel->panel before fallback to display-timings node drivers/gpu/drm/imx/imx-ldb.c | 42 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c index a58eee5..f506e8d 100644 --- a/drivers/gpu/drm/imx/imx-ldb.c +++ b/drivers/gpu/drm/imx/imx-ldb.c @@ -59,6 +59,7 @@ struct imx_ldb_channel { struct drm_encoder encoder; struct drm_panel *panel; struct device_node *child; + struct i2c_adapter *ddc; int chno; void *edid; int edid_len; @@ -107,6 +108,9 @@ static int imx_ldb_connector_get_modes(struct drm_connector *connector) return num_modes; } + if (!imx_ldb_ch->edid && imx_ldb_ch->ddc) + imx_ldb_ch->edid = drm_get_edid(connector, imx_ldb_ch->ddc); + if (imx_ldb_ch->edid) { drm_mode_connector_update_edid_property(connector, imx_ldb_ch->edid); @@ -553,6 +557,7 @@ static int imx_ldb_bind(struct device *dev, struct device *master, void *data) for_each_child_of_node(np, child) { struct imx_ldb_channel *channel; + struct device_node *ddc_node; struct device_node *port; ret = of_property_read_u32(child, "reg", &i); @@ -595,14 +600,34 @@ static int imx_ldb_bind(struct device *dev, struct device *master, void *data) } } - edidp = of_get_property(child, "edid", &channel->edid_len); - if (edidp) { - channel->edid = kmemdup(edidp, channel->edid_len, - GFP_KERNEL); - } else if (!channel->panel) { - ret = of_get_drm_display_mode(child, &channel->mode, 0); - if (!ret) - channel->mode_valid = 1; + ddc_node = of_parse_phandle(child, "ddc-i2c-bus", 0); + if (ddc_node) { + channel->ddc = of_find_i2c_adapter_by_node(ddc_node); + of_node_put(ddc_node); + if (!channel->ddc) { + dev_warn(dev, "failed to get ddc i2c adapter\n"); + return -EPROBE_DEFER; + } + } + + if (!channel->ddc) { + /* if no DDC available, fallback to hardcoded EDID */ + dev_dbg(dev, "no ddc available\n"); + + edidp = of_get_property(child, "edid", + &channel->edid_len); + if (edidp) { + channel->edid = kmemdup(edidp, + channel->edid_len, + GFP_KERNEL); + } else if (!channel->panel) { + /* fallback to display-timings node */ + ret = of_get_drm_display_mode(child, + &channel->mode, + 0); + if (!ret) + channel->mode_valid = 1; + } } channel->bus_format = of_get_bus_format(dev, child); @@ -647,6 +672,7 @@ static void imx_ldb_unbind(struct device *dev, struct device *master, channel->encoder.funcs->destroy(&channel->encoder); kfree(channel->edid); + i2c_put_adapter(channel->ddc); } }