diff options
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/mga_dma.c | 8 | ||||
| -rw-r--r-- | shared/mga_drv.h | 1 | ||||
| -rw-r--r-- | shared/r128_cce.c | 7 | ||||
| -rw-r--r-- | shared/r128_drv.h | 1 | ||||
| -rw-r--r-- | shared/radeon_cp.c | 7 | ||||
| -rw-r--r-- | shared/radeon_drv.h | 1 |
6 files changed, 0 insertions, 25 deletions
diff --git a/shared/mga_dma.c b/shared/mga_dma.c index 19bc9e32..5e5c407d 100644 --- a/shared/mga_dma.c +++ b/shared/mga_dma.c @@ -500,14 +500,6 @@ static int mga_do_init_dma( drm_device_t *dev, drm_mga_init_t *init ) return DRM_ERR(EINVAL); } - DRM_FIND_MAP( dev_priv->fb, init->fb_offset ); - if(!dev_priv->fb) { - DRM_ERROR( "failed to find framebuffer!\n" ); - /* Assign dev_private so we can do cleanup. */ - dev->dev_private = (void *)dev_priv; - mga_do_cleanup_dma( dev ); - return DRM_ERR(EINVAL); - } DRM_FIND_MAP( dev_priv->mmio, init->mmio_offset ); if(!dev_priv->mmio) { DRM_ERROR( "failed to find mmio region!\n" ); diff --git a/shared/mga_drv.h b/shared/mga_drv.h index 9396ae92..65847165 100644 --- a/shared/mga_drv.h +++ b/shared/mga_drv.h @@ -91,7 +91,6 @@ typedef struct drm_mga_private { unsigned int texture_size; drm_local_map_t *sarea; - drm_local_map_t *fb; drm_local_map_t *mmio; drm_local_map_t *status; drm_local_map_t *warp; diff --git a/shared/r128_cce.c b/shared/r128_cce.c index abf05c17..bf4b4d95 100644 --- a/shared/r128_cce.c +++ b/shared/r128_cce.c @@ -467,13 +467,6 @@ static int r128_do_init_cce( drm_device_t *dev, drm_r128_init_t *init ) return DRM_ERR(EINVAL); } - DRM_FIND_MAP( dev_priv->fb, init->fb_offset ); - if(!dev_priv->fb) { - DRM_ERROR("could not find framebuffer!\n"); - dev->dev_private = (void *)dev_priv; - r128_do_cleanup_cce( dev ); - return DRM_ERR(EINVAL); - } DRM_FIND_MAP( dev_priv->mmio, init->mmio_offset ); if(!dev_priv->mmio) { DRM_ERROR("could not find mmio region!\n"); diff --git a/shared/r128_drv.h b/shared/r128_drv.h index 10569f46..9df32e56 100644 --- a/shared/r128_drv.h +++ b/shared/r128_drv.h @@ -97,7 +97,6 @@ typedef struct drm_r128_private { u32 span_pitch_offset_c; drm_local_map_t *sarea; - drm_local_map_t *fb; drm_local_map_t *mmio; drm_local_map_t *cce_ring; drm_local_map_t *ring_rptr; diff --git a/shared/radeon_cp.c b/shared/radeon_cp.c index 4cacef5c..e145c78e 100644 --- a/shared/radeon_cp.c +++ b/shared/radeon_cp.c @@ -1118,13 +1118,6 @@ static int radeon_do_init_cp( drm_device_t *dev, drm_radeon_init_t *init ) return DRM_ERR(EINVAL); } - DRM_FIND_MAP( dev_priv->fb, init->fb_offset ); - if(!dev_priv->fb) { - DRM_ERROR("could not find framebuffer!\n"); - dev->dev_private = (void *)dev_priv; - radeon_do_cleanup_cp(dev); - return DRM_ERR(EINVAL); - } DRM_FIND_MAP( dev_priv->mmio, init->mmio_offset ); if(!dev_priv->mmio) { DRM_ERROR("could not find mmio region!\n"); diff --git a/shared/radeon_drv.h b/shared/radeon_drv.h index 1569caa7..afa516e8 100644 --- a/shared/radeon_drv.h +++ b/shared/radeon_drv.h @@ -135,7 +135,6 @@ typedef struct drm_radeon_private { unsigned long gart_textures_offset; drm_local_map_t *sarea; - drm_local_map_t *fb; drm_local_map_t *mmio; drm_local_map_t *cp_ring; drm_local_map_t *ring_rptr; |