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

Commit 0ef0c1f7 authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/kms: move r7xx/evergreen to its own vram_gtt setup function 



MC_VM_FB_LOCATION is at a different offset between r6xx and r7xx/evergreen.
The location is needed for vram setup on fusion chips.

Signed-off-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 4339c442

drivers/gpu/drm/radeon/evergreen.c

+1 −1
Original line number Diff line number Diff line
@@ -1945,7 +1945,7 @@ int evergreen_mc_init(struct radeon_device *rdev) 
	rdev->mc.real_vram_size = RREG32(CONFIG_MEMSIZE) * 1024 * 1024;

	rdev->mc.visible_vram_size = rdev->mc.aper_size;

	rdev->mc.active_vram_size = rdev->mc.visible_vram_size;

	r600_vram_gtt_location(rdev, &rdev->mc);

	r700_vram_gtt_location(rdev, &rdev->mc);

	radeon_update_bandwidth_info(rdev);



	return 0;

drivers/gpu/drm/radeon/r600.c

+1 −1
Original line number Diff line number Diff line
@@ -1161,7 +1161,7 @@ static void r600_mc_program(struct radeon_device *rdev) 
 * Note: GTT start, end, size should be initialized before calling this

 * function on AGP platform.

 */

void r600_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc)

static void r600_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc)

{

	u64 size_bf, size_af;

drivers/gpu/drm/radeon/radeon.h

+1 −1
Original line number Diff line number Diff line
@@ -1433,7 +1433,6 @@ extern void rs690_line_buffer_adjust(struct radeon_device *rdev, 
					struct drm_display_mode *mode2);



/* r600, rv610, rv630, rv620, rv635, rv670, rs780, rs880 */

extern void r600_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc);

extern bool r600_card_posted(struct radeon_device *rdev);

extern void r600_cp_stop(struct radeon_device *rdev);

extern int r600_cp_start(struct radeon_device *rdev);
@@ -1479,6 +1478,7 @@ extern void r600_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mo 
extern int r600_hdmi_buffer_status_changed(struct drm_encoder *encoder);

extern void r600_hdmi_update_audio_settings(struct drm_encoder *encoder);



extern void r700_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc);

extern void r700_cp_stop(struct radeon_device *rdev);

extern void r700_cp_fini(struct radeon_device *rdev);

extern void evergreen_disable_interrupt_state(struct radeon_device *rdev);

drivers/gpu/drm/radeon/rv770.c

+43 −1
Original line number Diff line number Diff line
@@ -1001,6 +1001,48 @@ static void rv770_vram_scratch_fini(struct radeon_device *rdev) 
	radeon_bo_unref(&rdev->vram_scratch.robj);

}



void r700_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc)

{

	u64 size_bf, size_af;



	if (mc->mc_vram_size > 0xE0000000) {

		/* leave room for at least 512M GTT */

		dev_warn(rdev->dev, "limiting VRAM\n");

		mc->real_vram_size = 0xE0000000;

		mc->mc_vram_size = 0xE0000000;

	}

	if (rdev->flags & RADEON_IS_AGP) {

		size_bf = mc->gtt_start;

		size_af = 0xFFFFFFFF - mc->gtt_end + 1;

		if (size_bf > size_af) {

			if (mc->mc_vram_size > size_bf) {

				dev_warn(rdev->dev, "limiting VRAM\n");

				mc->real_vram_size = size_bf;

				mc->mc_vram_size = size_bf;

			}

			mc->vram_start = mc->gtt_start - mc->mc_vram_size;

		} else {

			if (mc->mc_vram_size > size_af) {

				dev_warn(rdev->dev, "limiting VRAM\n");

				mc->real_vram_size = size_af;

				mc->mc_vram_size = size_af;

			}

			mc->vram_start = mc->gtt_end;

		}

		mc->vram_end = mc->vram_start + mc->mc_vram_size - 1;

		dev_info(rdev->dev, "VRAM: %lluM 0x%08llX - 0x%08llX (%lluM used)\n",

				mc->mc_vram_size >> 20, mc->vram_start,

				mc->vram_end, mc->real_vram_size >> 20);

	} else {

		u64 base = 0;

		if (rdev->flags & RADEON_IS_IGP)

			base = (RREG32(MC_VM_FB_LOCATION) & 0xFFFF) << 24;

		radeon_vram_location(rdev, &rdev->mc, base);

		rdev->mc.gtt_base_align = 0;

		radeon_gtt_location(rdev, mc);

	}

}



int rv770_mc_init(struct radeon_device *rdev)

{

	u32 tmp;
@@ -1041,7 +1083,7 @@ int rv770_mc_init(struct radeon_device *rdev) 
	rdev->mc.real_vram_size = RREG32(CONFIG_MEMSIZE);

	rdev->mc.visible_vram_size = rdev->mc.aper_size;

	rdev->mc.active_vram_size = rdev->mc.visible_vram_size;

	r600_vram_gtt_location(rdev, &rdev->mc);

	r700_vram_gtt_location(rdev, &rdev->mc);

	radeon_update_bandwidth_info(rdev);



	return 0;