diff options
| author | Kevin Brace <kevinbrace@gmx.com> | 2020-10-27 15:42:07 -0700 |
|---|---|---|
| committer | Kevin Brace <kevinbrace@gmx.com> | 2020-10-27 15:42:07 -0700 |
| commit | af8d8e6a37bc09bfcadb46e4044898bf618b8db3 (patch) | |
| tree | 8a965eeba991bddcdbada02b25f041c0f0f42fba | |
| parent | 9955ca62a0afd4e132304d2d20c17f69bbf61032 (diff) | |
drm/ttm: merge offset and base in ttm_bus_placement
Based on commit 54d04ea (drm/ttm: merge offset and base in
ttm_bus_placement).
Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
| -rw-r--r-- | drivers/gpu/drm/openchrome/openchrome_fb.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/openchrome/openchrome_ttm.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/openchrome/openchrome_fb.c b/drivers/gpu/drm/openchrome/openchrome_fb.c index 7e20a0726843..94ad1900c695 100644 --- a/drivers/gpu/drm/openchrome/openchrome_fb.c +++ b/drivers/gpu/drm/openchrome/openchrome_fb.c @@ -209,8 +209,8 @@ openchrome_fb_probe(struct drm_fb_helper *helper, info->fbops = &via_fb_ops; - info->fix.smem_start = openchrome_fb->bo->ttm_bo.mem.bus.base + - openchrome_fb->bo->ttm_bo.mem.bus.offset; + info->fix.smem_start = openchrome_fb->bo-> + ttm_bo.mem.bus.offset; info->fix.smem_len = openchrome_fb->bo->ttm_bo.mem.num_pages << PAGE_SHIFT; info->screen_base = ttm_kmap_obj_virtual( diff --git a/drivers/gpu/drm/openchrome/openchrome_ttm.c b/drivers/gpu/drm/openchrome/openchrome_ttm.c index 8541dd3593c2..d42f436a28db 100644 --- a/drivers/gpu/drm/openchrome/openchrome_ttm.c +++ b/drivers/gpu/drm/openchrome/openchrome_ttm.c @@ -123,8 +123,8 @@ static int openchrome_bo_io_mem_reserve(struct ttm_bo_device *bdev, case TTM_PL_SYSTEM: break; case TTM_PL_VRAM: - mem->bus.base = dev_private->vram_start; - mem->bus.offset = mem->start << PAGE_SHIFT; + mem->bus.offset = dev_private->vram_start + + (mem->start << PAGE_SHIFT); mem->bus.is_iomem = true; break; default: |