[Intel-gfx] [PATCH] drm/i915: Disregard drm_mode_config.fb_base

Chris Wilson chris at chris-wilson.co.uk
Tue Aug 13 18:08:00 UTC 2019


Quoting Chris Wilson (2019-08-13 18:47:35)
> diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c
> index 5e7cc5a6ac7f..8eb220e9e58f 100644
> --- a/drivers/gpu/drm/i915/display/intel_fbdev.c
> +++ b/drivers/gpu/drm/i915/display/intel_fbdev.c
> @@ -232,10 +232,10 @@ static int intelfb_create(struct drm_fb_helper *helper,
>         info->fbops = &intelfb_ops;
>  
>         /* setup aperture base/size for vesafb takeover */
> -       info->apertures->ranges[0].base = dev->mode_config.fb_base;
> +       info->apertures->ranges[0].base = ggtt->gmadr.start;
>         info->apertures->ranges[0].size = ggtt->mappable_end;
>  
> -       info->fix.smem_start = dev->mode_config.fb_base + i915_ggtt_offset(vma);
> +       info->fix.smem_start = ggtt->gmadr.start + i915_ggtt_offset(vma);
>         info->fix.smem_len = vma->node.size;
>  
>         vaddr = i915_vma_pin_iomap(vma);

Staring at this a bit more, smem_start _is_ vaddr. That should make the
relationship a bit more obvious?
-Chris


More information about the Intel-gfx mailing list