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

Commit 02376d82 authored by Michel Dänzer's avatar Michel Dänzer Committed by Alex Deucher
Browse files

drm/radeon: Allow write-combined CPU mappings of BOs in GTT (v2) 



v2: fix rebase onto drm-fixes

Signed-off-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 77497f27

drivers/gpu/drm/radeon/cik.c

+2 −2
Original line number Diff line number Diff line
@@ -4676,7 +4676,7 @@ static int cik_mec_init(struct radeon_device *rdev) 
		r = radeon_bo_create(rdev,

				     rdev->mec.num_mec *rdev->mec.num_pipe * MEC_HPD_SIZE * 2,

				     PAGE_SIZE, true,

				     RADEON_GEM_DOMAIN_GTT, NULL,

				     RADEON_GEM_DOMAIN_GTT, 0, NULL,

				     &rdev->mec.hpd_eop_obj);

		if (r) {

			dev_warn(rdev->dev, "(%d) create HDP EOP bo failed\n", r);
@@ -4846,7 +4846,7 @@ static int cik_cp_compute_resume(struct radeon_device *rdev) 
			r = radeon_bo_create(rdev,

					     sizeof(struct bonaire_mqd),

					     PAGE_SIZE, true,

					     RADEON_GEM_DOMAIN_GTT, NULL,

					     RADEON_GEM_DOMAIN_GTT, 0, NULL,

					     &rdev->ring[idx].mqd_obj);

			if (r) {

				dev_warn(rdev->dev, "(%d) create MQD bo failed\n", r);

drivers/gpu/drm/radeon/cik_sdma.c

+2 −1
Original line number Diff line number Diff line
@@ -771,7 +771,8 @@ void cik_sdma_vm_set_page(struct radeon_device *rdev, 


	trace_radeon_vm_set_page(pe, addr, count, incr, flags);



	if (flags == R600_PTE_GART) {

	/* XXX: How to distinguish between GART and other system memory pages? */

	if (flags & R600_PTE_SYSTEM) {

		uint64_t src = rdev->gart.table_addr + (addr >> 12) * 8;

		while (count) {

			unsigned bytes = count * 8;

drivers/gpu/drm/radeon/evergreen.c

+8 −4
Original line number Diff line number Diff line
@@ -4022,7 +4022,8 @@ int sumo_rlc_init(struct radeon_device *rdev) 
		/* save restore block */

		if (rdev->rlc.save_restore_obj == NULL) {

			r = radeon_bo_create(rdev, dws * 4, PAGE_SIZE, true,

					     RADEON_GEM_DOMAIN_VRAM, NULL, &rdev->rlc.save_restore_obj);

					     RADEON_GEM_DOMAIN_VRAM, 0, NULL,

					     &rdev->rlc.save_restore_obj);

			if (r) {

				dev_warn(rdev->dev, "(%d) create RLC sr bo failed\n", r);

				return r;
@@ -4100,7 +4101,8 @@ int sumo_rlc_init(struct radeon_device *rdev) 


		if (rdev->rlc.clear_state_obj == NULL) {

			r = radeon_bo_create(rdev, dws * 4, PAGE_SIZE, true,

					     RADEON_GEM_DOMAIN_VRAM, NULL, &rdev->rlc.clear_state_obj);

					     RADEON_GEM_DOMAIN_VRAM, 0, NULL,

					     &rdev->rlc.clear_state_obj);

			if (r) {

				dev_warn(rdev->dev, "(%d) create RLC c bo failed\n", r);

				sumo_rlc_fini(rdev);
@@ -4174,8 +4176,10 @@ int sumo_rlc_init(struct radeon_device *rdev) 


	if (rdev->rlc.cp_table_size) {

		if (rdev->rlc.cp_table_obj == NULL) {

			r = radeon_bo_create(rdev, rdev->rlc.cp_table_size, PAGE_SIZE, true,

					     RADEON_GEM_DOMAIN_VRAM, NULL, &rdev->rlc.cp_table_obj);

			r = radeon_bo_create(rdev, rdev->rlc.cp_table_size,

					     PAGE_SIZE, true,

					     RADEON_GEM_DOMAIN_VRAM, 0, NULL,

					     &rdev->rlc.cp_table_obj);

			if (r) {

				dev_warn(rdev->dev, "(%d) create RLC cp table bo failed\n", r);

				sumo_rlc_fini(rdev);

drivers/gpu/drm/radeon/r600.c

+2 −2
Original line number Diff line number Diff line
@@ -1338,7 +1338,7 @@ int r600_vram_scratch_init(struct radeon_device *rdev) 
	if (rdev->vram_scratch.robj == NULL) {

		r = radeon_bo_create(rdev, RADEON_GPU_PAGE_SIZE,

				     PAGE_SIZE, true, RADEON_GEM_DOMAIN_VRAM,

				     NULL, &rdev->vram_scratch.robj);

				     0, NULL, &rdev->vram_scratch.robj);

		if (r) {

			return r;

		}
@@ -3226,7 +3226,7 @@ int r600_ih_ring_alloc(struct radeon_device *rdev) 
	if (rdev->ih.ring_obj == NULL) {

		r = radeon_bo_create(rdev, rdev->ih.ring_size,

				     PAGE_SIZE, true,

				     RADEON_GEM_DOMAIN_GTT,

				     RADEON_GEM_DOMAIN_GTT, 0,

				     NULL, &rdev->ih.ring_obj);

		if (r) {

			DRM_ERROR("radeon: failed to create ih ring buffer (%d).\n", r);

drivers/gpu/drm/radeon/radeon.h

+2 −1
Original line number Diff line number Diff line
@@ -468,6 +468,7 @@ struct radeon_bo { 
	struct ttm_placement		placement;

	struct ttm_buffer_object	tbo;

	struct ttm_bo_kmap_obj		kmap;

	u32				flags;

	unsigned			pin_count;

	void				*kptr;

	u32				tiling_flags;
@@ -548,7 +549,7 @@ int radeon_gem_init(struct radeon_device *rdev); 
void radeon_gem_fini(struct radeon_device *rdev);

int radeon_gem_object_create(struct radeon_device *rdev, int size,

				int alignment, int initial_domain,

				bool discardable, bool kernel,

				u32 flags, bool discardable, bool kernel,

				struct drm_gem_object **obj);



int radeon_mode_dumb_create(struct drm_file *file_priv,