rpms/psb-kmod/F-13 0001-psb-Declare-firmware.patch, NONE, 1.1 0002-psb-If-not-asking-for-debug-is-an-error-I-want-to-be.patch, NONE, 1.1 0003-psb-Fix-framebuffer.patch, NONE, 1.1 psb-kmod.spec, 1.3, 1.4

[Adam Williamson]

Author: adamwill

Update of /cvs/nonfree/rpms/psb-kmod/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17826

Modified Files:
	psb-kmod.spec 
Added Files:
	0001-psb-Declare-firmware.patch 
	0002-psb-If-not-asking-for-debug-is-an-error-I-want-to-be.patch 
	0003-psb-Fix-framebuffer.patch 
Log Message:
* Wed Aug 04 2010 Adam Williamson <adamwill AT shaw DOT ca> - 4.41.1-13
- add three patches from Matthew Garrett:
	+ Declare-firmware.patch (declare module firmware)
	+ If-not-asking-for-debug...patch (clean up debug error)
	+ Fix-framebuffer.patch (fix framebuffer)


0001-psb-Declare-firmware.patch:
 psb_drv.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE 0001-psb-Declare-firmware.patch ---
>From 0149839482b34dc7fe399c0cc7ee4747279b5eab Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg at redhat.com>
Date: Mon, 2 Aug 2010 11:16:29 -0400
Subject: [PATCH 1/3] psb: Declare firmware

---
 psb_drv.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/psb_drv.c b/psb_drv.c
index 2a2e8d4..618dfcd 100644
--- a/psb_drv.c
+++ b/psb_drv.c
@@ -55,6 +55,8 @@ int psb_init_yres;
 extern int SII_1392;
 #endif
 
+MODULE_FIRMWARE("msvdx_fw.bin");
+
 MODULE_PARM_DESC(debug, "Enable debug output");
 MODULE_PARM_DESC(clock_gating, "clock gating");
 MODULE_PARM_DESC(no_fb, "Disable FBdev");
-- 
1.7.2


0002-psb-If-not-asking-for-debug-is-an-error-I-want-to-be.patch:
 psb_drv.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE 0002-psb-If-not-asking-for-debug-is-an-error-I-want-to-be.patch ---
>From 7051c003142ed6340b14783d7e4dc6386ccfebe8 Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg at redhat.com>
Date: Mon, 2 Aug 2010 11:41:54 -0400
Subject: [PATCH 2/3] psb: If not asking for debug is an error, I want to be right

---
 psb_drv.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/psb_drv.c b/psb_drv.c
index 618dfcd..76b4a01 100644
--- a/psb_drv.c
+++ b/psb_drv.c
@@ -265,7 +265,8 @@ static int psb_do_init(struct drm_device *dev)
 
 	int ret = -ENOMEM;
 
-	DRM_ERROR("Debug is 0x%08x\n", drm_psb_debug);
+	if (drm_psb_debug)
+		DRM_ERROR("Debug is 0x%08x\n", drm_psb_debug);
 
 	dev_priv->ta_mem_pages =
 	    PSB_ALIGN_TO(drm_psb_ta_mem_size * 1024, PAGE_SIZE) >> PAGE_SHIFT;
-- 
1.7.2


0003-psb-Fix-framebuffer.patch:
 psb_fb.c |   31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

--- NEW FILE 0003-psb-Fix-framebuffer.patch ---
>From 302d40a1664d1d1dbf8a3b0408736f091c397030 Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg at redhat.com>
Date: Mon, 2 Aug 2010 13:03:21 -0400
Subject: [PATCH 3/3] psb: Fix framebuffer

---
 psb_fb.c |   30 ++++++++++++++++++++++++------
 1 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/psb_fb.c b/psb_fb.c
index 72d1d14..2f10b90 100644
--- a/psb_fb.c
+++ b/psb_fb.c
@@ -420,8 +420,22 @@ static int psbfb_set_par(struct fb_info *info)
 	fb->depth = depth;
 
 	info->fix.line_length = fb->pitch;
