Commit a3922105 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge remote branch 'korg/drm-radeon-next' into drm-linus 

* korg/drm-radeon-next:
  drm/radeon/kms: init pm on all chipsets
parents ece84e04 6234077d

drivers/gpu/drm/radeon/r100.c

+2 −0
Original line number Diff line number Diff line
@@ -3399,6 +3399,8 @@ int r100_init(struct radeon_device *rdev) 
	r100_errata(rdev);

	/* Initialize clocks */

	radeon_get_clock_info(rdev->ddev);

	/* Initialize power management */

	radeon_pm_init(rdev);

	/* Get vram informations */

	r100_vram_info(rdev);

	/* Initialize memory controller (also test AGP) */

drivers/gpu/drm/radeon/r300.c

+2 −0
Original line number Diff line number Diff line
@@ -1324,6 +1324,8 @@ int r300_init(struct radeon_device *rdev) 
	r300_errata(rdev);

	/* Initialize clocks */

	radeon_get_clock_info(rdev->ddev);

	/* Initialize power management */

	radeon_pm_init(rdev);

	/* Get vram informations */

	r300_vram_info(rdev);

	/* Initialize memory controller (also test AGP) */

drivers/gpu/drm/radeon/radeon_pm.c

+5 −2
Original line number Diff line number Diff line
@@ -44,8 +44,11 @@ static int radeon_debugfs_pm_info(struct seq_file *m, void *data) 
	struct drm_device *dev = node->minor->dev;

	struct radeon_device *rdev = dev->dev_private;



	seq_printf(m, "engine clock: %u0 kHz\n", radeon_get_engine_clock(rdev));

	seq_printf(m, "memory clock: %u0 kHz\n", radeon_get_memory_clock(rdev));

	seq_printf(m, "default engine clock: %u0 kHz\n", rdev->clock.default_sclk);

	seq_printf(m, "current engine clock: %u0 kHz\n", radeon_get_engine_clock(rdev));

	seq_printf(m, "default memory clock: %u0 kHz\n", rdev->clock.default_mclk);

	if (rdev->asic->get_memory_clock)

		seq_printf(m, "current memory clock: %u0 kHz\n", radeon_get_memory_clock(rdev));



	return 0;

}

drivers/gpu/drm/radeon/rs400.c

+2 −0
Original line number Diff line number Diff line
@@ -497,6 +497,8 @@ int rs400_init(struct radeon_device *rdev) 


	/* Initialize clocks */

	radeon_get_clock_info(rdev->ddev);

	/* Initialize power management */

	radeon_pm_init(rdev);

	/* Get vram informations */

	rs400_vram_info(rdev);

	/* Initialize memory controller (also test AGP) */