From 3c998d8fcbb7745fd949347823eca678c6f904b8 Mon Sep 17 00:00:00 2001
From: Stephane Marchesin <marchesin@icps.u-strasbg.fr>
Date: Thu, 15 Nov 2007 16:00:25 +0100
Subject: nouveau: use get_property instead of of_get_property on pre-2.6.22
 kernels.

---
 shared-core/nouveau_state.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'shared-core/nouveau_state.c')

diff --git a/shared-core/nouveau_state.c b/shared-core/nouveau_state.c
index 57ae9243..1ece67a7 100644
--- a/shared-core/nouveau_state.c
+++ b/shared-core/nouveau_state.c
@@ -307,13 +307,17 @@ nouveau_card_init(struct drm_device *dev)
 	DRM_MEMORYBARRIER();
 #endif
 
-#if defined(__powerpc__)
+#if defined(__linux__) && defined(__powerpc__)
 	/* if we have an OF card, copy vbios to RAMIN */
 	dn = pci_device_to_OF_node(dev->pdev);
 	if (dn)
 	{
-		int size; 
+		int size;
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22))
 		const uint32_t *bios = of_get_property(dn, "NVDA,BMP", &size);
+#else
+		const uint32_t *bios = get_property(dn, "NVDA,BMP", &size);
+#endif
 		if (bios)
 		{
 			int i;
-- 
cgit v1.2.3


From baf5d20297577c81d0a6be1abcc45555ed83643c Mon Sep 17 00:00:00 2001
From: Stephane Marchesin <marchesin@icps.u-strasbg.fr>
Date: Thu, 15 Nov 2007 20:42:38 +0100
Subject: nouveau: be verbose about PPC bios for now.

---
 shared-core/nouveau_state.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'shared-core/nouveau_state.c')

diff --git a/shared-core/nouveau_state.c b/shared-core/nouveau_state.c
index 1ece67a7..3638a054 100644
--- a/shared-core/nouveau_state.c
+++ b/shared-core/nouveau_state.c
@@ -323,8 +323,13 @@ nouveau_card_init(struct drm_device *dev)
 			int i;
 			for(i=0;i<size;i+=4)
 				NV_WI32(i, bios[i/4]);
+			DRM_INFO("OF bios successfully copied\n");
 		}
+		else
+			DRM_INFO("Unable to get the OF bios\n");
 	}
+	else
+		DRM_INFO("Unable to get the OF node\n");
 #endif
 
 	/* Determine exact chipset we're running on */
-- 
cgit v1.2.3


From 307fc3c92c85ded23de414b0d1a3d48f934c666d Mon Sep 17 00:00:00 2001
From: Stephane Marchesin <marchesin@icps.u-strasbg.fr>
Date: Fri, 16 Nov 2007 15:02:25 +0100
Subject: nouveau: also mention the number of succcessfully copied bios bytes.

---
 shared-core/nouveau_state.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'shared-core/nouveau_state.c')

diff --git a/shared-core/nouveau_state.c b/shared-core/nouveau_state.c
index 3638a054..7c9503e8 100644
--- a/shared-core/nouveau_state.c
+++ b/shared-core/nouveau_state.c
@@ -323,7 +323,7 @@ nouveau_card_init(struct drm_device *dev)
 			int i;
 			for(i=0;i<size;i+=4)
 				NV_WI32(i, bios[i/4]);
-			DRM_INFO("OF bios successfully copied\n");
+			DRM_INFO("OF bios successfully copied (%d bytes)\n",size);
 		}
 		else
 			DRM_INFO("Unable to get the OF bios\n");
-- 
cgit v1.2.3