-	info->fix.visual =
-	    (fb->depth == 8) ? FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_DIRECTCOLOR;
+
+	switch (fb->depth) {
+	case 8:
+		info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
+		break;
+	case 15:
+	case 16:
+		info->fix.visual = FB_VISUAL_DIRECTCOLOR;
+		break;
+	case 24:
+	case 32:
+		info->fix.visual = FB_VISUAL_TRUECOLOR;
+		break;
+	default:
+		BUG();
+	}
 
 	/* some fbdev's apps don't want these to change */
 	info->fix.smem_start = dev->mode_config.fb_base + fb->offset;
@@ -990,8 +1004,13 @@ void psbfb_resume(struct drm_device *dev)
  * Also, these should be the default vm ops for buffer object type fbs.
  */
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))
+extern int drm_bo_vm_nopfn(struct vm_area_struct *vma,
+			   struct vm_fault *vmf );
+#else
 extern unsigned long drm_bo_vm_nopfn(struct vm_area_struct *vma,
 				     unsigned long address);
+#endif
 
 /*
  * This wrapper is a bit ugly and is here because we need access to a mutex
@@ -1001,6 +1020,7 @@ extern unsigned long drm_bo_vm_nopfn(struct vm_area_struct *vma,
  * recursive locking.
  */
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
 static unsigned long psbfb_nopfn(struct vm_area_struct *vma,
 				 unsigned long address)
 {
@@ -1015,7 +1035,7 @@ static unsigned long psbfb_nopfn(struct vm_area_struct *vma,
 	mutex_unlock(&vi->vm_mutex);
 	return ret;
 }
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))
+#else
 static int psbfb_fault(struct vm_area_struct *vma,
 				 struct vm_fault *vmf)
 {
@@ -1023,12 +1043,10 @@ static int psbfb_fault(struct vm_area_struct *vma,
 	struct vm_area_struct tmp_vma;
 	unsigned long ret;
 
-        unsigned long address = (unsigned long)vmf->virtual_address;
-
 	mutex_lock(&vi->vm_mutex);
 	tmp_vma = *vma;
 	tmp_vma.vm_private_data = vi->bo;
-	ret = drm_bo_vm_nopfn(&tmp_vma, address);
+	ret = drm_bo_vm_nopfn(&tmp_vma, vmf);
 	mutex_unlock(&vi->vm_mutex);
 	return ret;
 }
-- 
1.7.2



Index: psb-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/psb-kmod/F-13/psb-kmod.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- psb-kmod.spec	27 Jul 2010 07:29:54 -0000	1.3
+++ psb-kmod.spec	4 Aug 2010 19:18:35 -0000	1.4
@@ -7,7 +7,7 @@
 
 Name:		psb-kmod
 Version:	4.41.1
-Release:	12%{?dist}.1
+Release:	13%{?dist}
 Summary:	Kernel module for Poulsbo graphics chipsets
 
 Group:		System Environment/Kernel
@@ -36,6 +36,12 @@
 Patch6:		psb-kernel-source-4.41.1-2.6.32.patch
 # Fix build for 2.6.34 (Eric Piel: https://patchwork.kernel.org/patch/90678/ )
 Patch7:		psb-kmod-4.41.1-2.6.34.patch
+# From Matthew Garrett: declare module firmware
+Patch8:		0001-psb-Declare-firmware.patch
+# From Matthew Garrett: clean up debug error
+Patch9:		0002-psb-If-not-asking-for-debug-is-an-error-I-want-to-be.patch
+# From Matthew Garrett: fix framebuffer
+Patch10:	0003-psb-Fix-framebuffer.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveArch:	i586 i686
 
@@ -74,6 +80,9 @@
   fi
 %patch4 -p1 -b .drmpsb
 %patch7 -p0 -b .build2634
+%patch8 -p1 -b .firmware
+%patch9 -p1 -b .debug
+%patch10 -p1 -b .framebuffer
  popd
 done
 
@@ -104,6 +113,12 @@
 
 
 %changelog
+* Wed Aug 04 2010 Adam Williamson <adamwill AT shaw DOT ca> - 4.41.1-13
+- add three patches from Matthew Garrett:
+	+ Declare-firmware.patch (declare module firmware)
+	+ If-not-asking-for-debug...patch (clean up debug error)
+	+ Fix-framebuffer.patch (fix framebuffer)
+
 * Tue Jul 27 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 4.41.1-12.1
 - rebuild for new kernel