From patchwork Wed Jul 3 09:51:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Keeping X-Patchwork-Id: 11029285 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 03FCB13B1 for ; Wed, 3 Jul 2019 10:14:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E70DC2873E for ; Wed, 3 Jul 2019 10:14:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D9ED3288D8; Wed, 3 Jul 2019 10:14:52 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED 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 85D1C2873E for ; Wed, 3 Jul 2019 10:14:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C0E6D89916; Wed, 3 Jul 2019 10:14:50 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org X-Greylist: delayed 1385 seconds by postgrey-1.36 at gabe; Wed, 03 Jul 2019 10:14:48 UTC Received: from metanate.com (dougal.metanate.com [90.155.101.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id F0C6789916 for ; Wed, 3 Jul 2019 10:14:48 +0000 (UTC) Received: from dougal.metanate.com ([192.168.88.1] helo=localhost.localdomain) by shrek.metanate.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.90_1) (envelope-from ) id 1hibvN-0007n1-RF; Wed, 03 Jul 2019 10:51:37 +0100 From: John Keeping To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/rockchip: fix VOP_WIN_GET macro Date: Wed, 3 Jul 2019 10:51:11 +0100 Message-Id: <20190703095111.29117-1-john@metanate.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 X-Authenticated: YES X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/simple; d=metanate.com; s=stronger; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject :Cc:To:From:Sender:Reply-To:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=FsG5of+uogpMKIH8K3uyNKGNXBJ5USBikcfZgWGQm/8=; b=Jf++4RD1yPfm9SobiBV3MgNpmS vWHTVY7UHqkPY13KYgZmuoO6/Y+955jVvtN7gf5IUXWQMQkukydG+5Kb3SHDHfS1Vm694kVfYPFq1 wcc80C34pPUEAzvBD2ueaqkZ24hYOaeuhWOm40tDlNMM5ozdSrJdqNGDgIGD9kuvwXVUb1VcfyHVR U0TxBB58FtOfVJje6m/LMlfXmeH9ZFe/V4IbVdZRm8zEDdRXmCUFnYh2ixYC189f+Dub2Z1w7cMsw /EJf/Ple/didf0VyGP4ueggdtGGPuAWH+1YwPHbtyFCTuQgzygWpmXDZ+qz+j1fCH4B/uyC/CS0b6 0ysU255A==; 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-rockchip@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Commit 9a61c54b9bff ("drm/rockchip: vop: group vop registers") seems to have unintentionally changed the defintion of this macro. Since it is unused, this was not spotted but any attempt to use it results in compilation errors. Revert to the previous definition. Fixes: 9a61c54b9bff ("drm/rockchip: vop: group vop registers") Signed-off-by: John Keeping --- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index 09a790c2f3a1..a3430da3c008 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -79,7 +79,7 @@ vop_get_intr_type(vop, &vop->data->intr->name, type) #define VOP_WIN_GET(vop, win, name) \ - vop_read_reg(vop, win->offset, win->phy->name) + vop_read_reg(vop, win->base, &win->phy->name) #define VOP_WIN_HAS_REG(win, name) \ (!!(win->phy->name.mask))