Skip to contentSkip to conversation

emgd: build fixups

PATCH In review Tom Zanussi 1 participant 1 message Feb 26, 2011

Subsystems (2)
DRM drivers DRM misc
lore
Share & tools
lore

Tom Zanussi

author
#0 lore raw

PATCH 2/3 emgd: build fixups

From: Tom Zanussi <[email protected]>

Add emgd config option (DRM_EGD) and modify Makefiles for in-tree builds.

Also added 2.6.34 compile fixes here, for bisectibility:

drivers/gpu/drm/emgd/emgd/gmm/gtt.c +1 -1
index 1123630..9af741c 100644
@@ -132,7 +132,7 @@ static void invalidate_vma(unsigned long pg_offset, unsigned long bus_addr) {
                        } else {
                                atomic_add_negative(-1, &pte_page(*pte)->_mapcount);
                                put_page(pte_page(*pte));
-                               dec_mm_counter(entry->vma->vm_mm, file_rss);
+                               dec_mm_counter(entry->vma->vm_mm, MM_FILEPAGES);
                        }
 
                        pte_clear(entry->vma->vm_mm, vaddr, pte);
Signed-off-by Tom Zanussi <[email protected]>
---
 drivers/gpu/drm/Kconfig             |    9 +++++++
 drivers/gpu/drm/Makefile            |    1 +
 drivers/gpu/drm/emgd/Makefile       |   41 +++-------------------------------
 drivers/gpu/drm/emgd/emgd/gmm/gtt.c |    2 +-
 4 files changed, 15 insertions(+), 38 deletions(-)
drivers/gpu/drm/Kconfig +9 -0
index 7af4436..d1e404d 100644
@@ -163,3 +163,12 @@ config DRM_SAVAGE
 	help
 	  Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister
 	  chipset. If M is selected the module will be called savage.
+
+config DRM_EGD
+	tristate "Intel EMGD"
+	depends on DRM
+	select DRM_KMS_HELPER
+	help
+	  Choose this option if you have an EMGD-supported chipset
+	  (Intel E6xx or System Controller Hub US15W/US15WP/WPT).
+	  If M is selected the module will be called emgd.
drivers/gpu/drm/Makefile +1 -0
index 997c43d..cc38afa 100644
@@ -36,4 +36,5 @@ obj-$(CONFIG_DRM_SAVAGE)+= savage/
 obj-$(CONFIG_DRM_VMWGFX)+= vmwgfx/
 obj-$(CONFIG_DRM_VIA)	+=via/
 obj-$(CONFIG_DRM_NOUVEAU) +=nouveau/
+obj-$(CONFIG_DRM_EGD)	+=emgd/
 obj-y			+= i2c/
drivers/gpu/drm/emgd/Makefile +4 -37

68 lines not on this page · raw message

drivers/gpu/drm/emgd/emgd/gmm/gtt.c +1 -1
index 1123630..9af741c 100644
@@ -132,7 +132,7 @@ static void invalidate_vma(unsigned long pg_offset, unsigned long bus_addr) {
 			} else {
 				atomic_add_negative(-1, &pte_page(*pte)->_mapcount);
 				put_page(pte_page(*pte));
-				dec_mm_counter(entry->vma->vm_mm, file_rss);
+				dec_mm_counter(entry->vma->vm_mm, MM_FILEPAGES);
 			}
 
 			pte_clear(entry->vma->vm_mm, vaddr, pte);
Signature · 1 line
1.7.0.4