Skip to content

Commit 46642a7

Browse files
nirmoyChristianKoenigAMD
authored andcommitted
drm/vram-helper: don't use ttm bo->offset v4
Calculate GEM VRAM bo's offset within vram-helper without depending on bo->offset. Signed-off-by: Nirmoy Das <[email protected]> Reviewed-by: Daniel Vetter <[email protected]> Signed-off-by: Christian König <[email protected]> Link: https://patchwork.freedesktop.org/patch/372938/
1 parent 8ef963b commit 46642a7

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

drivers/gpu/drm/drm_gem_vram_helper.c

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,15 @@ u64 drm_gem_vram_mmap_offset(struct drm_gem_vram_object *gbo)
281281
}
282282
EXPORT_SYMBOL(drm_gem_vram_mmap_offset);
283283

284+
static u64 drm_gem_vram_pg_offset(struct drm_gem_vram_object *gbo)
285+
{
286+
/* Keep TTM behavior for now, remove when drivers are audited */
287+
if (WARN_ON_ONCE(!gbo->bo.mem.mm_node))
288+
return 0;
289+
290+
return gbo->bo.mem.start;
291+
}
292+
284293
/**
285294
* drm_gem_vram_offset() - \
286295
Returns a GEM VRAM object's offset in video memory
@@ -297,7 +306,7 @@ s64 drm_gem_vram_offset(struct drm_gem_vram_object *gbo)
297306
{
298307
if (WARN_ON_ONCE(!gbo->pin_count))
299308
return (s64)-ENODEV;
300-
return gbo->bo.offset;
309+
return drm_gem_vram_pg_offset(gbo) << PAGE_SHIFT;
301310
}
302311
EXPORT_SYMBOL(drm_gem_vram_offset);
303312

0 commit comments

Comments
 (0)