From: Tom Zanussi <tom.zanussi@intel.com>
To: bruce.ashfield@windriver.com,poky@yoctoproject.org
Subject: [PATCH 2/3][KERNEL 2.6.37] emgd: build fixups
Date: Fri, 25 Feb 2011 18:36:19 -0600 [thread overview]
Message-ID: <b9dded$i2ioa8@orsmga002.jf.intel.com> (raw)
From: Tom Zanussi <tom.zanussi@intel.com>
Add emgd config option (DRM_EGD) and modify Makefiles for in-tree
builds.
Also added 2.6.34 compile fixes here, for bisectibility:
diff --git a/drivers/gpu/drm/emgd/emgd/gmm/gtt.c b/drivers/gpu/drm/emgd/emgd/gmm/gtt.c
index 1123630..9af741c 100644
--- a/drivers/gpu/drm/emgd/emgd/gmm/gtt.c
+++ b/drivers/gpu/drm/emgd/emgd/gmm/gtt.c
@@ -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 <tom.zanussi@intel.com>
---
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(-)
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 7af4436..d1e404d 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -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.
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index 997c43d..cc38afa 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -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/
diff --git a/drivers/gpu/drm/emgd/Makefile b/drivers/gpu/drm/emgd/Makefile
index 7661da9..73bf49b 100644
--- a/drivers/gpu/drm/emgd/Makefile
+++ b/drivers/gpu/drm/emgd/Makefile
@@ -19,10 +19,6 @@
#----------------------------------------------------------------------------
export EGD_TOPLEVEL = DRM Driver
-KERNELVER ?= $(shell uname -r)
-KERNELDIR ?= /lib/modules/$(KERNELVER)/build
-INSTALLDIR ?= /lib/modules/$(KERNELVER)/kernel/drivers/gpu/drm/emgd
-
BLUE = \033[34m
OFF = \033[0m
BUILD ?= release
@@ -30,7 +26,7 @@ CONFIG_PVR_RELEASE ?= $(BUILD)
CONFIG_DRM_EGD ?= m
# Get the include paths pointed to the right place.
-export EMGD_MOD_DIR ?= $(CURDIR)
+export EMGD_MOD_DIR ?= $(obj)
PROJECT_INCLUDES = \
-I$(EMGD_MOD_DIR)/include \
@@ -41,7 +37,7 @@ PROJECT_INCLUDES = \
-I$(EMGD_MOD_DIR)/emgd/cfg \
-I$(EMGD_MOD_DIR)/emgd/pal/lpd \
-I$(EMGD_MOD_DIR)/emgd/drm \
- -I$(KERNELDIR)/include/drm \
+ -Iinclude/drm \
-I$(EMGD_MOD_DIR)/pvr/include4 \
-I$(EMGD_MOD_DIR)/pvr/services4/include \
-I$(EMGD_MOD_DIR)/pvr/services4/include/env/linux \
@@ -113,6 +109,8 @@ ifeq ($(PDUMP),1)
EXTRA_CFLAGS += -DPDUMP=1
endif
+ccflags-y += $(EXTRA_CFLAGS)
+
EMGD_OBJS := \
emgd/drm/emgd_fb.o \
emgd/drm/emgd_mmap.o \
@@ -271,34 +269,3 @@ ifeq ($(PDUMP),1)
endif
obj-$(CONFIG_DRM_EGD) += emgd.o
-
-all:: clean modules
-
-modules::
- @echo $(CURDIR) -- $(CONFIG_PVR_RELEASE)
- @echo "$(MAKE) -C $(KERNELDIR) M=$(CURDIR) modules"
- @$(MAKE) -C $(KERNELDIR) M=$(CURDIR) modules
-
-clean::
- @rm -f $(emgd-y)
- @rm -f emgd.o emgd.mod.* emgd.ko Module.* modules.order
- @find . -name "*.cmd" -exec rm '{}' \;
-
-install::
- install -o root -g root -m 755 -d $(INSTALLDIR)
- install -o root -g root -m 744 emgd.ko $(INSTALLDIR)
- /sbin/depmod -a
-
-uninstall::
- rmmod $(INSTALLDIR)/emgd.ko
- rm -rf $(INSTALLDIR)/emgd.ko
- /sbin/depmod -a
-
-debug::
- export CONFIG_PVR_RELEASE=debug; $(MAKE) modules
-
-package:: clean
- @echo -e "$(BLUE)Packaging $(EGD_TOPLEVEL)$(OFF)";
- mkdir -p $(EGD_PKG)/driver/
- tar -C $(EMGD_MOD_DIR) --exclude "CVS" -czf $(EGD_PKG)/driver/emgd_drm.tgz *
-
diff --git a/drivers/gpu/drm/emgd/emgd/gmm/gtt.c b/drivers/gpu/drm/emgd/emgd/gmm/gtt.c
index 1123630..9af741c 100644
--- a/drivers/gpu/drm/emgd/emgd/gmm/gtt.c
+++ b/drivers/gpu/drm/emgd/emgd/gmm/gtt.c
@@ -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);
--
1.7.0.4
reply other threads:[~2011-02-26 0:36 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='b9dded$i2ioa8@orsmga002.jf.intel.com' \
--to=tom.zanussi@intel.com \
--cc=bruce.ashfield@windriver.com \
--cc=poky@yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.