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

Commit 06b6476d authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/kms: detect sideport memory on IGP chips 



This detects if the sideport memory is enabled and
if it is VRAM is evicted on suspend/resume.

This should fix s/r issues on some IGPs.

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

drivers/gpu/drm/radeon/r600.c

+4 −0
Original line number Diff line number Diff line
@@ -726,6 +726,10 @@ int r600_mc_init(struct radeon_device *rdev) 
	a.full = rfixed_const(100);

	rdev->pm.sclk.full = rfixed_const(rdev->clock.default_sclk);

	rdev->pm.sclk.full = rfixed_div(rdev->pm.sclk, a);



	if (rdev->flags & RADEON_IS_IGP)

		rdev->mc.igp_sideport_enabled = radeon_atombios_sideport_present(rdev);



	return 0;

}

drivers/gpu/drm/radeon/radeon.h

+3 −1
Original line number Diff line number Diff line
@@ -319,10 +319,12 @@ struct radeon_mc { 
	u64			real_vram_size;

	int			vram_mtrr;

	bool			vram_is_ddr;

	bool                    igp_sideport_enabled;

};



int radeon_mc_setup(struct radeon_device *rdev);



bool radeon_combios_sideport_present(struct radeon_device *rdev);

bool radeon_atombios_sideport_present(struct radeon_device *rdev);



/*

 * GPU scratch registers structures, functions & helpers

drivers/gpu/drm/radeon/radeon_atombios.c

+37 −0
Original line number Diff line number Diff line
@@ -938,6 +938,43 @@ bool radeon_atom_get_clock_info(struct drm_device *dev) 
	return false;

}



union igp_info {

	struct _ATOM_INTEGRATED_SYSTEM_INFO info;

	struct _ATOM_INTEGRATED_SYSTEM_INFO_V2 info_2;

};



bool radeon_atombios_sideport_present(struct radeon_device *rdev)

{

	struct radeon_mode_info *mode_info = &rdev->mode_info;

	int index = GetIndexIntoMasterTable(DATA, IntegratedSystemInfo);

	union igp_info *igp_info;

	u8 frev, crev;

	u16 data_offset;



	atom_parse_data_header(mode_info->atom_context, index, NULL, &frev,

			       &crev, &data_offset);



	igp_info = (union igp_info *)(mode_info->atom_context->bios +

				      data_offset);



	if (igp_info) {

		switch (crev) {

		case 1:

			if (igp_info->info.ucMemoryType & 0xf0)

				return true;

			break;

		case 2:

			if (igp_info->info_2.ucMemoryType & 0x0f)

				return true;

			break;

		default:

			DRM_ERROR("Unsupported IGP table: %d %d\n", frev, crev);

			break;

		}

	}

	return false;

}



bool radeon_atombios_get_tmds_info(struct radeon_encoder *encoder,

				   struct radeon_encoder_int_tmds *tmds)

{

drivers/gpu/drm/radeon/radeon_combios.c

+14 −0
Original line number Diff line number Diff line
@@ -595,6 +595,20 @@ bool radeon_combios_get_clock_info(struct drm_device *dev) 
	return false;

}



bool radeon_combios_sideport_present(struct radeon_device *rdev)

{

	struct drm_device *dev = rdev->ddev;

	u16 igp_info;



	igp_info = combios_get_table_offset(dev, COMBIOS_INTEGRATED_SYSTEM_INFO_TABLE);



	if (igp_info) {

		if (RBIOS16(igp_info + 0x4))

			return true;

	}

	return false;

}



static const uint32_t default_primarydac_adj[CHIP_LAST] = {

	0x00000808,		/* r100  */

	0x00000808,		/* rv100 */

drivers/gpu/drm/radeon/radeon_object.c

+3 −2
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ int radeon_bo_unpin(struct radeon_bo *bo) 
int radeon_bo_evict_vram(struct radeon_device *rdev)

{

	if (rdev->flags & RADEON_IS_IGP) {

		if (rdev->mc.igp_sideport_enabled == false)

			/* Useless to evict on IGP chips */

			return 0;

	}