drm/amdgpu: drop drmP.h in amdgpu_amdkfd_arcturus.c
Subsystems (3)
PATCH 1/8 drm/amdgpu: drop drmP.h in amdgpu_amdkfd_arcturus.c
Unused.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c +0 -1
@@ -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"
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/8 drm/amdgpu: drop drmP.h from amdgpu_amdkfd_gfx_v10.c
Unused.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c +0 -1
@@ -27,7 +27,6 @@#include <linux/uaccess.h> #include <linux/firmware.h> #include <linux/mmu_context.h> -#include <drm/drmP.h> #include "amdgpu.h" #include "amdgpu_amdkfd.h" #include "amdgpu_ucode.h"
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
A message that is not in the archive (sent off-list or not yet received): 20190731155246.20603-1-alexander.deucher-5C7GfCeVMHo@public.gmane.org
PATCH 3/8 drm/amdgpu: drop drmP.h in gfx_v10_0.c
And fix the fallout.
--- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +7 -3
@@ -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) {
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/8 drm/amdgpu: drop drmP.h from navi10_ih.c
In reply to a message not in the archiveAnd fix the fallout.
--- drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/navi10_ih.c +2 -1
@@ -21,7 +21,8 @@* */ -#include <drm/drmP.h> +#include <linux/pci.h> +#include "amdgpu.h" #include "amdgpu_ih.h"
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/8 drm/amdgpu: drop drmP.h from nv.c
In reply to a message not in the archiveAnd fix up the fallout.
--- drivers/gpu/drm/amd/amdgpu/nv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/nv.c +2 -1
@@ -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"
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/8 drm/amdgpu: drop drmP.h from sdma_v5_0.c
In reply to a message not in the archiveAnd fix the fallout.
--- drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +6 -3
@@ -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) {
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 7/8 drm/amdgpu: drop drmP.h from vcn_v2_0.c
In reply to a message not in the archiveAnd fix the fallout.
--- drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +2 -2
@@ -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)
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Sam Ravnborg
Acked-byHi Alex.
Quoted 12 lines · Alex Deucher
Unused.
Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 1 - 1 file changed, 1 deletion(-)drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c +0
-0
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c line 33
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c +0
-1@@ -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:
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 repoSo things looks doable. I just need to find a few hours..
Sam
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Kuehling, Felix
Reviewed-by Felix KuehlingQuoted 3 lines · Alex Deucher
Unused.
Signed-off-by Alex Deucher <[email protected]>
The series is
Quoted 9 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 1 - 1 file changed, 1 deletion(-)drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c +0
-0
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c line 33
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c +0
-1@@ -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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Christian König
Reviewed-byAm 31.07.19 um 17:52 schrieb Alex Deucher:
Quoted 3 lines
Unused.
Signed-off-by Alex Deucher <[email protected]>
Quoted 9 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 1 - 1 file changed, 1 deletion(-)drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c +0
-0
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c line 33
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c +0
-1@@ -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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 8/8 drm/amdgpu: drop drmP.h from vcn_v2_5.c
In reply to Alex DeucherUnused.
--- drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +1 -1
@@ -22,7 +22,7 @@*/ #include <linux/firmware.h> -#include <drm/drmP.h> +#include "amdgpu.h" #include "amdgpu_vcn.h" #include "soc15.h"
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel