[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <929476d0b102eceaed62173ffb2acb6ac97e5796.1397812482.git.jslaby@suse.cz>
Date: Fri, 18 Apr 2014 11:21:48 +0200
From: Jiri Slaby <jslaby@...e.cz>
To: stable@...r.kernel.org
Cc: linux-kernel@...r.kernel.org,
Martin Koegler <martin.koegler@...llo.at>,
Takashi Iwai <tiwai@...e.de>, Dave Airlie <airlied@...hat.com>,
Jiri Slaby <jslaby@...e.cz>
Subject: [PATCH 3.12 15/72] drm/cirrus: Fix cirrus drm driver for fbdev + qemu
From: Martin Koegler <martin.koegler@...llo.at>
3.12-stable review patch. If anyone has any objections, please let me know.
===============
commit 99d4a8ae93ead27b5a88cdbd09dc556fe96ac3a8 upstream.
Xorg fbdev driver requires smem_start/smem_len, otherwise
it tries to map 0 bytes as video memory.
Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=856760
Signed-off-by: Martin Koegler <martin.koegler@...llo.at>
Signed-off-by: Takashi Iwai <tiwai@...e.de>
Signed-off-by: Dave Airlie <airlied@...hat.com>
Signed-off-by: Jiri Slaby <jslaby@...e.cz>
---
drivers/gpu/drm/cirrus/cirrus_fbdev.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/gpu/drm/cirrus/cirrus_fbdev.c b/drivers/gpu/drm/cirrus/cirrus_fbdev.c
index 86d779a9c245..32bbba0a787b 100644
--- a/drivers/gpu/drm/cirrus/cirrus_fbdev.c
+++ b/drivers/gpu/drm/cirrus/cirrus_fbdev.c
@@ -233,6 +233,9 @@ static int cirrusfb_create(struct drm_fb_helper *helper,
info->apertures->ranges[0].base = cdev->dev->mode_config.fb_base;
info->apertures->ranges[0].size = cdev->mc.vram_size;
+ info->fix.smem_start = cdev->dev->mode_config.fb_base;
+ info->fix.smem_len = cdev->mc.vram_size;
+
info->screen_base = sysram;
info->screen_size = size;
--
1.9.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists