diff options
| author | Dave Airlie <airlied@redhat.com> | 2008-02-20 10:51:19 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2008-02-20 11:27:22 +1000 |
| commit | 8844245cfcc5b19caafc772fd457401ab3253a28 (patch) | |
| tree | 5e472aa5c55e3607ddd6c65528ad06da83816475 | |
| parent | 2c409f9a07a9d815b95fc8a5a4705d7988afe5df (diff) | |
drm/fb: get rid of offset from structure use bo offset
| -rw-r--r-- | linux-core/drm_crtc.h | 1 | ||||
| -rw-r--r-- | linux-core/intel_fb.c | 3 | ||||
| -rw-r--r-- | linux-core/radeon_ms_fb.c | 3 | ||||
| -rw-r--r-- | shared-core/radeon_ms_crtc.c | 2 |
4 files changed, 3 insertions, 6 deletions
diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h index 43ef95ed..30970579 100644 --- a/linux-core/drm_crtc.h +++ b/linux-core/drm_crtc.h @@ -235,7 +235,6 @@ struct drm_framebuffer { struct list_head head; int id; /* idr assigned */ unsigned int pitch; - unsigned long offset; unsigned int width; unsigned int height; /* depth can be 15 or 16 */ diff --git a/linux-core/intel_fb.c b/linux-core/intel_fb.c index 6df243b0..56403998 100644 --- a/linux-core/intel_fb.c +++ b/linux-core/intel_fb.c @@ -612,7 +612,6 @@ int intelfb_probe(struct drm_device *dev, struct drm_crtc *crtc) return -EINVAL; } - fb->offset = fbo->offset; fb->bo = fbo; printk("allocated %dx%d fb: 0x%08lx, bo %p\n", fb->width, fb->height, fbo->offset, fbo); @@ -639,7 +638,7 @@ int intelfb_probe(struct drm_device *dev, struct drm_crtc *crtc) info->fix.mmio_start = 0; info->fix.mmio_len = 0; info->fix.line_length = fb->pitch; - info->fix.smem_start = fb->offset + dev->mode_config.fb_base; + info->fix.smem_start = fb->bo->offset + dev->mode_config.fb_base; info->fix.smem_len = info->fix.line_length * fb->height; info->flags = FBINFO_DEFAULT; diff --git a/linux-core/radeon_ms_fb.c b/linux-core/radeon_ms_fb.c index fc9e99ec..d7fb39e6 100644 --- a/linux-core/radeon_ms_fb.c +++ b/linux-core/radeon_ms_fb.c @@ -319,7 +319,6 @@ int radeonfb_probe(struct drm_device *dev, struct drm_crtc *crtc) return -EINVAL; } - fb->offset = fb->bo->offset; DRM_INFO("[radeon_ms] framebuffer %dx%d at 0x%08lX\n", fb->width, fb->height, fb->bo->offset); @@ -340,7 +339,7 @@ int radeonfb_probe(struct drm_device *dev, struct drm_crtc *crtc) info->fix.mmio_start = 0; info->fix.mmio_len = 0; info->fix.line_length = fb->pitch; - info->fix.smem_start = fb->offset + dev->mode_config.fb_base; + info->fix.smem_start = fb->bo->offset + dev->mode_config.fb_base; info->fix.smem_len = info->fix.line_length * fb->height; info->flags = FBINFO_DEFAULT; DRM_INFO("[radeon_ms] fb physical start : 0x%lX\n", info->fix.smem_start); diff --git a/shared-core/radeon_ms_crtc.c b/shared-core/radeon_ms_crtc.c index 0da5a5a4..b2383859 100644 --- a/shared-core/radeon_ms_crtc.c +++ b/shared-core/radeon_ms_crtc.c @@ -556,7 +556,7 @@ static void radeon_ms_crtc1_mode_set(struct drm_crtc *crtc, } radeon_pll1_compute(crtc, adjusted_mode); - state->crtc_offset = REG_S(CRTC_OFFSET, CRTC_OFFSET, crtc->fb->offset); + state->crtc_offset = REG_S(CRTC_OFFSET, CRTC_OFFSET, crtc->fb->bo->offset); state->crtc_gen_cntl = CRTC_GEN_CNTL__CRTC_EXT_DISP_EN | CRTC_GEN_CNTL__CRTC_EN | REG_S(CRTC_GEN_CNTL, CRTC_PIX_WIDTH, format); |