From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tomeu Vizoso Subject: [PATCH v6 09/12] drm/tegra: Reset the SOR on probe Date: Wed, 18 Mar 2015 10:52:24 +0100 Message-ID: <1426672363-30667-10-git-send-email-tomeu.vizoso@collabora.com> References: <1426672363-30667-1-git-send-email-tomeu.vizoso@collabora.com> Return-path: In-Reply-To: <1426672363-30667-1-git-send-email-tomeu.vizoso-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org> Sender: linux-tegra-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Tomeu Vizoso , Thierry Reding , =?UTF-8?q?Terje=20Bergstr=C3=B6m?= , David Airlie , Stephen Warren , Alexandre Courbot , dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: linux-tegra@vger.kernel.org As there isn't a way for the firmware on the Nyan chromebooks to hand over the display to the kernel. Signed-off-by: Tomeu Vizoso Acked-by: Stephen Warren Reviewed-by: Alexandre Courbot --- drivers/gpu/drm/tegra/sor.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c index 2afe478..e6caacc 100644 --- a/drivers/gpu/drm/tegra/sor.c +++ b/drivers/gpu/drm/tegra/sor.c @@ -1458,6 +1458,20 @@ static int tegra_sor_probe(struct platform_device *pdev) mutex_init(&sor->lock); + err = reset_control_assert(sor->rst); + if (err < 0) { + dev_err(&pdev->dev, "failed to assert SOR reset: %d\n", err); + return err; + } + + msleep(20); + + err = reset_control_deassert(sor->rst); + if (err < 0) { + dev_err(&pdev->dev, "failed to deassert SOR reset: %d\n", err); + return err; + } + err = host1x_client_register(&sor->client); if (err < 0) { dev_err(&pdev->dev, "failed to register host1x client: %d\n", -- 2.1.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755741AbbCRJzY (ORCPT ); Wed, 18 Mar 2015 05:55:24 -0400 Received: from mail-we0-f182.google.com ([74.125.82.182]:34276 "EHLO mail-we0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932913AbbCRJxp (ORCPT ); Wed, 18 Mar 2015 05:53:45 -0400 From: Tomeu Vizoso To: linux-tegra@vger.kernel.org Cc: Tomeu Vizoso , Thierry Reding , =?UTF-8?q?Terje=20Bergstr=C3=B6m?= , David Airlie , Stephen Warren , Alexandre Courbot , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 09/12] drm/tegra: Reset the SOR on probe Date: Wed, 18 Mar 2015 10:52:24 +0100 Message-Id: <1426672363-30667-10-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1426672363-30667-1-git-send-email-tomeu.vizoso@collabora.com> References: <1426672363-30667-1-git-send-email-tomeu.vizoso@collabora.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As there isn't a way for the firmware on the Nyan chromebooks to hand over the display to the kernel. Signed-off-by: Tomeu Vizoso Acked-by: Stephen Warren Reviewed-by: Alexandre Courbot --- drivers/gpu/drm/tegra/sor.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c index 2afe478..e6caacc 100644 --- a/drivers/gpu/drm/tegra/sor.c +++ b/drivers/gpu/drm/tegra/sor.c @@ -1458,6 +1458,20 @@ static int tegra_sor_probe(struct platform_device *pdev) mutex_init(&sor->lock); + err = reset_control_assert(sor->rst); + if (err < 0) { + dev_err(&pdev->dev, "failed to assert SOR reset: %d\n", err); + return err; + } + + msleep(20); + + err = reset_control_deassert(sor->rst); + if (err < 0) { + dev_err(&pdev->dev, "failed to deassert SOR reset: %d\n", err); + return err; + } + err = host1x_client_register(&sor->client); if (err < 0) { dev_err(&pdev->dev, "failed to register host1x client: %d\n", -- 2.1.0