Commit 672279e4 authored by Thomas Zimmermann's avatar Thomas Zimmermann

drm/i915: Do not set struct fb_info.apertures

Generic fbdev drivers use the apertures field in struct fb_info to
control ownership of the framebuffer memory and graphics device. Do
not set the values in i915.
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221219160516.23436-5-tzimmermann@suse.de
parent f917ccfb
...@@ -267,23 +267,16 @@ static int intelfb_create(struct drm_fb_helper *helper, ...@@ -267,23 +267,16 @@ static int intelfb_create(struct drm_fb_helper *helper,
info->fbops = &intelfb_ops; info->fbops = &intelfb_ops;
/* setup aperture base/size for vesafb takeover */
obj = intel_fb_obj(&intel_fb->base); obj = intel_fb_obj(&intel_fb->base);
if (i915_gem_object_is_lmem(obj)) { if (i915_gem_object_is_lmem(obj)) {
struct intel_memory_region *mem = obj->mm.region; struct intel_memory_region *mem = obj->mm.region;
info->apertures->ranges[0].base = mem->io_start;
info->apertures->ranges[0].size = mem->io_size;
/* Use fbdev's framebuffer from lmem for discrete */ /* Use fbdev's framebuffer from lmem for discrete */
info->fix.smem_start = info->fix.smem_start =
(unsigned long)(mem->io_start + (unsigned long)(mem->io_start +
i915_gem_object_get_dma_address(obj, 0)); i915_gem_object_get_dma_address(obj, 0));
info->fix.smem_len = obj->base.size; info->fix.smem_len = obj->base.size;
} else { } else {
info->apertures->ranges[0].base = ggtt->gmadr.start;
info->apertures->ranges[0].size = ggtt->mappable_end;
/* Our framebuffer is the entirety of fbdev's system memory */ /* Our framebuffer is the entirety of fbdev's system memory */
info->fix.smem_start = info->fix.smem_start =
(unsigned long)(ggtt->gmadr.start + vma->node.start); (unsigned long)(ggtt->gmadr.start + vma->node.start);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment