From patchwork Wed Apr 18 10:40:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schake X-Patchwork-Id: 900053 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Nnc4MKta"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40QzCW2STrz9s4q for ; Wed, 18 Apr 2018 20:40:07 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753153AbeDRKkG (ORCPT ); Wed, 18 Apr 2018 06:40:06 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:38953 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753100AbeDRKkF (ORCPT ); Wed, 18 Apr 2018 06:40:05 -0400 Received: by mail-wr0-f193.google.com with SMTP id q6-v6so3456523wrd.6; Wed, 18 Apr 2018 03:40:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=xdYDgIG/E8k1MPG63YUiwpNYLlD+9U5ECTGfEO+dX2k=; b=Nnc4MKtarWW0+egbHrMIeBQId7kOsXpZ0XsndwduRY2rFydhd+1GlI3Q92gNPk/vft 2KB3VdgFpTxzstGRWW1oIpAVINEpX2CAfdtCKLjHP/R7OHQnkNNTtgbU5DtphGD+tD3u YKzOTiLh8fTrVL7MpZxMQXIPjMW92xWcxkV1yjguH76vc68xqrY+uplbKlGZ24M68Ezv NwnKoXpzCdCEn+euLkCtFDYYHpHiiWgzyEV7PpQuku5nCfT7mM0pE8ECctRSm4lKjAaY rC6ce/kQirAI41LUmsrVngoRUE6aQzZxlLyErsRuFPS149AvgFb/8uKJsq2AGjs9FA11 YWMw== 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=xdYDgIG/E8k1MPG63YUiwpNYLlD+9U5ECTGfEO+dX2k=; b=CaC968Z1nPdWnhqE1XpxF4hu8pfWW+WYktQ7wO/MRZMfOaaKFEC8NAr/tQaLwek8kI 9um5EUPVeAPhmAwRhTJnJ9YHOHgebn4XvKTV24jDCV2KZxitezFYY9FVu6qPNyX0Ss5G SOuR5QyxuQyzglbVqgacl2sw9QypYlfhDmCcLTrZwIurJG/AwMblWy6uE5TDj44xj0ti ZThZZ/pvs01DC8qEQ2deFQDvUMc0aepMpiKmUOqsUsh+436r0MYHTXxIIGL/ltVX5Gk9 EhsdpFrWmxie+gofXg604P2FtfBXgqtoZLRiHds2xaFa8nBVtZjNzGeR7jX8/OqwcMfy ytjw== X-Gm-Message-State: ALQs6tAj4NgGkQJLZOpaU8FIU+QH5Wco6ABA2znwICYQVLgn4jkfhUB+ ZOR0qAJ0u28jqNiiD+TgUFk= X-Google-Smtp-Source: AIpwx49WppBMhPc1Gau8MlybXVWI6PrgYfaQIL3Llf9yJFMNtsl6tnBa7KTOZ0S4X3OeqPRz7lwJbw== X-Received: by 10.28.30.73 with SMTP id e70mr1283795wme.62.1524048003999; Wed, 18 Apr 2018 03:40:03 -0700 (PDT) Received: from localhost.localdomain (ws-ss-2.emteria.embedded.rwth-aachen.de. [134.130.30.229]) by smtp.gmail.com with ESMTPSA id 55-v6sm1855005wrw.52.2018.04.18.03.40.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Apr 2018 03:40:02 -0700 (PDT) From: Stefan Schake To: thierry.reding@gmail.com Cc: airlied@linux.ie, jonathanh@nvidia.com, dri-devel@lists.freedesktop.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, Stefan Schake Subject: [PATCH] drm/tegra: hub: Use state directly Date: Wed, 18 Apr 2018 03:40:19 -0700 Message-Id: <20180418104019.31344-1-stschake@gmail.com> X-Mailer: git-send-email 2.14.1 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org Using drm_atomic_get_private_obj_state after state has been swapped will return old state. Fixes: 0281c4149021 ("drm/tegra: hub: Use private object for global state") Signed-off-by: Stefan Schake --- drivers/gpu/drm/tegra/hub.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/tegra/hub.c b/drivers/gpu/drm/tegra/hub.c index 9a3f23d4780f..bdd2cdd0745c 100644 --- a/drivers/gpu/drm/tegra/hub.c +++ b/drivers/gpu/drm/tegra/hub.c @@ -683,12 +683,11 @@ void tegra_display_hub_atomic_commit(struct drm_device *drm, { struct tegra_drm *tegra = drm->dev_private; struct tegra_display_hub *hub = tegra->hub; - struct tegra_display_hub_state *hub_state; + struct tegra_display_hub_state *hub_state = + to_tegra_display_hub_state(hub->base.state); struct device *dev = hub->client.dev; int err; - hub_state = tegra_display_hub_get_state(hub, state); - if (hub_state->clk) { err = clk_set_rate(hub_state->clk, hub_state->rate); if (err < 0)