From patchwork Wed Jul 31 15:52:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 11068565 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 A5025912 for ; Wed, 31 Jul 2019 15:52:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 92D3F212D6 for ; Wed, 31 Jul 2019 15:52:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 86DE821327; Wed, 31 Jul 2019 15:52:59 +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 43F082223E for ; Wed, 31 Jul 2019 15:52:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1DA1C89DF7; Wed, 31 Jul 2019 15:52:56 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk1-x742.google.com (mail-qk1-x742.google.com [IPv6:2607:f8b0:4864:20::742]) by gabe.freedesktop.org (Postfix) with ESMTPS id A959189DF7; Wed, 31 Jul 2019 15:52:54 +0000 (UTC) Received: by mail-qk1-x742.google.com with SMTP id 201so49579834qkm.9; Wed, 31 Jul 2019 08:52:54 -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:mime-version :content-transfer-encoding; bh=RgZ5DHzJSyKB7ekOyjgS1cC2bC/5MtEMJe0naQB8c5g=; b=DZQ/5qR+vbYASw7A/6iPQHWaA5guuRy5eofJskCsfjUB16KMovTuZkyGDTpqamCf1g P3FDLOBxWBmLkU5ANkh2GnEakYyKff29Dnp7SP9WbR2R8Yokb9XBGuug46IATWjxtVMd QUpXTsLzU3dRRyLtzyvpdz/TaOSF9ukV8MkQZb4biIuDVQR0mmgxqEOo4AANzH9Amawp RnWgvu2TVdbra2HKwFBiRiEy47Lif6Y5yyrrjnlIic1+BnqorkzXM6156+xn3EHkTQJL oL/YkpyO+h3uAxZD9SLGEFBHSLwAYsIWESL+/WDU8TaCZg/95ITXWgOfWPsstU81gRPL 3vJw== X-Gm-Message-State: APjAAAUGSLWBpYamA4+gjdOb0p/wQ/m92yvjDud9UX/5cjcM69ROvnso 0kHFfy+hlm4eXp6I76iWwRxq7w8W X-Google-Smtp-Source: APXvYqyvsStBQaKfsLCYii3jrt4y9vxzxc6W8xIWBzh6WbhSTEf3U9wuhJr41M5On2z31N3MDmx8lQ== X-Received: by 2002:ae9:c10c:: with SMTP id z12mr81515742qki.110.1564588373542; Wed, 31 Jul 2019 08:52:53 -0700 (PDT) Received: from localhost.localdomain ([71.219.6.100]) by smtp.gmail.com with ESMTPSA id v17sm38020296qtc.23.2019.07.31.08.52.52 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 08:52:52 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH 1/8] drm/amdgpu: drop drmP.h in amdgpu_amdkfd_arcturus.c Date: Wed, 31 Jul 2019 10:52:39 -0500 Message-Id: <20190731155246.20603-1-alexander.deucher@amd.com> X-Mailer: git-send-email 2.20.1 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:mime-version :content-transfer-encoding; bh=RgZ5DHzJSyKB7ekOyjgS1cC2bC/5MtEMJe0naQB8c5g=; b=SCNbMznevIniW1RGqg+ZeRP+hXh3co/z1YNMlq9IwWdeH99uNqgo8aoPBwftNjMAfM uiX5x6uIvFzcw/dzGT4WNxjDZoOzURmQYhV5ixkhKIwLQXW6FkHaCDBqezOL+X7ZrmB4 Lqkqe/i6HFlhGUhfhdcXKx/QGgyV9jffB4ZyG68lE/L5Jt8MDRxmj0eOsSQUJHWZC9Cs +09eqSuOd0ISeYNYA0LUpyAt4Ja7itGpH0c81+o3qg9tTu5U/ZR/L0dQkMOXIMrvClWj k3K/0UniFjoHucula9OQ2iMvKbAsbt3TtoOJzQg10eE4vxW4yFvZkPS+sCzwmG7iq7RM 5Veg== 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 Unused. Signed-off-by: Alex Deucher Acked-by: Sam Ravnborg Reviewed-by: Felix Kuehling Reviewed-by: Christian König for the whole --- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c index 4d9101834ba7..c79aaebeeaf0 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c @@ -28,7 +28,6 @@ #include #include #include -#include #include "amdgpu.h" #include "amdgpu_amdkfd.h" #include "sdma0/sdma0_4_2_2_offset.h" From patchwork Wed Jul 31 15:52:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 11068567 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 E2C541395 for ; Wed, 31 Jul 2019 15:53:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D071B23201 for ; Wed, 31 Jul 2019 15:53:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CE71E262AE; Wed, 31 Jul 2019 15:53:06 +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 21F8323201 for ; Wed, 31 Jul 2019 15:53:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C0BC289F61; Wed, 31 Jul 2019 15:53:00 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qt1-x844.google.com (mail-qt1-x844.google.com [IPv6:2607:f8b0:4864:20::844]) by gabe.freedesktop.org (Postfix) with ESMTPS id 86B5189DF7; Wed, 31 Jul 2019 15:52:55 +0000 (UTC) Received: by mail-qt1-x844.google.com with SMTP id k10so67147860qtq.1; Wed, 31 Jul 2019 08:52:55 -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=d3jr30uHX5GuaBAnJLptVszN+2CiQR2q9FKc7zTu4C4=; b=lbbLDkoQTpFn2g6LuY2xSrbv/MItnGHR/2BcBs6Vn5j3p15RTv0zUjZVcjcUt4hlkx wRE6wDgaWUBhgplnhldKK0ScxHXwU1ZztW4DqSi1E9F/CXy02VcpsyJ+anE7cg7uDIA9 u7BmRLLAiI+rki7riiKJHkma9MRWuvX3CGwk9FIMYHiNhd90eDjx4HJMOB4tO8lOxK5/ /jL3K6pvqOcd/pF0wk0XliLrOLZCYM26WICwlP9eAWrTtj9/uUJrOF8vndu7bhUc7wGV S3uKjJ7rPZr77IJLJ4wClUXfMJKXA5ZBg5c05qy9Oyg7WHSCba/hR1g11MxF9SbnFNye ZZ0Q== X-Gm-Message-State: APjAAAV31+ADQrp4gNdnyuVh/gGH6wvS3dLc41L429YVYieFdhB4ynz4 BbwhG2Hz9o331kN34uhoDRuvFvba X-Google-Smtp-Source: APXvYqw+K5dWOSfysvgEz9KIMdM6P076rq9vI83Da3RYYR+KMhDP4WR6tWUz3Courh7opWwIoiJIYw== X-Received: by 2002:ac8:2379:: with SMTP id b54mr87567187qtb.168.1564588374433; Wed, 31 Jul 2019 08:52:54 -0700 (PDT) Received: from localhost.localdomain ([71.219.6.100]) by smtp.gmail.com with ESMTPSA id v17sm38020296qtc.23.2019.07.31.08.52.53 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 08:52:53 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH 2/8] drm/amdgpu: drop drmP.h from amdgpu_amdkfd_gfx_v10.c Date: Wed, 31 Jul 2019 10:52:40 -0500 Message-Id: <20190731155246.20603-2-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=d3jr30uHX5GuaBAnJLptVszN+2CiQR2q9FKc7zTu4C4=; b=AiqAPxNKvYEYICUAq6wcp5MBEc64DIsoU3C4X1mt+LIxrChtWNGjXsDd7aGMIjiqie RnK4GjyGT7ma/khflE1e/jOBCn9AOrYl5z/8joUXcjyeFc7f3tJutTyruoKakCkMM33b leMLZjdTfuT0MSQHk0PBJGmx0V1Kw95J0RWszwX/wbwn3PYAzSzoIBQNCCdfg+fOHM0h V+ZtowWt6LQleQqY4n8w4XRtQhPBzgMweRQagaxtCC615eCpQj5fgkrgu3SWYN17QXm+ kW9KbF+ZTVbrH0WPCfUJgpIw0FTAsKaEl8G7OgXGq9XewWizX6VGHA6NzLgqyawzUHTA LUDA== 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 Unused. Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c index 0723f800e815..7c03a7fcd011 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c @@ -27,7 +27,6 @@ #include #include #include -#include #include "amdgpu.h" #include "amdgpu_amdkfd.h" #include "amdgpu_ucode.h" 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) { From patchwork Wed Jul 31 15:52:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 11068571 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 7BD111395 for ; Wed, 31 Jul 2019 15:53:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 695E62624C for ; Wed, 31 Jul 2019 15:53:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5B41326256; Wed, 31 Jul 2019 15:53:10 +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 18D2B26256 for ; Wed, 31 Jul 2019 15:53:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 928A989F53; Wed, 31 Jul 2019 15:53:00 +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 4562189F35; Wed, 31 Jul 2019 15:52:57 +0000 (UTC) Received: by mail-qk1-x741.google.com with SMTP id r21so49666142qke.2; Wed, 31 Jul 2019 08:52:57 -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=pZTtPetgDRQ8hFiKWSTItZlk0M/Ni/u6pmU+1bz/XO0=; b=qaCJXtzb3iaPxsLm7AfKFy3dYuSYxLswmjQwNbeuDaorfiLqw4b6shTWsk+yyQH0U8 CNiOnNUTjRX46RaK0PCquApWo/9XsOaqHZGq4ofITqk7pBIUFNW/UyEbgaqivb2ZT6cR KQQT7TRP6kvqepoY8tDtlToCYZXxQqcRideh1Yq+Sig/Bg9X0bZuSURTvjysfquEIVCy 8hoDTQf3Yu1JdZeNjC5TBiJg1+Up/uIh+7a+AC0KJcW0tWMxj4Mw7QtJPt+Wk+4PON82 2LZo5NjcvFjOJwAcZIoUHCCCedSc5D5CV9BopzOh4ivrXrzRARcA1DK8ajFMjlvUlgVi vfgA== X-Gm-Message-State: APjAAAXBSN/z3f+8+P+F3gHVJ7bVz/Dnj+/TL2GgbEUdzU9zvSPpcC0P 9yw5UeFZnBV/ptVkacan8EukDt7c X-Google-Smtp-Source: APXvYqyFN3rx+fyxXIi+XAPZc6ipa/ACTNgZeOsDRRYAKQWtn3bRFfg5l6aBw0O6zmLpqWI9vzjo0w== X-Received: by 2002:ae9:ea0b:: with SMTP id f11mr80083502qkg.142.1564588376128; Wed, 31 Jul 2019 08:52:56 -0700 (PDT) Received: from localhost.localdomain ([71.219.6.100]) by smtp.gmail.com with ESMTPSA id v17sm38020296qtc.23.2019.07.31.08.52.55 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 08:52:55 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH 4/8] drm/amdgpu: drop drmP.h from navi10_ih.c Date: Wed, 31 Jul 2019 10:52:42 -0500 Message-Id: <20190731155246.20603-4-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=pZTtPetgDRQ8hFiKWSTItZlk0M/Ni/u6pmU+1bz/XO0=; b=DFsDrF6d+OBBNGJ0umf0Pdm7iN+k1iVqXLl7zYPesnviQhE9BS8srUP0sRlf1QDPiK DG9up02aLgux/jD5l0c1R9bxu/GrJ8u+XWZ7JC3YAsFMLSy5f91rnepcVN7qBDOkFh+1 BVJ4LzvgGsShKz/Qmob+VzscaApoQNjaEjGxy9FK+Bv+bsumrG2CoDs1DlYG7E4Amkkp bwbUNjRQNliKcWCGEv7orfCg13swENEB2k60AORUXnlEeWIMwCm6Wca10kV0aLdTC85Y 3BgE1aWF3jsMWWhzNjM2VxTCS+iuhQszX7KhTaHEUKSBob8djYlrQ/Xw2cBRzPNtF8YA XIaw== 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/navi10_ih.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/navi10_ih.c b/drivers/gpu/drm/amd/amdgpu/navi10_ih.c index e963746be11c..9fe08408db58 100644 --- a/drivers/gpu/drm/amd/amdgpu/navi10_ih.c +++ b/drivers/gpu/drm/amd/amdgpu/navi10_ih.c @@ -21,7 +21,8 @@ * */ -#include +#include + #include "amdgpu.h" #include "amdgpu_ih.h" From patchwork Wed Jul 31 15:52:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 11068579 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 603011395 for ; Wed, 31 Jul 2019 15:53:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4B3C0232A7 for ; Wed, 31 Jul 2019 15:53:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3F150262AE; Wed, 31 Jul 2019 15:53:17 +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 EDCF526256 for ; Wed, 31 Jul 2019 15:53:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 58AF989FC0; Wed, 31 Jul 2019 15:53:06 +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 F035289F41; Wed, 31 Jul 2019 15:52:57 +0000 (UTC) Received: by mail-qk1-x741.google.com with SMTP id 201so49579999qkm.9; Wed, 31 Jul 2019 08:52:57 -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=ncnmY9aTrcAW3wfwWiq91DK9wslQ3PB1TYL8VfjolEA=; b=pRz2rEbSym88S2jFFJcCjIMOrn4ekHlZSwGnwf29YQBTeGSZOXx27Ugfd1yRgNms6W WMAJe+qny87m5SL7taIQYudDNfAGybsnGuB91t3KdYnHGFMiwCvRnD1eHSyIvk3G7bYV EhKzELTpAKMr4ViG0/XmO5bP7kwU1ZFYOoZuJVLAqgjePP/gweezzHfORlEcMB1pGFwd zpQ2A86M4aQ0vw8DqBKZ7u0aWnb5tvLaUGF4SKuvc7a8xdaR1wd//kzLHANZ54yTYzpA mzFFK7gJHZJvGFOYDdeL0efHaUacsTt/jwSD7r9gJi1hQjNjeBVqbxsDUq0y+3CnSe+3 U41Q== X-Gm-Message-State: APjAAAUWPxL+18vsuPSarRipi7ZsoSRIqOtaLTh0oVIimfZLaYfm0F/s rjfHWZJUPB2xydhqwQa4uBuVyC/y X-Google-Smtp-Source: APXvYqwquqxPahIU8O8X0u8G9yn6SdRNaXr0ZrkQBylTkD8BGQdvB3WIwWlSj46ayhvPFGoE6Ll9Xg== X-Received: by 2002:a37:a358:: with SMTP id m85mr59016011qke.190.1564588376902; Wed, 31 Jul 2019 08:52:56 -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:56 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH 5/8] drm/amdgpu: drop drmP.h from nv.c Date: Wed, 31 Jul 2019 10:52:43 -0500 Message-Id: <20190731155246.20603-5-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=ncnmY9aTrcAW3wfwWiq91DK9wslQ3PB1TYL8VfjolEA=; b=JBPg2j+QZC5P7JRT+4sDzNQ7s28hZMh+d29Y5p+70YQVnY0koj3Xg5vBYNiD5sQ5ri 5J4APPF1j2vBuMjgUBpdlUcHqKtQ+psk5fT/9jSZk3ZZZT7GLcdd3+pYSkHPIYCBqQxO ik1SacCdcGdxmcS8IFWNPtJfoe6jhlwL5+/pHXAK4UEpmozK8uRBIFSsgUUjb75xr0Pz fs8Hbr5w5O6c6fqTCXH86Zw+TQueyOQE9DVKm1LI1p5/cvAdwr74gHWDZiotJaH5CZLY McfOwffB40a3OpBWNQHGbuGIEe3j5pvMzlJW2pJfhKvIVSl054atHwVCWeTLNpZLiece 4W2A== 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 up the fallout. Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/nv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c index e4885e2d281a..595a907f4ea7 100644 --- a/drivers/gpu/drm/amd/amdgpu/nv.c +++ b/drivers/gpu/drm/amd/amdgpu/nv.c @@ -23,7 +23,8 @@ #include #include #include -#include +#include + #include "amdgpu.h" #include "amdgpu_atombios.h" #include "amdgpu_ih.h" 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) { From patchwork Wed Jul 31 15:52:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 11068575 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 91ED5912 for ; Wed, 31 Jul 2019 15:53:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D0E726490 for ; Wed, 31 Jul 2019 15:53:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 713062675C; Wed, 31 Jul 2019 15:53:15 +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 8A45E2624D for ; Wed, 31 Jul 2019 15:53:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 64F8B89FA0; Wed, 31 Jul 2019 15:53:04 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qt1-x844.google.com (mail-qt1-x844.google.com [IPv6:2607:f8b0:4864:20::844]) by gabe.freedesktop.org (Postfix) with ESMTPS id 87B1289F41; Wed, 31 Jul 2019 15:52:59 +0000 (UTC) Received: by mail-qt1-x844.google.com with SMTP id n11so67052120qtl.5; Wed, 31 Jul 2019 08:52:59 -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=/e5rJ71qFKXwmIyoLAyWzrsP41pcnkto0tL41pV0reU=; b=ZLFIvCKgiwIkpDDKPOxNkrGgwnWO5j9/EBhHU5Lx3OMlHHvOudlRpCLRxSsRSSNee3 Y2jeBkgoa4uBV6wD9SVPStx+db3NihN1Ckk7r8dZbWxuQGeu80G1FQ2EfYcrrYydDUxO Ug+mJS5xywXbUG1r8qTeFrVnmAiaca9FezyBsE9n0ZgqwlxSAkvHqtuN4aokXVPVICZJ Si82hnJC2x66S+b7ReLr7xKyUZsOV+unbJqZNopCGjEPGTfGX6nFo9/JeUKAkG8xj6PJ bUiHnng7fapHU1rjhhOWAr9atz2AU1ZY4DoRDA8f18zZyXXZieX3rGfDc9zdjxSh80O8 G4/A== X-Gm-Message-State: APjAAAWLpZehROgbAV2NpWncN1C7uSNiLvVeqLGyzm4/Kqyhwdp/Af06 Kn/Prs0WVROll0O+6Ih3ZVCYz1BV X-Google-Smtp-Source: APXvYqzW17+MVwsRkq2GOLzpebcujZzy0rxgUdBgtKwlXBTOdpL/J6EYwBukE1leubD8/joIoYkJUw== X-Received: by 2002:aed:36e8:: with SMTP id f95mr85048312qtb.88.1564588378460; Wed, 31 Jul 2019 08:52:58 -0700 (PDT) Received: from localhost.localdomain ([71.219.6.100]) by smtp.gmail.com with ESMTPSA id v17sm38020296qtc.23.2019.07.31.08.52.57 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 08:52:58 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH 7/8] drm/amdgpu: drop drmP.h from vcn_v2_0.c Date: Wed, 31 Jul 2019 10:52:45 -0500 Message-Id: <20190731155246.20603-7-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=/e5rJ71qFKXwmIyoLAyWzrsP41pcnkto0tL41pV0reU=; b=HkMKZi/AZR7g6DkVyKLH+VJ9RYZtfkvyKg5PqWMA+vgEIgIuRVJaMnWQA2dLi1IKPe P3Mrl9ySg15P8/7+sLr4mgaNW0ESiI2NuUTvXXi/4ao0B1E5C9Fr4VSDKh5G+R7p5oA8 lJwvbm3MIJ0GuhkjAy3BS6LBDHO9iN5Jnb/FmqvPqDARJiuEHib/0SPXbnkv/mbuaqY7 9H22asRM56pE3kDCcAeHTew2XeEF4LQL6dEs2V1v98x/FtX3c/ydnsLPhwC58PsqUn04 hsGxKofPfE4sd/uB1LPQUPqOuPtGJzxBdojwOvNgBeqNiFcwS/PRngw5/zdQKie3pBq/ MPaw== 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/vcn_v2_0.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c index eef3ec5449af..36ad0c0e8efb 100644 --- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c @@ -22,7 +22,7 @@ */ #include -#include + #include "amdgpu.h" #include "amdgpu_vcn.h" #include "soc15.h" @@ -2112,7 +2112,7 @@ static int vcn_v2_0_dec_ring_test_ring(struct amdgpu_ring *ring) tmp = RREG32(adev->vcn.inst[ring->me].external.scratch9); if (tmp == 0xDEADBEEF) break; - DRM_UDELAY(1); + udelay(1); } if (i >= adev->usec_timeout) From patchwork Wed Jul 31 15:52:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 11068577 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 ABC6C1395 for ; Wed, 31 Jul 2019 15:53:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 99DBD228C9 for ; Wed, 31 Jul 2019 15:53:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9809B26256; Wed, 31 Jul 2019 15:53:16 +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 24213228C9 for ; Wed, 31 Jul 2019 15:53:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C707389FA7; Wed, 31 Jul 2019 15:53:04 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qt1-x843.google.com (mail-qt1-x843.google.com [IPv6:2607:f8b0:4864:20::843]) by gabe.freedesktop.org (Postfix) with ESMTPS id B494A89F55; Wed, 31 Jul 2019 15:53:00 +0000 (UTC) Received: by mail-qt1-x843.google.com with SMTP id k10so67148157qtq.1; Wed, 31 Jul 2019 08:53:00 -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=7qnZYKNjiUhAwGuuvpfbDJ1bk+viLzpxBeBvEog8Bpo=; b=YlIxc06Q0KdSUno7FzxKPJZBjJosP9UaM3kWTJ2rNBiqGvAH57nWparU0l6F7D/ieg /mtua+Yh/3MxKmJw7Oe7uqMO7gz2+EI5NhJsl8WahEdJcpFfHlsskHF4UcEn1l4nYVn3 nvGDBa3iOogp0yMVLPzryiThv8WmqWhemv7RS8nRLZVCtiwOKbeTr0t/ONgMfMp+KNib dTzPBmt1iOWip4QE4LFT/f0O996bVwogjIuNuBAcdmE/hzK5/kmki7qzEd3J1CXkZsWD 4JQU44FQ8nARaLtRPxqZMVS3EOBm7jQ2VrEUYR3bbWrRLRIWzIBeiIU22eLb/EkN+YNz I8+A== X-Gm-Message-State: APjAAAUrgbuNqduvXtqDNEH8E4LOX+zBNRD7adcElM/Urq3cTkbk82XP Lc3KygTzqXJzl445BIOeRTJWk9dv X-Google-Smtp-Source: APXvYqw3vHZ04iuFPp1elgRzMZD95yqmZZKx+HhEUWnQ0XI8+8EPVtgAZMI+EzhomQnmr4U/cLrLtg== X-Received: by 2002:a0c:e5c6:: with SMTP id u6mr70338339qvm.102.1564588379564; Wed, 31 Jul 2019 08:52:59 -0700 (PDT) Received: from localhost.localdomain ([71.219.6.100]) by smtp.gmail.com with ESMTPSA id v17sm38020296qtc.23.2019.07.31.08.52.58 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 08:52:59 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH 8/8] drm/amdgpu: drop drmP.h from vcn_v2_5.c Date: Wed, 31 Jul 2019 10:52:46 -0500 Message-Id: <20190731155246.20603-8-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=7qnZYKNjiUhAwGuuvpfbDJ1bk+viLzpxBeBvEog8Bpo=; b=llYiqZ63eT80/4HXi7U3mXjRDJmVkILtGToKuGSuZ4nmbf8rcBuXp8ERsvSFAp0lrz mhrhbXgGw8Karg7NKYt77QSlOkX4itVSMTsgmm5cBtj9cVqsV7olGuVqqKkuh/uUU8P7 8kwIafHDXmFmvyEojhtNYCBlt+5amxHEi1wRZCZUq1wYkdpAq9802Dl3UKakBFWghW5I gGNal5yGCDzdZ3naLqjp4kUGwKClcoaSHdkgepwM4SEydSp1e5KkC2/v0rD36nTmKWHb aoVtRz8ZiVE398xZmk8PicbX1F4zYXoOBlBRCDCzHiW8mUIC8IaGb8fhmrg7Rr71Y8uy akSw== 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 Unused. Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c index 0c84dbc6a62d..395c2259f979 100644 --- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c @@ -22,7 +22,7 @@ */ #include -#include + #include "amdgpu.h" #include "amdgpu_vcn.h" #include "soc15.h"