Merge tag 'drm-misc-next-2023-01-19' of git://anongit.freedesktop.org/drm/drm-misc...

[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 03ed4607a46d2181dded13e42398ddfffa38b944..bbdb98d7c96e01ec45e004be48e3625fdb4459d5 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/display/intel_fbdev.c
@@ -267,23 +267,16 @@ static int intelfb_create(struct drm_fb_helper *helper,
 
        info->fbops = &intelfb_ops;
 
-       /* setup aperture base/size for vesafb takeover */
        obj = intel_fb_obj(&intel_fb->base);
        if (i915_gem_object_is_lmem(obj)) {
                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 */
                info->fix.smem_start =
                        (unsigned long)(mem->io_start +
                                        i915_gem_object_get_dma_address(obj, 0));
                info->fix.smem_len = obj->base.size;
        } 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 */
                info->fix.smem_start =
                        (unsigned long)(ggtt->gmadr.start + i915_ggtt_offset(vma));