drm/i915/fbdev: Fix smem_start for LMEMBAR stolen objects

From Ville Syrjala
f1ee98cff3d86271491b08315fcdfa4c3f097e1e in mainline linux

diff --git a/sys/dev/pci/drm/i915/display/intel_fbdev.c b/sys/dev/pci/drm/i915/display/intel_fbdev.c
index 63f6bba..53c4282 100644 (file)
--- a/sys/dev/pci/drm/i915/display/intel_fbdev.c
+++ b/sys/dev/pci/drm/i915/display/intel_fbdev.c
@@ -295,7 +295,8 @@ static int intelfb_create(struct drm_fb_helper *helper,
                /* 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));
+                                       i915_gem_object_get_dma_address(obj, 0) -
+                                       mem->region.start);
                info->fix.smem_len = obj->base.size;
        } else {
                /* Our framebuffer is the entirety of fbdev's system memory */