[kernel] r15177 - in dists/trunk/linux-2.6/debian: . patches/bugfix/all patches/series

[Maximilian Attems]

Author: maks
Date: Tue Feb 16 13:15:38 2010
New Revision: 15177

Log:
add efifb fix from bugzilla

Reported-by: Julien Cristau <jcristau at debian.org>

Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/all/efifb_fix_v2.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/9

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Tue Feb 16 12:20:49 2010	(r15176)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Feb 16 13:15:38 2010	(r15177)
@@ -13,6 +13,7 @@
   * Enable VT_HW_CONSOLE_BINDING for unbinding efifb. (closes: #569314)
   * hwmon: Add driver for VIA CPU core temperature.
   * wireless: report reasonable bitrate for MCS rates through wext.
+  * efifb: fix framebuffer handoff. (bugzilla.k.o #15151)
 
   [ Bastian Blank ]
   * Restrict access to sensitive SysRq keys by default.

Added: dists/trunk/linux-2.6/debian/patches/bugfix/all/efifb_fix_v2.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/efifb_fix_v2.patch	Tue Feb 16 13:15:38 2010	(r15177)
@@ -0,0 +1,54 @@
+From: Marcin Slusarz <marcin.slusarz at gmail.com>
+Subject: [PATCH] efifb: fix framebuffer handoff
+
+Commit 4410f3910947dcea8672280b3adecd53cec4e85e
+(fbdev: add support for handoff from firmware to hw framebuffers)
+for unknown reason didn't add fb_destroy operation to efifb.
+Change aperture_size to match size passed to request_mem_region.
+
+See: http://bugzilla.kernel.org/show_bug.cgi?id=15151
+
+Reported-by: Alex Zhavnerchik <alex.vizor at gmail.com>
+Tested-by: Alex Zhavnerchik <alex.vizor at gmail.com>
+Cc: Dave Airlie <airlied at redhat.com>
+Cc: linux-fbdev at vger.kernel.org
+Cc: dri-devel at lists.sourceforge.net
+Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
+---
+ drivers/video/efifb.c |   11 ++++++++++-
+ 1 files changed, 10 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/video/efifb.c b/drivers/video/efifb.c
+index eb12182..d25df51 100644
+--- a/drivers/video/efifb.c
++++ b/drivers/video/efifb.c
+@@ -161,8 +161,17 @@ static int efifb_setcolreg(unsigned regno, unsigned red, unsigned green,
+ 	return 0;
+ }
+ 
++static void efifb_destroy(struct fb_info *info)
++{
++	if (info->screen_base)
++		iounmap(info->screen_base);
++	release_mem_region(info->aperture_base, info->aperture_size);
++	framebuffer_release(info);
++}
++
+ static struct fb_ops efifb_ops = {
+ 	.owner		= THIS_MODULE,
++	.fb_destroy	= efifb_destroy,
+ 	.fb_setcolreg	= efifb_setcolreg,
+ 	.fb_fillrect	= cfb_fillrect,
+ 	.fb_copyarea	= cfb_copyarea,
+@@ -281,7 +290,7 @@ static int __init efifb_probe(struct platform_device *dev)
+ 	info->par = NULL;
+ 
+ 	info->aperture_base = efifb_fix.smem_start;
+-	info->aperture_size = size_total;
++	info->aperture_size = size_remap;
+ 
+ 	info->screen_base = ioremap(efifb_fix.smem_start, efifb_fix.smem_len);
+ 	if (!info->screen_base) {
+-- 
+1.6.6
+

Modified: dists/trunk/linux-2.6/debian/patches/series/9
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/9	Tue Feb 16 12:20:49 2010	(r15176)
+++ dists/trunk/linux-2.6/debian/patches/series/9	Tue Feb 16 13:15:38 2010	(r15177)
@@ -7,3 +7,4 @@
 + features/all/macvlan-export-macvlan-mode-through-netlink.patch
 + features/all/hwmon-Add-driver-for-VIA-CPU-core-temperature.patch
 + features/all/wireless-report-reasonable-bitrate-for-MCS-rates-th.patch
++ bugfix/all/efifb_fix_v2.patch