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

Commit 5ea597f3 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Dave Airlie
Browse files

drm/radeon/kms: enable memory clock reading on legacy (V2) 



V2: detect IGP cards (which don't have own memory)

Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Acked-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent c31ad97f

drivers/gpu/drm/radeon/radeon_asic.h

+4 −3
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
 */

uint32_t radeon_legacy_get_engine_clock(struct radeon_device *rdev);

void radeon_legacy_set_engine_clock(struct radeon_device *rdev, uint32_t eng_clock);

uint32_t radeon_legacy_get_memory_clock(struct radeon_device *rdev);

void radeon_legacy_set_clock_gating(struct radeon_device *rdev, int enable);



uint32_t radeon_atom_get_engine_clock(struct radeon_device *rdev);
@@ -106,7 +107,7 @@ static struct radeon_asic r100_asic = { 
	.copy = &r100_copy_blit,

	.get_engine_clock = &radeon_legacy_get_engine_clock,

	.set_engine_clock = &radeon_legacy_set_engine_clock,

	.get_memory_clock = NULL,

	.get_memory_clock = &radeon_legacy_get_memory_clock,

	.set_memory_clock = NULL,

	.set_pcie_lanes = NULL,

	.set_clock_gating = &radeon_legacy_set_clock_gating,
@@ -166,7 +167,7 @@ static struct radeon_asic r300_asic = { 
	.copy = &r100_copy_blit,

	.get_engine_clock = &radeon_legacy_get_engine_clock,

	.set_engine_clock = &radeon_legacy_set_engine_clock,

	.get_memory_clock = NULL,

	.get_memory_clock = &radeon_legacy_get_memory_clock,

	.set_memory_clock = NULL,

	.set_pcie_lanes = &rv370_set_pcie_lanes,

	.set_clock_gating = &radeon_legacy_set_clock_gating,
@@ -259,7 +260,7 @@ static struct radeon_asic rs400_asic = { 
	.copy = &r100_copy_blit,

	.get_engine_clock = &radeon_legacy_get_engine_clock,

	.set_engine_clock = &radeon_legacy_set_engine_clock,

	.get_memory_clock = NULL,

	.get_memory_clock = &radeon_legacy_get_memory_clock,

	.set_memory_clock = NULL,

	.set_pcie_lanes = NULL,

	.set_clock_gating = &radeon_legacy_set_clock_gating,

drivers/gpu/drm/radeon/radeon_clocks.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ uint32_t radeon_legacy_get_engine_clock(struct radeon_device *rdev) 
}



/* 10 khz */

static uint32_t radeon_legacy_get_memory_clock(struct radeon_device *rdev)

uint32_t radeon_legacy_get_memory_clock(struct radeon_device *rdev)

{

	struct radeon_pll *mpll = &rdev->clock.mpll;

	uint32_t fb_div, ref_div, post_div, mclk;

drivers/gpu/drm/radeon/radeon_device.c

+6 −0
Original line number Diff line number Diff line
@@ -391,6 +391,12 @@ int radeon_asic_init(struct radeon_device *rdev) 
		/* FIXME: not supported yet */

		return -EINVAL;

	}



	if (rdev->flags & RADEON_IS_IGP) {

		rdev->asic->get_memory_clock = NULL;

		rdev->asic->set_memory_clock = NULL;

	}



	return 0;

}