From patchwork Wed Jul 31 15:52:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 11068569 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 CE22E1395 for ; Wed, 31 Jul 2019 15:53:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B87BF26246 for ; Wed, 31 Jul 2019 15:53:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B16622624D; Wed, 31 Jul 2019 15:53:08 +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 3F7851FFB1 for ; Wed, 31 Jul 2019 15:53:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5902A89F89; 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-x744.google.com (mail-qk1-x744.google.com [IPv6:2607:f8b0:4864:20::744]) by gabe.freedesktop.org (Postfix) with ESMTPS id F13A789F53; Wed, 31 Jul 2019 15:52:58 +0000 (UTC) Received: by mail-qk1-x744.google.com with SMTP id m14so23917480qka.10; Wed, 31 Jul 2019 08:52:58 -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=4NiYDIrset4mGLXztd7Mn8p14SBJemz0OAMUZ7s/5js=; b=VseWcNtkrj716S2e2Yf3HuXwr0OeTpu09zz1Ih6UlgazXUNhcnT1warOpF575NP3Dy N0NqZDy1MZP6xpboHaA+H8H/Lap0Rq4h/xvdZ5EXruHQnXfuEnxH95S6i0wNxlcIXAgf lQesbnBSxmIJTxozcp29f1vEnfPGtVbo4DsNGgZfpMEiM25Kk2lKNsrnJ004p2F+F0bq +gxW6AZ1UY6bEE6+nul/DDOAMqzT3upXVJ3OquTI8oYW0BXXl8I+lf5xMt+nA3QROwNT PK+s6fvhEi9bM1ZESb9OZL/P0X9egf0pwjB4xzKMUNfQmLQGPeAg0/nc1tFS9lK1W1Zy 1uiQ== X-Gm-Message-State: APjAAAUiadffWnPqUe7f9gtC6J7mP6LRfbEM7fWyw6HcCqIZ/QMLazfp foKmCVblVh+CI/T1yjWs+CPtSTBV X-Google-Smtp-Source: APXvYqw5xH0+LxWonSoKbuJSsj768REMO69gWO7/md/a0jsVCcWVll3Jn/zCAR+WSgkPpy+C0WtNOQ== X-Received: by 2002:a05:620a:533:: with SMTP id h19mr81197899qkh.325.1564588377676; Wed, 31 Jul 2019 08:52:57 -0700 (PDT) Received: from localhost.localdomain ([71.219.6.100]) by smtp.gmail.com with ESMTPSA id v17sm38020296qtc.23.2019.07.31.08.52.56 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 08:52:57 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH 6/8] drm/amdgpu: drop drmP.h from sdma_v5_0.c Date: Wed, 31 Jul 2019 10:52:44 -0500 Message-Id: <20190731155246.20603-6-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=4NiYDIrset4mGLXztd7Mn8p14SBJemz0OAMUZ7s/5js=; b=aYzslemneA9znWAS9RfNCJv/j0vDFQrN0LojuUA+CbT1KstJk8Z20AqmxnkCfNSLQT p9XoXW85QnLubWHJSLSPGh2ACOFXIu+svG2nWUBiyV6HiLHi2pRhIJK9CjVqcj4cCZSl SgHbGZU8pW1OQlCVwYkbR+RqE74wYndh5QiLasqbR8ZIrn9shazQZNuw8UmhRzP3dc7R 6XpV5sB5mqtM/pmkhEmDkpTgJ7ySwbq4hh6ptf/ekx6IPaYdlTFwHMog7zGkazYKxitX aG0D8VTogseI+id8invi+KxpEGq83yC81YdAU1fhbsfia7G7NAEHYypv2bBmMpQ5JG+C lpzA== 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/sdma_v5_0.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c index 3e536140bfd6..aa43dc6c599a 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c @@ -21,8 +21,11 @@ * */ +#include #include -#include +#include +#include + #include "amdgpu.h" #include "amdgpu_ucode.h" #include "amdgpu_trace.h" @@ -882,7 +885,7 @@ static int sdma_v5_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) { @@ -1337,7 +1340,7 @@ static int sdma_v5_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) {