From patchwork Wed Feb 11 15:06:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 5815251 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 45F54BF440 for ; Thu, 12 Feb 2015 01:54:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6A9EF201F4 for ; Thu, 12 Feb 2015 01:54:36 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 5B34E201ED for ; Thu, 12 Feb 2015 01:54:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 138116E395; Wed, 11 Feb 2015 17:54:34 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) by gabe.freedesktop.org (Postfix) with ESMTP id 7120F6E675 for ; Wed, 11 Feb 2015 07:08:23 -0800 (PST) Received: by mail-wi0-f178.google.com with SMTP id em10so4404101wid.5 for ; Wed, 11 Feb 2015 07:08:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=rL10ckGfNd1BKmbILLogOg9dPas5vXLKU+6ZOd4IMc0=; b=Pf4uieDmwf7XscjK50n/RZFK4FgZCPPfcuXeG4bWOVXh1En13XJB18Zh26CYuxb9Dl nbWlgfpKml/xQilg4aZA4fZMTfSYiHd/XvjOsy5+JUdFZ6N6Z08QnJx8Xb5lmLsRClJI kJ9lUgObn8hACMHgsdIBzm2erMqkWYgyiqBzWx2aEjcCX4zm4urjJhn3lyBWi8kot2e6 FH++ly4BneVp3HfVGvaQSbplgCsvcZJ3zWgJUl7GeH8YSq/KMwdQSTZyIiSD3e1gOJS/ 0xVWLODZvLwQw3DLs/RMusIRCJebc6fXUQ+z2MbeL15rSq8P/gB80DdY/YnjhiuCtQOV NTEw== X-Received: by 10.180.72.98 with SMTP id c2mr20561575wiv.87.1423667301490; Wed, 11 Feb 2015 07:08:21 -0800 (PST) Received: from cizrna.lan (37-48-32-149.tmcz.cz. [37.48.32.149]) by mx.google.com with ESMTPSA id l4sm4662472wiw.9.2015.02.11.07.08.19 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Feb 2015 07:08:20 -0800 (PST) From: Tomeu Vizoso To: linux-tegra@vger.kernel.org Subject: [PATCH v4 11/11] drm/tegra: Reset the SOR on probe Date: Wed, 11 Feb 2015 16:06:43 +0100 Message-Id: <1423667220-1062-12-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1423667220-1062-1-git-send-email-tomeu.vizoso@collabora.com> References: <1423667220-1062-1-git-send-email-tomeu.vizoso@collabora.com> X-Mailman-Approved-At: Wed, 11 Feb 2015 17:54:33 -0800 Cc: Alexandre Courbot , =?UTF-8?q?Terje=20Bergstr=C3=B6m?= , Tomeu Vizoso , Stephen Warren , Andrew Bresticker , Simon Glass , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Dylan Reid , Javier Martinez Canillas 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=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_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 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 --- 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",