From a911d8717f41ac64bddc23b87a70596a58b1af10 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Tue, 18 Jul 2017 16:43:11 +0200
Message-Id: <20170718144320.8354-6-tiwai@suse.de>
Subject: [PATCH 05/14] drm/mgag200: Initialize data needed to map fbdev memory
Patch-mainline: Submitted, dri-devel ML
References: bnc#806990
Due to a missing initialization there was no way to map fbdev memory.
Thus for example using the Xserver with the fbdev driver failed.
This fix adds initialization for fix.smem_start and fix.smem_len
in the fb_info structure, which fixes this problem.
Signed-off-by: Egbert Eich <eich@suse.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
drivers/gpu/drm/mgag200/mgag200_drv.h | 1 +
drivers/gpu/drm/mgag200/mgag200_fb.c | 7 +++++++
drivers/gpu/drm/mgag200/mgag200_mode.c | 3 ++-
3 files changed, 10 insertions(+), 1 deletion(-)
--- a/drivers/gpu/drm/mgag200/mgag200_drv.h
+++ b/drivers/gpu/drm/mgag200/mgag200_drv.h
@@ -245,6 +245,7 @@ void mgag200_modeset_fini(struct mga_dev
/* mgag200_fb.c */
int mgag200_fbdev_init(struct mga_device *mdev);
void mgag200_fbdev_fini(struct mga_device *mdev);
+void mgag200_fbdev_set_base(struct mga_device *mdev, unsigned long gpu_addr);
/* mgag200_main.c */
int mgag200_framebuffer_init(struct drm_device *dev,
--- a/drivers/gpu/drm/mgag200/mgag200_fb.c
+++ b/drivers/gpu/drm/mgag200/mgag200_fb.c
@@ -312,3 +312,10 @@ void mgag200_fbdev_fini(struct mga_devic
mga_fbdev_destroy(mdev->dev, mdev->mfbdev);
}
+
+void mgag200_fbdev_set_base(struct mga_device *mdev, unsigned long gpu_addr)
+{
+ mdev->mfbdev->helper.fbdev->fix.smem_start =
+ mdev->mfbdev->helper.fbdev->apertures->ranges[0].base + gpu_addr;
+ mdev->mfbdev->helper.fbdev->fix.smem_len = mdev->mc.vram_size - gpu_addr;
+}
--- a/drivers/gpu/drm/mgag200/mgag200_mode.c
+++ b/drivers/gpu/drm/mgag200/mgag200_mode.c
@@ -901,7 +901,8 @@ static int mga_crtc_do_set_base(struct d
ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.num_pages, &bo->kmap);
if (ret)
DRM_ERROR("failed to kmap fbcon\n");
-
+ else
+ mgag200_fbdev_set_base(mdev, gpu_addr);
}
mgag200_bo_unreserve(bo);