From patchwork Wed Jan 10 12:11:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 10154963 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 91908602D8 for ; Wed, 10 Jan 2018 12:12:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 82FFE2850D for ; Wed, 10 Jan 2018 12:12:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 77DFA28516; Wed, 10 Jan 2018 12:12:03 +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=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID 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 E212C2850D for ; Wed, 10 Jan 2018 12:12:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 730C86E251; Wed, 10 Jan 2018 12:12:01 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qt0-x243.google.com (mail-qt0-x243.google.com [IPv6:2607:f8b0:400d:c0d::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0ADA06E251 for ; Wed, 10 Jan 2018 12:11:59 +0000 (UTC) Received: by mail-qt0-x243.google.com with SMTP id g10so21683501qtj.12 for ; Wed, 10 Jan 2018 04:11:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=3kaosHHSAgURlZBr7Xx0X7HbaOumD1pvVZpWI6HrM2M=; b=VqDewkfmJlXe7kRwF4FG6wMIHGwK8tS9sMy5Bvy7d+X+DE5uwXiE/6bPm2qlvhg83B SrKaiy9Tf30r7aKMdKpDMWKvg8aFMUL/NnbgZEv1bY8qCw8z4KZGbtrpsGK9W8X091gp 2nHvSrL736yAno0uZpqObPTp2D5OH5Z8/vuk48LyjcsB3lhVGLUy/+TIn0fuprNUd/pO Czhhxm6SPVHMPfzA1UNrTEvpfL8lTAed2sWxhHq9mHJoarec1PeJX9HExxsyo/HgXfrB Gejtxn6y8f35hHrqQt5vwDuYOtoV8KR01uqa7aNQTbb5B+ntUSWcAgTrVZTsVivm2gHB Dzpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=3kaosHHSAgURlZBr7Xx0X7HbaOumD1pvVZpWI6HrM2M=; b=Qqr0l/9MJEfAj+JOZpzyi/KgqG2b3si+8LQ4CbTnEVQmtPsy2f3cgix+3uS/75Net8 9pUNbhbsr7+tePt8/ZeTJAwfxEVuXV8Qj6UDdzOxg6xbeHhvf2TtAT4lyFRzsrVzJOlb 4BK3o4hBucPwqImyYgmoDQZS2FZGL6yDqRk7fFdHj41f9lUvnWRWABeMGhlvosk/A59O hFFXiWcASvgqInsfgKlQW7u7HglQGOKr6QY8sJ16KH1aK83/xkWZPMapdMQq2O+uQMq/ rMwk6CikqOSUgbnA9Jl5tK0PM7dMTuhjahcfGUzCmEbsM+hknrrNAzmhNfFpRkEBznBx HcJQ== X-Gm-Message-State: AKwxytexOYSzjdWW3A0mYzZWX229lLBw9WcsbW9VoKL1/KSrKrJ6pzxe qWbBssLw/omjjUrNcb6VHVQ= X-Google-Smtp-Source: ACJfBos/sCwn9Zz84Pg1GlnDb3W6JK2RlV7HpsB3hF8YRdSeMbDtXqwzjjTGeB0vzfWbE5N3QE2AWQ== X-Received: by 10.200.2.73 with SMTP id o9mr26463881qtg.46.1515586318803; Wed, 10 Jan 2018 04:11:58 -0800 (PST) Received: from localhost (p200300E41F1A2D00C4E4B29839822A7C.dip0.t-ipconnect.de. [2003:e4:1f1a:2d00:c4e4:b298:3982:2a7c]) by smtp.gmail.com with ESMTPSA id z8sm10535066qta.81.2018.01.10.04.11.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 10 Jan 2018 04:11:58 -0800 (PST) From: Thierry Reding To: Thierry Reding Subject: [PATCH] drm/tegra: sor: Fix hang on Tegra124 eDP Date: Wed, 10 Jan 2018 13:11:55 +0100 Message-Id: <20180110121155.26345-1-thierry.reding@gmail.com> X-Mailer: git-send-email 2.15.1 Cc: linux-tegra@vger.kernel.org, Guillaume Tucker , dri-devel@lists.freedesktop.org, Jonathan Hunter 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-Virus-Scanned: ClamAV using ClamSMTP From: Thierry Reding The SOR0 found on Tegra124 and Tegra210 only supports eDP and LVDS and therefore has a slightly different clock tree than the SOR1 which does not support eDP, but HDMI and DP instead. Commit e1335e2f0cfc ("drm/tegra: sor: Reimplement pad clock") breaks setups with eDP because the sor->clk_out clock is uninitialized and therefore setting the parent clock (either the safe clock or either of the display PLLs) fails, which can cause hangs later on since there is no clock driving the module. Fix this by falling back to the module clock for sor->clk_out on those setups. This guarantees that the module will always be clocked by an enabled clock and hence prevents those hangs. Fixes: e1335e2f0cfc ("drm/tegra: sor: Reimplement pad clock") Reported-by: Guillaume Tucker Tested-by: Jon Hunter Signed-off-by: Thierry Reding --- drivers/gpu/drm/tegra/sor.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c index b0a1dedac802..476079f1255f 100644 --- a/drivers/gpu/drm/tegra/sor.c +++ b/drivers/gpu/drm/tegra/sor.c @@ -2656,6 +2656,9 @@ static int tegra_sor_probe(struct platform_device *pdev) name, err); goto remove; } + } else { + /* fall back to the module clock on SOR0 (eDP/LVDS only) */ + sor->clk_out = sor->clk; } sor->clk_parent = devm_clk_get(&pdev->dev, "parent");