diff options
| -rw-r--r-- | shared-core/drm.h | 6 | ||||
| -rw-r--r-- | shared-core/radeon_cp.c | 10 | ||||
| -rw-r--r-- | shared-core/radeon_drm.h | 6 | ||||
| -rw-r--r-- | shared-core/radeon_drv.h | 2 | ||||
| -rw-r--r-- | shared-core/radeon_state.c | 2 |
5 files changed, 11 insertions, 15 deletions
diff --git a/shared-core/drm.h b/shared-core/drm.h index d2dde34f..ffbd4755 100644 --- a/shared-core/drm.h +++ b/shared-core/drm.h @@ -62,6 +62,12 @@ #define __user #endif +#ifdef __GNUC__ +# define DEPRECATED __attribute__ ((deprecated)) +#else +# define DEPRECATED +#endif + #if defined(__linux__) #if defined(__KERNEL__) #include <linux/config.h> diff --git a/shared-core/radeon_cp.c b/shared-core/radeon_cp.c index 35a26a5c..73cc38dc 100644 --- a/shared-core/radeon_cp.c +++ b/shared-core/radeon_cp.c @@ -1245,7 +1245,7 @@ static void radeon_set_pciegart(drm_radeon_private_t * dev_priv, int on) u32 tmp = RADEON_READ_PCIE(dev_priv, RADEON_PCIE_TX_GART_CNTL); if (on) { - DRM_DEBUG("programming pcie %08X %08lX %08X\n", dev_priv->gart_vm_start, dev_priv->bus_pci_gart,dev_priv->gart_size); + DRM_DEBUG("programming pcie %08X %08X %08X\n", dev_priv->gart_vm_start, dev_priv->bus_pci_gart,dev_priv->gart_size); RADEON_WRITE_PCIE(RADEON_PCIE_TX_DISCARD_RD_ADDR_LO, dev_priv->gart_vm_start); RADEON_WRITE_PCIE(RADEON_PCIE_TX_GART_BASE, dev_priv->bus_pci_gart); RADEON_WRITE_PCIE(RADEON_PCIE_TX_GART_START_LO, dev_priv->gart_vm_start); @@ -1398,8 +1398,6 @@ static int radeon_do_init_cp(drm_device_t * dev, drm_radeon_init_t * init) DRM_GETSAREA(); - dev_priv->fb_offset = init->fb_offset; - dev_priv->mmio_offset = init->mmio_offset; dev_priv->ring_offset = init->ring_offset; dev_priv->ring_rptr_offset = init->ring_rptr_offset; dev_priv->buffers_offset = init->buffers_offset; @@ -1411,12 +1409,6 @@ static int radeon_do_init_cp(drm_device_t * dev, drm_radeon_init_t * init) return DRM_ERR(EINVAL); } - dev_priv->mmio = drm_core_findmap(dev, init->mmio_offset); - if (!dev_priv->mmio) { - DRM_ERROR("could not find mmio region!\n"); - radeon_do_cleanup_cp(dev); - return DRM_ERR(EINVAL); - } dev_priv->cp_ring = drm_core_findmap(dev, init->ring_offset); if (!dev_priv->cp_ring) { DRM_ERROR("could not find cp ring region!\n"); diff --git a/shared-core/radeon_drm.h b/shared-core/radeon_drm.h index 716e8e04..999cd611 100644 --- a/shared-core/radeon_drm.h +++ b/shared-core/radeon_drm.h @@ -492,7 +492,7 @@ typedef struct drm_radeon_init { RADEON_INIT_R300_CP = 0x04 } func; unsigned long sarea_priv_offset; - int is_pci; /* not used, driver asks hardware */ + int is_pci DEPRECATED; /* deprecated, driver asks hardware */ int cp_mode; int gart_size; int ring_size; @@ -504,8 +504,8 @@ typedef struct drm_radeon_init { unsigned int depth_bpp; unsigned int depth_offset, depth_pitch; - unsigned long fb_offset; - unsigned long mmio_offset; + unsigned long fb_offset DEPRECATED; /* deprecated, driver asks hardware */ + unsigned long mmio_offset DEPRECATED; /* deprecated, driver asks hardware */ unsigned long ring_offset; unsigned long ring_rptr_offset; unsigned long buffers_offset; diff --git a/shared-core/radeon_drv.h b/shared-core/radeon_drv.h index 26a7d1e7..cb4e0b4b 100644 --- a/shared-core/radeon_drv.h +++ b/shared-core/radeon_drv.h @@ -242,8 +242,6 @@ typedef struct drm_radeon_private { drm_radeon_depth_clear_t depth_clear; - unsigned long fb_offset; - unsigned long mmio_offset; unsigned long ring_offset; unsigned long ring_rptr_offset; unsigned long buffers_offset; diff --git a/shared-core/radeon_state.c b/shared-core/radeon_state.c index ba524bce..53484641 100644 --- a/shared-core/radeon_state.c +++ b/shared-core/radeon_state.c @@ -2917,7 +2917,7 @@ static int radeon_cp_getparam(DRM_IOCTL_ARGS) value = dev_priv->gart_vm_start; break; case RADEON_PARAM_REGISTER_HANDLE: - value = dev_priv->mmio_offset; + value = dev_priv->mmio->offset; break; case RADEON_PARAM_STATUS_HANDLE: value = dev_priv->ring_rptr_offset; |