* [PATCH 3/8] drm/amdgpu: drop drmP.h in gfx_v10_0.c
[not found] ` <20190731155246.20603-1-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
@ 2019-07-31 15:52 ` Alex Deucher
2019-07-31 15:52 ` [PATCH 4/8] drm/amdgpu: drop drmP.h from navi10_ih.c Alex Deucher
` (6 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Alex Deucher @ 2019-07-31 15:52 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Alex Deucher
And fix the fallout.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
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 <linux/delay.h>
+#include <linux/kernel.h>
#include <linux/firmware.h>
-#include <drm/drmP.h>
+#include <linux/module.h>
+#include <linux/pci.h>
#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) {
--
2.20.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 4/8] drm/amdgpu: drop drmP.h from navi10_ih.c
[not found] ` <20190731155246.20603-1-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
2019-07-31 15:52 ` [PATCH 3/8] drm/amdgpu: drop drmP.h in gfx_v10_0.c Alex Deucher
@ 2019-07-31 15:52 ` Alex Deucher
2019-07-31 15:52 ` [PATCH 5/8] drm/amdgpu: drop drmP.h from nv.c Alex Deucher
` (5 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Alex Deucher @ 2019-07-31 15:52 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Alex Deucher
And fix the fallout.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
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 <drm/drmP.h>
+#include <linux/pci.h>
+
#include "amdgpu.h"
#include "amdgpu_ih.h"
--
2.20.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 5/8] drm/amdgpu: drop drmP.h from nv.c
[not found] ` <20190731155246.20603-1-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
2019-07-31 15:52 ` [PATCH 3/8] drm/amdgpu: drop drmP.h in gfx_v10_0.c Alex Deucher
2019-07-31 15:52 ` [PATCH 4/8] drm/amdgpu: drop drmP.h from navi10_ih.c Alex Deucher
@ 2019-07-31 15:52 ` Alex Deucher
2019-07-31 15:52 ` [PATCH 6/8] drm/amdgpu: drop drmP.h from sdma_v5_0.c Alex Deucher
` (4 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Alex Deucher @ 2019-07-31 15:52 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Alex Deucher
And fix up the fallout.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
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 <linux/firmware.h>
#include <linux/slab.h>
#include <linux/module.h>
-#include <drm/drmP.h>
+#include <linux/pci.h>
+
#include "amdgpu.h"
#include "amdgpu_atombios.h"
#include "amdgpu_ih.h"
--
2.20.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 6/8] drm/amdgpu: drop drmP.h from sdma_v5_0.c
[not found] ` <20190731155246.20603-1-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
` (2 preceding siblings ...)
2019-07-31 15:52 ` [PATCH 5/8] drm/amdgpu: drop drmP.h from nv.c Alex Deucher
@ 2019-07-31 15:52 ` Alex Deucher
2019-07-31 15:52 ` [PATCH 7/8] drm/amdgpu: drop drmP.h from vcn_v2_0.c Alex Deucher
` (3 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Alex Deucher @ 2019-07-31 15:52 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Alex Deucher
And fix the fallout.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
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 <linux/delay.h>
#include <linux/firmware.h>
-#include <drm/drmP.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+
#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) {
--
2.20.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 7/8] drm/amdgpu: drop drmP.h from vcn_v2_0.c
[not found] ` <20190731155246.20603-1-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
` (3 preceding siblings ...)
2019-07-31 15:52 ` [PATCH 6/8] drm/amdgpu: drop drmP.h from sdma_v5_0.c Alex Deucher
@ 2019-07-31 15:52 ` Alex Deucher
2019-07-31 17:26 ` [PATCH 1/8] drm/amdgpu: drop drmP.h in amdgpu_amdkfd_arcturus.c Sam Ravnborg
` (2 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Alex Deucher @ 2019-07-31 15:52 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Alex Deucher
And fix the fallout.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
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 <linux/firmware.h>
-#include <drm/drmP.h>
+
#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)
--
2.20.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH 1/8] drm/amdgpu: drop drmP.h in amdgpu_amdkfd_arcturus.c
[not found] ` <20190731155246.20603-1-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
` (4 preceding siblings ...)
2019-07-31 15:52 ` [PATCH 7/8] drm/amdgpu: drop drmP.h from vcn_v2_0.c Alex Deucher
@ 2019-07-31 17:26 ` Sam Ravnborg
2019-07-31 20:31 ` Kuehling, Felix
2019-08-01 7:26 ` Christian König
7 siblings, 0 replies; 11+ messages in thread
From: Sam Ravnborg @ 2019-07-31 17:26 UTC (permalink / raw)
To: Alex Deucher
Cc: Alex Deucher, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Hi Alex.
On Wed, Jul 31, 2019 at 10:52:39AM -0500, Alex Deucher wrote:
> Unused.
>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> 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 <linux/uaccess.h>
> #include <linux/mmu_context.h>
> #include <linux/firmware.h>
> -#include <drm/drmP.h>
> #include "amdgpu.h"
> #include "amdgpu_amdkfd.h"
> #include "sdma0/sdma0_4_2_2_offset.h"
Thanks!
All patches are:
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Actual status in drm-misc:
$ git grep drmP | cut -d '/' -f 1 | sort | uniq -c
6 amd <= fixed by this patchset
8 arm <= patch sent. Needs to rebase and resend
6 armada <= patch sent. Needs to rebase and resend
1 etnaviv <= already fixed in etnaviv repo
2 exynos <= Somehow missed these. Patch ready, needs to send it out
1 i2c <= patch sent. Needs to rebase and resend
2 msm <= patch sent. Needs to rebase and resend
27 nouveau <= already fixed in nouveau repo
4 tegra <= patch sent. Needs to reabse and resend
13 vmwgfx <= already fixed in vmwgfx repo
So things looks doable. I just need to find a few hours..
Sam
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 1/8] drm/amdgpu: drop drmP.h in amdgpu_amdkfd_arcturus.c
[not found] ` <20190731155246.20603-1-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
` (5 preceding siblings ...)
2019-07-31 17:26 ` [PATCH 1/8] drm/amdgpu: drop drmP.h in amdgpu_amdkfd_arcturus.c Sam Ravnborg
@ 2019-07-31 20:31 ` Kuehling, Felix
2019-08-01 7:26 ` Christian König
7 siblings, 0 replies; 11+ messages in thread
From: Kuehling, Felix @ 2019-07-31 20:31 UTC (permalink / raw)
To: Alex Deucher, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Deucher, Alexander
On 2019-07-31 11:52 a.m., Alex Deucher wrote:
> Unused.
>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
The series is
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
> ---
> 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 <linux/uaccess.h>
> #include <linux/mmu_context.h>
> #include <linux/firmware.h>
> -#include <drm/drmP.h>
> #include "amdgpu.h"
> #include "amdgpu_amdkfd.h"
> #include "sdma0/sdma0_4_2_2_offset.h"
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 1/8] drm/amdgpu: drop drmP.h in amdgpu_amdkfd_arcturus.c
[not found] ` <20190731155246.20603-1-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
` (6 preceding siblings ...)
2019-07-31 20:31 ` Kuehling, Felix
@ 2019-08-01 7:26 ` Christian König
7 siblings, 0 replies; 11+ messages in thread
From: Christian König @ 2019-08-01 7:26 UTC (permalink / raw)
To: Alex Deucher, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Alex Deucher
Am 31.07.19 um 17:52 schrieb Alex Deucher:
> Unused.
>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com> for the whole
series.
> ---
> 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 <linux/uaccess.h>
> #include <linux/mmu_context.h>
> #include <linux/firmware.h>
> -#include <drm/drmP.h>
> #include "amdgpu.h"
> #include "amdgpu_amdkfd.h"
> #include "sdma0/sdma0_4_2_2_offset.h"
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread