projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge drm/drm-next into drm-intel-gt-next
[linux-block.git]
/
drivers
/
gpu
/
drm
/
i915
/
display
/
intel_fbdev.c
diff --git
a/drivers/gpu/drm/i915/display/intel_fbdev.c
b/drivers/gpu/drm/i915/display/intel_fbdev.c
index 5575d7abdc0926093f768d2173c4dc784d23dda9..03ed4607a46d2181dded13e42398ddfffa38b944 100644
(file)
--- a/
drivers/gpu/drm/i915/display/intel_fbdev.c
+++ b/
drivers/gpu/drm/i915/display/intel_fbdev.c
@@
-286,7
+286,7
@@
static int intelfb_create(struct drm_fb_helper *helper,
/* Our framebuffer is the entirety of fbdev's system memory */
info->fix.smem_start =
- (unsigned long)(ggtt->gmadr.start +
vma->node.start
);
+ (unsigned long)(ggtt->gmadr.start +
i915_ggtt_offset(vma)
);
info->fix.smem_len = vma->size;
}