From patchwork Tue Aug 13 11:02:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dariusz Marcinkiewicz X-Patchwork-Id: 11095265 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D95C01399 for ; Thu, 15 Aug 2019 08:36:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9AE92811A for ; Thu, 15 Aug 2019 08:36:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BE2FA28842; Thu, 15 Aug 2019 08:36:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 68BF52811A for ; Thu, 15 Aug 2019 08:36:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BF3276E93C; Thu, 15 Aug 2019 08:35:10 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-vk1-xa4a.google.com (mail-vk1-xa4a.google.com [IPv6:2607:f8b0:4864:20::a4a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5DD336E0F2 for ; Tue, 13 Aug 2019 11:04:07 +0000 (UTC) Received: by mail-vk1-xa4a.google.com with SMTP id l186so45501323vke.19 for ; Tue, 13 Aug 2019 04:04:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=saq5XDceOIgoGr9TXKhDgKirX3SqKoE0qoHBi968/xk=; b=cLLJxmExIbWn+lYfaYcmOwgJSpomUDRiEIeJ1YKzEcCN93ESc7Fpg0DIyPVkXr+V8x 1NoU/Pc6N/2zOZSZvNKpfJ4+wlVJwZYjrBaR6xGCS7qyQFYKxY6dNjeBIj6RyqNNOthp mxKBPhXFsAFUCwPPtBNJbCbd6ue2SmLxdP+jHT0vggkPqgggYDFm17dXkS0cH6S5EmX6 luz1LX3Eo1sTraXQ3lH7/MkGkSoOKnEvkgpupAMCBC9NGofCZPhPr0vtjbqJHVqDrkws qJAdMxWpEwHFeHUb0U04rEOHIOxyOHOzZXs8bXJ4aqfB2NnJIWTr1aV133M69TptqEOM Cqyg== X-Gm-Message-State: APjAAAUJG21lQrpwf1x5NE/+xOYEKLSlygwpx3ZPIr3r35OlcHVI8tPq 7uQPv+rGe7vNQCylvEqqr7l4wjS/UN15aCUbxbfphJAqioVdI410kyZacKtkRMJUAZsWx66JUci o24EBa8jG+lkJSt94IkcNf9V4Ob/qzzjbxfpFhc6s5wIivJF+izCl8c/aV1oFqwUW8xtrwzOEJw == X-Google-Smtp-Source: APXvYqyRU0LZVcPWtHHZrERKAl27mwogAt6+FnB4yxVhw/aK7Ob1F1wrsG/rm4k4QQRTeI1EszqJIbqVp0I= X-Received: by 2002:a67:fa44:: with SMTP id j4mr10655278vsq.138.1565694246217; Tue, 13 Aug 2019 04:04:06 -0700 (PDT) Date: Tue, 13 Aug 2019 13:02:38 +0200 In-Reply-To: <20190813110300.83025-1-darekm@google.com> Message-Id: <20190813110300.83025-7-darekm@google.com> Mime-Version: 1.0 References: <20190813110300.83025-1-darekm@google.com> X-Mailer: git-send-email 2.23.0.rc1.153.gdeed80330f-goog Subject: [PATCH v6 6/8] drm: tegra: use cec_notifier_conn_(un)register From: Dariusz Marcinkiewicz To: dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, hverkuil-cisco@xs4all.nl X-Mailman-Approved-At: Thu, 15 Aug 2019 08:34:55 +0000 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=saq5XDceOIgoGr9TXKhDgKirX3SqKoE0qoHBi968/xk=; b=gDO1KkDTJUciiu/w2pWa46oNOHB2NW+diPTrQSe6UjOmk/n2EoRpy+rDWdBYJuiKzY 6x6LgDF5KDKyv9VXmseeyAu3LhFkBOtjkbVjLcCMTQsulzf1fQZYMwK97ErqMxCmCX3D S7EApgu5kjDAFza//vwbwwa1Gk59twIlmD1KY7DRHQFJrGUzS5zFJe0CbCc0GIqHF4io VFLPmmZnVQfYKNtjAbG8Evu6bf3DyEGgeEqB45NKR7BoQ3ILZ+L7a3sdX45sWfvGO1sY XSFc2NiIuWZftfLGRjyOg7nh1+UFJBut3iAOv4jzfoc8SYbt4t+/WIT5Jms6mAK+9E0I NTQA== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , open list , Jonathan Hunter , Thierry Reding , "open list:DRM DRIVERS FOR NVIDIA TEGRA" , Dariusz Marcinkiewicz Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Use the new cec_notifier_conn_(un)register() functions to (un)register the notifier for the HDMI connector, and fill in the cec_connector_info. Changes since v4: - only create a CEC notifier for HDMI connectors Signed-off-by: Dariusz Marcinkiewicz Tested-by: Hans Verkuil --- drivers/gpu/drm/tegra/output.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/tegra/output.c b/drivers/gpu/drm/tegra/output.c index bdcaa4c7168cf..34373734ff689 100644 --- a/drivers/gpu/drm/tegra/output.c +++ b/drivers/gpu/drm/tegra/output.c @@ -70,6 +70,11 @@ tegra_output_connector_detect(struct drm_connector *connector, bool force) void tegra_output_connector_destroy(struct drm_connector *connector) { + struct tegra_output *output = connector_to_output(connector); + + if (output->cec) + cec_notifier_conn_unregister(output->cec); + drm_connector_unregister(connector); drm_connector_cleanup(connector); } @@ -163,18 +168,11 @@ int tegra_output_probe(struct tegra_output *output) disable_irq(output->hpd_irq); } - output->cec = cec_notifier_get(output->dev); - if (!output->cec) - return -ENOMEM; - return 0; } void tegra_output_remove(struct tegra_output *output) { - if (output->cec) - cec_notifier_put(output->cec); - if (output->hpd_gpio) free_irq(output->hpd_irq, output); @@ -184,6 +182,7 @@ void tegra_output_remove(struct tegra_output *output) int tegra_output_init(struct drm_device *drm, struct tegra_output *output) { + int connector_type; int err; if (output->panel) { @@ -199,6 +198,21 @@ int tegra_output_init(struct drm_device *drm, struct tegra_output *output) if (output->hpd_gpio) enable_irq(output->hpd_irq); + connector_type = output->connector.connector_type; + /* + * Create a CEC notifier for HDMI connector. + */ + if (connector_type == DRM_MODE_CONNECTOR_HDMIA || + connector_type == DRM_MODE_CONNECTOR_HDMIB) { + struct cec_connector_info conn_info; + + cec_fill_conn_info_from_drm(&conn_info, &output->connector); + output->cec = cec_notifier_conn_register(output->dev, NULL, + &conn_info); + if (!output->cec) + return -ENOMEM; + } + return 0; }