From mboxrd@z Thu Jan 1 00:00:00 1970 From: 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> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: thierry.reding@gmail.com Cc: airlied@linux.ie, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Stefan Schake , linux-tegra@vger.kernel.org, jonathanh@nvidia.com List-Id: linux-tegra@vger.kernel.org VXNpbmcgZHJtX2F0b21pY19nZXRfcHJpdmF0ZV9vYmpfc3RhdGUgYWZ0ZXIgc3RhdGUgaGFzIGJl ZW4gc3dhcHBlZAp3aWxsIHJldHVybiBvbGQgc3RhdGUuCgpGaXhlczogMDI4MWM0MTQ5MDIxICgi ZHJtL3RlZ3JhOiBodWI6IFVzZSBwcml2YXRlIG9iamVjdCBmb3IgZ2xvYmFsIHN0YXRlIikKU2ln bmVkLW9mZi1ieTogU3RlZmFuIFNjaGFrZSA8c3RzY2hha2VAZ21haWwuY29tPgotLS0KIGRyaXZl cnMvZ3B1L2RybS90ZWdyYS9odWIuYyB8IDUgKystLS0KIDEgZmlsZSBjaGFuZ2VkLCAyIGluc2Vy dGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3Rl Z3JhL2h1Yi5jIGIvZHJpdmVycy9ncHUvZHJtL3RlZ3JhL2h1Yi5jCmluZGV4IDlhM2YyM2Q0Nzgw Zi4uYmRkMmNkZDA3NDVjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdGVncmEvaHViLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL3RlZ3JhL2h1Yi5jCkBAIC02ODMsMTIgKzY4MywxMSBAQCB2 b2lkIHRlZ3JhX2Rpc3BsYXlfaHViX2F0b21pY19jb21taXQoc3RydWN0IGRybV9kZXZpY2UgKmRy bSwKIHsKIAlzdHJ1Y3QgdGVncmFfZHJtICp0ZWdyYSA9IGRybS0+ZGV2X3ByaXZhdGU7CiAJc3Ry dWN0IHRlZ3JhX2Rpc3BsYXlfaHViICpodWIgPSB0ZWdyYS0+aHViOwotCXN0cnVjdCB0ZWdyYV9k aXNwbGF5X2h1Yl9zdGF0ZSAqaHViX3N0YXRlOworCXN0cnVjdCB0ZWdyYV9kaXNwbGF5X2h1Yl9z dGF0ZSAqaHViX3N0YXRlID0KKwkJdG9fdGVncmFfZGlzcGxheV9odWJfc3RhdGUoaHViLT5iYXNl LnN0YXRlKTsKIAlzdHJ1Y3QgZGV2aWNlICpkZXYgPSBodWItPmNsaWVudC5kZXY7CiAJaW50IGVy cjsKIAotCWh1Yl9zdGF0ZSA9IHRlZ3JhX2Rpc3BsYXlfaHViX2dldF9zdGF0ZShodWIsIHN0YXRl KTsKLQogCWlmIChodWJfc3RhdGUtPmNsaykgewogCQllcnIgPSBjbGtfc2V0X3JhdGUoaHViX3N0 YXRlLT5jbGssIGh1Yl9zdGF0ZS0+cmF0ZSk7CiAJCWlmIChlcnIgPCAwKQotLSAKMi4xNC4xCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwg bWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753262AbeDRKkG (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 X-Google-Smtp-Source: AIpwx49WppBMhPc1Gau8MlybXVWI6PrgYfaQIL3Llf9yJFMNtsl6tnBa7KTOZ0S4X3OeqPRz7lwJbw== 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-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@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) -- 2.14.1