From patchwork Fri Aug 30 15:25:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 2852133 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 563D6C0AB5 for ; Fri, 30 Aug 2013 15:36:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 246F1201E4 for ; Fri, 30 Aug 2013 15:36:21 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 707A020315 for ; Fri, 30 Aug 2013 15:36:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7E478E6B00 for ; Fri, 30 Aug 2013 08:36:16 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ea0-f176.google.com (mail-ea0-f176.google.com [209.85.215.176]) by gabe.freedesktop.org (Postfix) with ESMTP id 45987E69FC for ; Fri, 30 Aug 2013 08:26:07 -0700 (PDT) Received: by mail-ea0-f176.google.com with SMTP id q16so988234ead.21 for ; Fri, 30 Aug 2013 08:26:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=29JNmMQDRcRMShuf72T+u8hjdJyFSmSkA78/69p5awU=; b=lDHn24/LY7QFvnTtJRL+4+DsUp7te+tbL3sgkM+p1SOB4TiYQpfX3FfBwP1rSz2d4J PupqCWdJD/COpXbNw6i7yjA95bVztp5QEvK847ozyd5bySUcK7WW0OomC1ZHJVTw6ch6 F9xwoLEysKWexTeOPm7RHgWvAEBX+ThBio841abRvP31lUDYcO/MW/tm8xtTGvKvh4rW fdEoyaZAp7UPXssZZZPIVmhS+B83qRGxG8/ELujjVVATkp6GuzFb549EpI7/UNlALvmK jSHEAdZHDn4hb3VtUIKgf9uG7auOZ0VnTWnTM7FPIhgB0rms/1+6p2Dm+Sh1sOtoNt+/ f2xA== X-Received: by 10.15.45.8 with SMTP id a8mr13659363eew.1.1377876366423; Fri, 30 Aug 2013 08:26:06 -0700 (PDT) Received: from localhost (port-55871.pppoe.wtnet.de. [46.59.218.242]) by mx.google.com with ESMTPSA id k7sm55571065eeg.13.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 30 Aug 2013 08:26:05 -0700 (PDT) From: Thierry Reding To: dri-devel@lists.freedesktop.org Subject: [RFC 3/3] drm/tegra: Implement panel support Date: Fri, 30 Aug 2013 17:25:21 +0200 Message-Id: <1377876321-26835-4-git-send-email-treding@nvidia.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1377876321-26835-1-git-send-email-treding@nvidia.com> References: <1377876321-26835-1-git-send-email-treding@nvidia.com> Cc: linux-tegra@vger.kernel.org, devicetree@vger.kernel.org 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+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-6.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 Use the DRM panel framework to attach a panel to an output. Signed-off-by: Thierry Reding --- drivers/gpu/host1x/drm/Kconfig | 1 + drivers/gpu/host1x/drm/drm.h | 1 + drivers/gpu/host1x/drm/output.c | 28 ++++++++++++++++++++++++++-- 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/host1x/drm/Kconfig b/drivers/gpu/host1x/drm/Kconfig index 69853a4..01b036d 100644 --- a/drivers/gpu/host1x/drm/Kconfig +++ b/drivers/gpu/host1x/drm/Kconfig @@ -2,6 +2,7 @@ config DRM_TEGRA bool "NVIDIA Tegra DRM" depends on DRM select DRM_KMS_HELPER + select DRM_PANEL select FB_SYS_FILLRECT select FB_SYS_COPYAREA select FB_SYS_IMAGEBLIT diff --git a/drivers/gpu/host1x/drm/drm.h b/drivers/gpu/host1x/drm/drm.h index 02ce020..a30276c 100644 --- a/drivers/gpu/host1x/drm/drm.h +++ b/drivers/gpu/host1x/drm/drm.h @@ -195,6 +195,7 @@ struct tegra_output { const struct tegra_output_ops *ops; enum tegra_output_type type; + struct drm_panel *panel; struct i2c_adapter *ddc; const struct edid *edid; unsigned int hpd_irq; diff --git a/drivers/gpu/host1x/drm/output.c b/drivers/gpu/host1x/drm/output.c index 137ae81..2ce03c1 100644 --- a/drivers/gpu/host1x/drm/output.c +++ b/drivers/gpu/host1x/drm/output.c @@ -11,6 +11,7 @@ #include #include +#include #include "drm.h" static int tegra_connector_get_modes(struct drm_connector *connector) @@ -19,6 +20,9 @@ static int tegra_connector_get_modes(struct drm_connector *connector) struct edid *edid = NULL; int err = 0; + if (output->panel) + return output->panel->funcs->get_modes(output->panel); + if (output->edid) edid = kmemdup(output->edid, sizeof(*edid), GFP_KERNEL); else if (output->ddc) @@ -74,6 +78,9 @@ tegra_connector_detect(struct drm_connector *connector, bool force) else status = connector_status_connected; } else { + if (output->panel) + status = connector_status_connected; + if (connector->connector_type == DRM_MODE_CONNECTOR_LVDS) status = connector_status_connected; } @@ -105,6 +112,11 @@ static const struct drm_encoder_funcs encoder_funcs = { static void tegra_encoder_dpms(struct drm_encoder *encoder, int mode) { + struct tegra_output *output = encoder_to_output(encoder); + struct drm_panel *panel = output->panel; + + if (panel && panel->funcs && panel->funcs->dpms) + panel->funcs->dpms(panel, mode); } static bool tegra_encoder_mode_fixup(struct drm_encoder *encoder, @@ -153,14 +165,23 @@ static irqreturn_t hpd_irq(int irq, void *data) int tegra_output_parse_dt(struct tegra_output *output) { + struct device_node *ddc, *panel; enum of_gpio_flags flags; - struct device_node *ddc; size_t size; int err; if (!output->of_node) output->of_node = output->dev->of_node; + panel = of_parse_phandle(output->of_node, "nvidia,panel", 0); + if (panel) { + output->panel = of_drm_find_panel(panel); + if (!output->panel) + return -EPROBE_DEFER; + + of_node_put(panel); + } + output->edid = of_get_property(output->of_node, "nvidia,edid", &size); ddc = of_parse_phandle(output->of_node, "nvidia,ddc-i2c-bus", 0); @@ -175,7 +196,7 @@ int tegra_output_parse_dt(struct tegra_output *output) of_node_put(ddc); } - if (!output->edid && !output->ddc) + if (!output->panel && !output->edid && !output->ddc) return -ENODEV; output->hpd_gpio = of_get_named_gpio_flags(output->of_node, @@ -242,6 +263,9 @@ int tegra_output_init(struct drm_device *drm, struct tegra_output *output) connector); drm_connector_helper_add(&output->connector, &connector_helper_funcs); + if (output->panel) + drm_panel_attach(output->panel, &output->connector); + drm_encoder_init(drm, &output->encoder, &encoder_funcs, encoder); drm_encoder_helper_add(&output->encoder, &encoder_helper_funcs);