Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c366be54 authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

drm/amd: drop dependencies on drm_os_linux.h 



Fix so no files in drm/amd/ depends on the
deprecated drm_os_linux.h header file.

It was done manually:
- remove drm_os_linux.h from drmP.h
- fix all build errros

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: "David (ChunMing) Zhou" <David1.Zhou@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20190609220757.10862-3-sam@ravnborg.org
parent 656600ef

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c

+3 −1
Original line number Diff line number Diff line
@@ -22,10 +22,12 @@ 


#define pr_fmt(fmt) "kfd2kgd: " fmt



#include <linux/dma-buf.h>

#include <linux/list.h>

#include <linux/pagemap.h>

#include <linux/sched/mm.h>

#include <linux/dma-buf.h>

#include <linux/sched/task.h>



#include <drm/drmP.h>

#include "amdgpu_object.h"

#include "amdgpu_vm.h"

drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 
 *

 */



#include <linux/io-64-nonatomic-lo-hi.h>



#include "amdgpu.h"



/**

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

+10 −7
Original line number Diff line number Diff line
@@ -29,6 +29,16 @@ 
 *    Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>

 *    Dave Airlie

 */



#include <linux/debugfs.h>

#include <linux/iommu.h>

#include <linux/pagemap.h>

#include <linux/sched/task.h>

#include <linux/seq_file.h>

#include <linux/slab.h>

#include <linux/swap.h>

#include <linux/swiotlb.h>



#include <drm/ttm/ttm_bo_api.h>

#include <drm/ttm/ttm_bo_driver.h>

#include <drm/ttm/ttm_placement.h>
@@ -36,13 +46,6 @@ 
#include <drm/ttm/ttm_page_alloc.h>

#include <drm/drmP.h>

#include <drm/amdgpu_drm.h>

#include <linux/seq_file.h>

#include <linux/slab.h>

#include <linux/swiotlb.h>

#include <linux/swap.h>

#include <linux/pagemap.h>

#include <linux/debugfs.h>

#include <linux/iommu.h>

#include "amdgpu.h"

#include "amdgpu_object.h"

#include "amdgpu_trace.h"

drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c

+1 −1
Original line number Diff line number Diff line
@@ -1090,7 +1090,7 @@ int amdgpu_vce_ring_test_ring(struct amdgpu_ring *ring) 
	for (i = 0; i < timeout; i++) {

		if (amdgpu_ring_get_rptr(ring) != rptr)

			break;

		DRM_UDELAY(1);

		udelay(1);

	}



	if (i >= timeout)

drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c

+4 −4
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ int amdgpu_vcn_dec_ring_test_ring(struct amdgpu_ring *ring) 
		tmp = RREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_SCRATCH9));

		if (tmp == 0xDEADBEEF)

			break;

		DRM_UDELAY(1);

		udelay(1);

	}



	if (i >= adev->usec_timeout)
@@ -608,7 +608,7 @@ int amdgpu_vcn_enc_ring_test_ring(struct amdgpu_ring *ring) 
	for (i = 0; i < adev->usec_timeout; i++) {

		if (amdgpu_ring_get_rptr(ring) != rptr)

			break;

		DRM_UDELAY(1);

		udelay(1);

	}



	if (i >= adev->usec_timeout)
@@ -767,7 +767,7 @@ int amdgpu_vcn_jpeg_ring_test_ring(struct amdgpu_ring *ring) 
		tmp = RREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_SCRATCH9));

		if (tmp == 0xDEADBEEF)

			break;

		DRM_UDELAY(1);

		udelay(1);

	}



	if (i >= adev->usec_timeout)
@@ -841,7 +841,7 @@ int amdgpu_vcn_jpeg_ring_test_ib(struct amdgpu_ring *ring, long timeout) 
		tmp = RREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_SCRATCH9));

		if (tmp == 0xDEADBEEF)

			break;

		DRM_UDELAY(1);

		udelay(1);

	}



	if (i >= adev->usec_timeout)