From patchwork Thu Oct 24 16:45:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 11210307 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1A70B1747 for ; Thu, 24 Oct 2019 16:46:47 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 031AD21906 for ; Thu, 24 Oct 2019 16:46:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 031AD21906 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5059B6E51D; Thu, 24 Oct 2019 16:46:35 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by gabe.freedesktop.org (Postfix) with ESMTPS id B9E7D6E4B0 for ; Thu, 24 Oct 2019 16:46:30 +0000 (UTC) Received: by mail-wr1-x442.google.com with SMTP id w18so26324238wrt.3 for ; Thu, 24 Oct 2019 09:46:30 -0700 (PDT) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=D2UeHNMAu5Kp/NPx+tAQiEXLV+mubgyLK0Vp0oNiIw4=; b=OFxhayJ2OpxbKPMvSYhued0WmKehtRuKdC0WwGLlD4qtVjiFFAgVO/CMPo6VIYXUmm m2QUppQvFrRM79ooEfmzP3rgp8zNt44OP9Ycxz7nQfQHgfTIPaog8WJoeY+8wfRak1KY nG78eDSDfgMlZUxy1b6srcjf+ROWh7yBCTo/79Xkoq0vcT1jANmnKgXwuchnEy2xgphf MU/MtgIsXxMYPFK22ttGpkYHxigfog8fykzy0ZEvabW+xT/Dr6ERRhJXq2i/nMmwX3/5 USWKPYWgrX8NRGbKnnDqFpnvQALujGDjfQyYOL9aYwWhFiVXr7q0EPOI/q6ckIqjQHz8 97pQ== X-Gm-Message-State: APjAAAXBDb8YqeNvqL48xcDGTMgzFc5nAUzZVD16Bd1DyRjWMLVpFQ0+ N/MaVN/Mx7cfTd0bQEC4rAk= X-Google-Smtp-Source: APXvYqzGma/6UYiNaI9+S5cw8bjU4PeFSo4H3FYFriV7jsX8/NdZXwin70oGzSbXfI/jbdfyI0l1nQ== X-Received: by 2002:adf:b219:: with SMTP id u25mr4502900wra.327.1571935589180; Thu, 24 Oct 2019 09:46:29 -0700 (PDT) Received: from localhost (p2E5BE2CE.dip0.t-ipconnect.de. [46.91.226.206]) by smtp.gmail.com with ESMTPSA id p1sm3659739wmg.11.2019.10.24.09.46.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2019 09:46:27 -0700 (PDT) From: Thierry Reding To: Thierry Reding Subject: [PATCH 23/32] drm/tegra: sor: Use correct SOR index on Tegra210 Date: Thu, 24 Oct 2019 18:45:25 +0200 Message-Id: <20191024164534.132764-24-thierry.reding@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191024164534.132764-1-thierry.reding@gmail.com> References: <20191024164534.132764-1-thierry.reding@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=D2UeHNMAu5Kp/NPx+tAQiEXLV+mubgyLK0Vp0oNiIw4=; b=X9rcVWrs/1mfietCC2Er6ap+BVS2bZF8wpnpbAb+UxfvqyrEPrvT0pmGgLzuLi7iTE xL//lYlvsOAnDFOPFrBHZWhNYLo3PF+Wke7ApVj5xqvkVSbAs7DsP6aJ6bOfxWVGa39i hOCgIF3R3LiLBZfrJJxnWB1NRTN+akgb5dQZ6EtiyXu6HVOLrk5zFryt46fpcyFjPyk6 iBjXn6Y0dca9oW+5vgb4g73Jnaf85320gIZ96QScP2k3+CaHdXZTF1xvOHcDPLb7+OZG MxloX42KS60/VyYHyCBn3qJ0/P6q9ljEv91y4PRJBqSAlgVC64u97AFyh2ZFsuSI7+aC 4FEg== 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: linux-tegra@vger.kernel.org, dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Thierry Reding The device tree bindings for the Tegra210 SOR don't require the controller instance to be defined, since the instance can be derived from the compatible string. The index is never used on Tegra210, so we got away with it not getting set. However, subsequent patches will change that, so make sure the proper index is used. Signed-off-by: Thierry Reding --- drivers/gpu/drm/tegra/sor.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c index 4e46524f22e3..c7faf088cabc 100644 --- a/drivers/gpu/drm/tegra/sor.c +++ b/drivers/gpu/drm/tegra/sor.c @@ -3759,6 +3759,11 @@ static int tegra_sor_parse_dt(struct tegra_sor *sor) * earlier */ sor->pad = TEGRA_IO_PAD_HDMI_DP0 + sor->index; + } else { + if (sor->soc->supports_edp) + sor->index = 0; + else + sor->index = 1; } err = of_property_read_u32_array(np, "nvidia,xbar-cfg", xbar_cfg, 5);