From patchwork Thu Nov 2 11:26:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 117795 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp2038012qgn; Thu, 2 Nov 2017 04:27:28 -0700 (PDT) X-Google-Smtp-Source: ABhQp+SfESq3qZ2IEv9ERqxx3c2SBR9+n+wPYazAVSUNpQnN2S/y4/hvcsZlkDn9juyvwmjtDy9P X-Received: by 10.101.92.68 with SMTP id v4mr3191776pgr.45.1509622048199; Thu, 02 Nov 2017 04:27:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509622048; cv=none; d=google.com; s=arc-20160816; b=XOJGvoIWC/Qa3GITrgSMHKOS91/VC6MYQ0kdsN8TQTDa8SX9oDfSvT8+F9k9fWjU5Q Eq8bd0l1T3gPYECpgK0B0p+MVro9J3ef0dvmkgzgsVSryGmvERmAbo3+n065OhJUoXMp ZZmzItDpsbdS1lTxMR/yt1ARf5/8123ppNTtkz/cYqrxDsH9FsQhlAzG8Kc/ypIb2lms /3nx5kesi6E1dzdyAEMwmlTJKRifHoCnggqBkYnJzSm3aazJxTQo7sVKool9mHLB3SXv vocQeUqwGhgWnkX77VJrWGe/CYSZc7j26pdRGW3Sh8QULzDbTnKnSLw/b7inXvfZ0D0x lfPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:cc:references:in-reply-to:message-id:date :subject:to:from:delivered-to:arc-authentication-results; bh=vN6/alUIhqkieyAXrjb8TwIP9FJxskzljzt0tMUzqs8=; b=OuZ9+gFQjJ6n3TYedvw+HWDCGnthReQ2OWtqnWuD+7uv36FJOmmmk3NIW5tBGW+DCz aWzcrZuFiWV5UDl8vfFOCAIrl5mYF38CzUbL/a8swYHDq+wXXBn7vGwmF5D8V48+/VrE P8UljXkzI8uqi1vvgND/YmoNirRi7erXoDIUBVPs/fC+KI6g6joaOYlVZhN04JymwKms jUwrT2BcrHb16VqyZCIHNRS1l+C1cZXL+zfdYJmdzqOvU7es9DT+f/G5CeryGNA5FQRy UQ9UQWxTdkLkHSVi34PMtfn4i4gKRqyAGJ555Z2Vncfq4MdmS3A+NGfEQgHrxJ+ktnFf rbZA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id s2si2207291plk.270.2017.11.02.04.27.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Nov 2017 04:27:28 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) 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 54FA46E8ED; Thu, 2 Nov 2017 11:27:27 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.74]) by gabe.freedesktop.org (Postfix) with ESMTPS id EAE2D6E8ED for ; Thu, 2 Nov 2017 11:27:25 +0000 (UTC) Received: from wuerfel.lan ([109.193.157.232]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.145]) with ESMTPA (Nemesis) id 0MUEy2-1djNPb3oVm-00QzQI; Thu, 02 Nov 2017 12:27:18 +0100 From: Arnd Bergmann To: Alex Deucher , =?utf-8?q?Christian_K=C3=B6n?= =?utf-8?q?ig?= Subject: [PATCH 2/3] drm/amdgpu/display: remove unused REG_OFFSET macro Date: Thu, 2 Nov 2017 12:26:42 +0100 Message-Id: <20171102112657.111405-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20171102112657.111405-1-arnd@arndb.de> References: <20171102112657.111405-1-arnd@arndb.de> X-Provags-ID: V03:K0:bpwN8oNlNYPe6hOuadP3wSlA60D1lF93nI51nRuhDwInYxqoJH8 LjU/ChVtyQ68XtlXoMFqnGbe+FDGPDC4hdo7xlkIsis39FrntrL8tdJdY+ce+ExEGLN029e cWakiAjR8iODKGIHyxzzJKG6FM2hpw8LkkTyktkECdTOCo5s83qwy7KtsE6kAyEI14uh46i P220RgMCg24XceThQuopA== X-UI-Out-Filterresults: notjunk:1; V01:K0:ytunwqdDlwI=:sECzR4hGr3T+r4K/aOtPCQ PO7huwGZd/A9RHtCCOT8EbEo1preOVDVt8viMkm7s4dT6Crf5j560MJ9nZmnb9gsVhvDdaD3s uW+/L1nbHvNYD0W0aEt3LkfX1sJUpNhQoB5WapOaFaUKL53ncmrQJw2xHbwzbClWAVuJ1PzhD OtwK5YZLIYc1A9omfSY5SdkZTXJLAF5Q7D57LizOFMT9KC2cFAZg/VFIHCi4WiXjYhVcll/Xc STCV6kkNl2m35Yy1Oikjo5C2L66W0N403VwOsiPX/1YJsMMSComH3jOE8BT6p7F9LnnjBUYX0 xNOf7iwUSk/ukQ8HIIa7JvaKh8TNT0jn6KgG6/2ZGybluNkw5jXhyerI+DBqPv9jVfR0N0xdV TiDcJoniY0ekRVK2Oj62v1lG7L/mXZeG/nw7h6RK0siuhp9FY9b68M3x1tttpDouR+mXW4vyC 0R1frc64sbPcxsY0ur3gfTCi3OTX8PuQSq+i0uj7jJcOT98aTXMdKKTwhupjXWh4QshewqlkZ fWSKlRC9eiiZf+Krl8r02itRQ7DMjG4wmdiegxiXRiakYX1JlyJCb7wlyym+bXCOauo4wIbO3 zLf+CnXVAf0ioznz/97/afUEv1q6OIJWGy0ByYP8CKdk1e0AURCuY8NlJcnbqk1lXhdsQY/DK Kq6NOrGOcp4DWmk/iHNsgyP7RT+EqP80ZfUNsERGMCDbNqCZeIh3e+i2ZfjrPugx+JtcprYEt 40cA3uBLdrYdrGM70OFaqN0WMrP3MUsTu7dqXg== Cc: Arnd Bergmann , David Airlie , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, Dmytro Laktyushkin , dri-devel@lists.freedesktop.org, Dave Airlie , Tony Cheng 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" The name conflicts with another macro of the same name on the ARM ixp4xx platform, leading to build errors. Neither of the users actually should use a name that generic, but the other one was here first and the dc driver doesn't actually use it. Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/amd/display/dc/dm_services.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/dm_services.h b/drivers/gpu/drm/amd/display/dc/dm_services.h index c8190c38a644..d4917037ac42 100644 --- a/drivers/gpu/drm/amd/display/dc/dm_services.h +++ b/drivers/gpu/drm/amd/display/dc/dm_services.h @@ -160,9 +160,6 @@ unsigned int generic_reg_wait(const struct dc_context *ctx, /* These macros need to be used with soc15 registers in order to retrieve * the actual offset. */ -#define REG_OFFSET(reg) (reg + DCE_BASE.instance[0].segment[reg##_BASE_IDX]) -#define REG_BIF_OFFSET(reg) (reg + NBIF_BASE.instance[0].segment[reg##_BASE_IDX]) - #define dm_write_reg_soc15(ctx, reg, inst_offset, value) \ dm_write_reg_func(ctx, reg + DCE_BASE.instance[0].segment[reg##_BASE_IDX] + inst_offset, value, __func__)