summaryrefslogtreecommitdiff
path: root/shared-core
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2008-08-11 12:29:42 -0400
committerDave Airlie <airlied@redhat.com>2008-08-14 09:19:02 +1000
commit5f427e9aaed76ec827b9523b4022205f5bd09a4a (patch)
tree54a6363776dd622c7c12f40f3c5dca011fe6b0dc /shared-core
parent7677c2dba5d06e888c742a607bc7f42d934043c6 (diff)
Brute force port of legacy crtc/encoder code
- removed save/init/restore chain with set functions
Diffstat (limited to 'shared-core')
-rw-r--r--shared-core/radeon_cp.c2
-rw-r--r--shared-core/radeon_drv.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/shared-core/radeon_cp.c b/shared-core/radeon_cp.c
index b751740c..53177bb0 100644
--- a/shared-core/radeon_cp.c
+++ b/shared-core/radeon_cp.c
@@ -185,7 +185,7 @@ void radeon_pll_errata_after_data(struct drm_radeon_private *dev_priv)
}
}
-int RADEON_READ_PLL(struct drm_radeon_private *dev_priv, int addr)
+u32 RADEON_READ_PLL(struct drm_radeon_private *dev_priv, int addr)
{
uint32_t data;
diff --git a/shared-core/radeon_drv.h b/shared-core/radeon_drv.h
index df08b8d3..fb266093 100644
--- a/shared-core/radeon_drv.h
+++ b/shared-core/radeon_drv.h
@@ -1277,7 +1277,7 @@ extern int r300_do_cp_cmdbuf(struct drm_device *dev,
#define RADEON_READ8(reg) DRM_READ8( dev_priv->mmio, (reg) )
#define RADEON_WRITE8(reg,val) DRM_WRITE8( dev_priv->mmio, (reg), (val) )
-extern int RADEON_READ_PLL(struct drm_radeon_private *dev_priv, int addr);
+extern u32 RADEON_READ_PLL(struct drm_radeon_private *dev_priv, int addr);
extern void RADEON_WRITE_PLL(struct drm_radeon_private *dev_priv, int addr, uint32_t data);
#define RADEON_WRITE_P(reg, val, mask) \