From patchwork Wed Jul 31 15:52:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 11068573 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 3C974912 for ; Wed, 31 Jul 2019 15:53:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2AFAD1FFE4 for ; Wed, 31 Jul 2019 15:53:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1E3AE26530; Wed, 31 Jul 2019 15:53:12 +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,DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,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 D70A52624C for ; Wed, 31 Jul 2019 15:53:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 22DAD89F77; Wed, 31 Jul 2019 15:53:01 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5E78189F2A; Wed, 31 Jul 2019 15:52:56 +0000 (UTC) Received: by mail-qk1-x741.google.com with SMTP id r6so49632403qkc.0; Wed, 31 Jul 2019 08:52:56 -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=dm4/Q3Pzv5uPs38Q3w4deJjqtn3Adu0zibSRSatQK6E=; b=fPFg7iIjyPkiqrxQ3+nI8qSkaCVUEJZ7ri/4AKqaM9C+PTbxmY6SxSqsEL0PHUVWbE plIouw7lE4zo6MaEmiFt1blM+11d5pA1ANBhi8n9lYKtBlsrRp9yYEHDUgg7Fex4KY5+ T4VNexw60tXGoQT0s5y6j5ZrsxZHT2i9eHMNE8jI0pTDU25aCSZKAq7Ryd+GDoZJm6Gz 1CAB6BDFm7D3+bmVxkO6UTxJ3hMtdYWW7CdDJ2uFUeNtZ1U9b6nOt1MlVmttZm8f7JSn laLA/tz8zlksMGJFBVOy1ZqmkHuO/5iXnEJ035GUTIEVORuqJk5jjyGlXrUrmK4MnBqo sSxQ== X-Gm-Message-State: APjAAAV9/02g14ikT3wV2Jup878U6323MzVF8I9tFzE7wglBbK48SFyr +bkiZEsZmx78iUkq4UWMYmMoo7zd X-Google-Smtp-Source: APXvYqxN9YuzU1RztthJwuJ/t9++vJWPUp/TqTviBMOrfMaIXeD0CWqw8Hc0Lf3SnnTt2y6iEqztLg== X-Received: by 2002:a05:620a:4:: with SMTP id j4mr80933195qki.269.1564588375274; Wed, 31 Jul 2019 08:52:55 -0700 (PDT) Received: from localhost.localdomain ([71.219.6.100]) by smtp.gmail.com with ESMTPSA id v17sm38020296qtc.23.2019.07.31.08.52.54 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 08:52:54 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH 3/8] drm/amdgpu: drop drmP.h in gfx_v10_0.c Date: Wed, 31 Jul 2019 10:52:41 -0500 Message-Id: <20190731155246.20603-3-alexander.deucher@amd.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190731155246.20603-1-alexander.deucher@amd.com> References: <20190731155246.20603-1-alexander.deucher@amd.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=dm4/Q3Pzv5uPs38Q3w4deJjqtn3Adu0zibSRSatQK6E=; b=cY1H072gJCMV7MVP4RgRDRl+U/DCYJPRqRte9pb47WE9ldwBl7xQ/kB3pTqGpRUEwP ppSnUqVKx1ZEyJKkY664DQHR2JLBF8oHJRST+bjckqd5P76FxeQlM6dRBVG/fosKoNQP sN/Doo/oOPGDckkB703cgfTIA9deMOcwqY1I13uaXr2L6ovxhLaDSqSu5TsLC/1gtLGB hnpMcfa2MgLg45YWDigqqscyhMJovNoEbqRy/lrefOMeDX7sgcq2x/ZsCd1bgLPC2CI3 kC7OlKLueMGA3SKxq9WpsgdNNM0ChzclPcyWQi6XCHk98LaDJpdhc7LneSe11WeNR84m B//A== 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: Alex Deucher Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP And fix the fallout. Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c index e8731df40340..82732178d365 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c @@ -20,8 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. * */ + +#include +#include #include -#include +#include +#include #include "amdgpu.h" #include "amdgpu_gfx.h" #include "amdgpu_psp.h" @@ -393,7 +397,7 @@ static int gfx_v10_0_ring_test_ring(struct amdgpu_ring *ring) if (amdgpu_emu_mode == 1) msleep(1); else - DRM_UDELAY(1); + udelay(1); } if (i < adev->usec_timeout) { if (amdgpu_emu_mode == 1) @@ -4551,7 +4555,7 @@ static int gfx_v10_0_ring_preempt_ib(struct amdgpu_ring *ring) if (ring->trail_seq == le32_to_cpu(*(ring->trail_fence_cpu_addr))) break; - DRM_UDELAY(1); + udelay(1); } if (i >= adev->usec_timeout) {