diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-06-05 14:33:26 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-06-05 14:33:26 +1000 |
| commit | ec7fdeee19474afb2169bb0939cbc972f9aa20eb (patch) | |
| tree | cb8fcab2fe1e3889c4a0f45c5eae9dd27e64fd15 /drivers/gpu/drm/radeon/radeon_asic.h | |
| parent | 91f8f105f2b82b4a38dee2d74760bc39d40ec42c (diff) | |
| parent | 1cbcca302a318499f20a512847c5d6a510c08c35 (diff) | |
| download | op-kernel-dev-ec7fdeee19474afb2169bb0939cbc972f9aa20eb.zip op-kernel-dev-ec7fdeee19474afb2169bb0939cbc972f9aa20eb.tar.gz | |
Merge branch 'drm-fixes-3.10' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
Alex writes:
Just a few fixes for radeon. The big one is a fix for hangs on older
asics due to the ordering of interrupt initialization.
* 'drm-fixes-3.10' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon: don't allow audio on DCE6
drm/radeon: Use direct mapping for fast fb access on RS780/RS880 (v2)
radeon: Fix system hang issue when using KMS with older cards
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_asic.h')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_asic.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h index 2c87365..a72759e 100644 --- a/drivers/gpu/drm/radeon/radeon_asic.h +++ b/drivers/gpu/drm/radeon/radeon_asic.h @@ -347,6 +347,8 @@ extern bool r600_gui_idle(struct radeon_device *rdev); extern void r600_pm_misc(struct radeon_device *rdev); extern void r600_pm_init_profile(struct radeon_device *rdev); extern void rs780_pm_init_profile(struct radeon_device *rdev); +extern uint32_t rs780_mc_rreg(struct radeon_device *rdev, uint32_t reg); +extern void rs780_mc_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v); extern void r600_pm_get_dynpm_state(struct radeon_device *rdev); extern void r600_set_pcie_lanes(struct radeon_device *rdev, int lanes); extern int r600_get_pcie_lanes(struct radeon_device *rdev); |
