Commit 0e1a351d authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

drm/radeon: drop dependency on drm_os_linux.h 



The drm_os_linux.h header file is deprecated.
Drop all uses of symbols from this file.
All macros are just opencoded.
A few adjustments to include files was required as the obsolete
drm_os_linux.h included these headers.

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/20190608080241.4958-4-sam@ravnborg.org
parent a7d469cc

drivers/gpu/drm/radeon/cik.c

+2 −2
Original line number Diff line number Diff line
@@ -3480,7 +3480,7 @@ int cik_ring_test(struct radeon_device *rdev, struct radeon_ring *ring) 
		tmp = RREG32(scratch);

		if (tmp == 0xDEADBEEF)

			break;

		DRM_UDELAY(1);

		udelay(1);

	}

	if (i < rdev->usec_timeout) {

		DRM_INFO("ring test on %d succeeded in %d usecs\n", ring->idx, i);
@@ -3825,7 +3825,7 @@ int cik_ib_test(struct radeon_device *rdev, struct radeon_ring *ring) 
		tmp = RREG32(scratch);

		if (tmp == 0xDEADBEEF)

			break;

		DRM_UDELAY(1);

		udelay(1);

	}

	if (i < rdev->usec_timeout) {

		DRM_INFO("ib test on ring %d succeeded in %u usecs\n", ib.fence->ring, i);

drivers/gpu/drm/radeon/cik_sdma.c

+2 −2
Original line number Diff line number Diff line
@@ -677,7 +677,7 @@ int cik_sdma_ring_test(struct radeon_device *rdev, 
		tmp = le32_to_cpu(rdev->wb.wb[index/4]);

		if (tmp == 0xDEADBEEF)

			break;

		DRM_UDELAY(1);

		udelay(1);

	}



	if (i < rdev->usec_timeout) {
@@ -751,7 +751,7 @@ int cik_sdma_ib_test(struct radeon_device *rdev, struct radeon_ring *ring) 
		tmp = le32_to_cpu(rdev->wb.wb[index/4]);

		if (tmp == 0xDEADBEEF)

			break;

		DRM_UDELAY(1);

		udelay(1);

	}

	if (i < rdev->usec_timeout) {

		DRM_INFO("ib test on ring %d succeeded in %u usecs\n", ib.fence->ring, i);

drivers/gpu/drm/radeon/r100.c

+5 −5
Original line number Diff line number Diff line
@@ -2470,7 +2470,7 @@ static int r100_rbbm_fifo_wait_for_entry(struct radeon_device *rdev, unsigned n) 
		if (tmp >= n) {

			return 0;

		}

		DRM_UDELAY(1);

		udelay(1);

	}

	return -1;

}
@@ -2488,7 +2488,7 @@ int r100_gui_wait_for_idle(struct radeon_device *rdev) 
		if (!(tmp & RADEON_RBBM_ACTIVE)) {

			return 0;

		}

		DRM_UDELAY(1);

		udelay(1);

	}

	return -1;

}
@@ -2504,7 +2504,7 @@ int r100_mc_wait_for_idle(struct radeon_device *rdev) 
		if (tmp & RADEON_MC_IDLE) {

			return 0;

		}

		DRM_UDELAY(1);

		udelay(1);

	}

	return -1;

}
@@ -3669,7 +3669,7 @@ int r100_ring_test(struct radeon_device *rdev, struct radeon_ring *ring) 
		if (tmp == 0xDEADBEEF) {

			break;

		}

		DRM_UDELAY(1);

		udelay(1);

	}

	if (i < rdev->usec_timeout) {

		DRM_INFO("ring test succeeded in %d usecs\n", i);
@@ -3746,7 +3746,7 @@ int r100_ib_test(struct radeon_device *rdev, struct radeon_ring *ring) 
		if (tmp == 0xDEADBEEF) {

			break;

		}

		DRM_UDELAY(1);

		udelay(1);

	}

	if (i < rdev->usec_timeout) {

		DRM_INFO("ib test succeeded in %u usecs\n", i);

drivers/gpu/drm/radeon/r300.c

+1 −1
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ int r300_mc_wait_for_idle(struct radeon_device *rdev) 
		if (tmp & R300_MC_IDLE) {

			return 0;

		}

		DRM_UDELAY(1);

		udelay(1);

	}

	return -1;

}

drivers/gpu/drm/radeon/r520.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ int r520_mc_wait_for_idle(struct radeon_device *rdev) 
		if (tmp & R520_MC_STATUS_IDLE) {

			return 0;

		}

		DRM_UDELAY(1);

		udelay(1);

	}

	return -1;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE