diff options
| author | chunsang <paul@ubuntu.(none)> | 2011-06-07 21:45:59 +0900 |
|---|---|---|
| committer | chunsang <paul@ubuntu.(none)> | 2011-06-07 21:45:59 +0900 |
| commit | 9a787100ea848f38e62a2a6125ab0b50edfab0bd (patch) | |
| tree | 7adacd55cb3435e47c208dc6ecfde065da2ad813 | |
| parent | cf8fd3634d1443217abe73e92346747fe267618c (diff) | |
Updated Mali and UMP driver for linux-linaro-2.6.39
| -rwxr-xr-x | drivers/gpu/arm/mali/Makefile | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/mali/mali_drv.c | 24 |
2 files changed, 25 insertions, 3 deletions
diff --git a/drivers/gpu/arm/mali/Makefile b/drivers/gpu/arm/mali/Makefile index f7af3c5717d6..47a147dd608d 100755 --- a/drivers/gpu/arm/mali/Makefile +++ b/drivers/gpu/arm/mali/Makefile @@ -14,8 +14,8 @@ MALI_FILE_PREFIX := drivers/gpu/arm/mali KBUILDROOT = # Add platform configuration file for Mali -ifeq ($(CONFIG_ARCH_S5PV310),y) -MACHDIR := arch/arm/mach-s5pv310 +ifeq ($(CONFIG_ARCH_EXYNOS4),y) +MACHDIR := arch/arm/mach-exynos4 MALICONFIGDIR :=$(MACHDIR)/include/mach/mali endif diff --git a/drivers/gpu/drm/mali/mali_drv.c b/drivers/gpu/drm/mali/mali_drv.c index 3d959bba62fe..1bc76e98d6b8 100644 --- a/drivers/gpu/drm/mali/mali_drv.c +++ b/drivers/gpu/drm/mali/mali_drv.c @@ -17,6 +17,17 @@ #include "drmP.h" #include "mali_drv.h" +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39) +static struct pci_device_id pciidlist[] = { + /*need to fill this with right id lists*/ +}; + +static struct pci_driver mali_pci_driver = { + .name = DRIVER_NAME, + .id_table = pciidlist, +}; +#endif + void mali_drm_preclose(struct drm_device *dev) { } @@ -47,7 +58,9 @@ static int mali_drm_unload(struct drm_device *dev) static struct drm_driver driver = { +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39) .driver_features = DRIVER_USE_PLATFORM_DEVICE, +#endif .load = mali_drm_load, .unload = mali_drm_unload, .context_dtor = NULL, @@ -83,14 +96,23 @@ int mali_drm_init(struct platform_device *dev) { printk(KERN_INFO "Mali DRM initialize, driver name: %s, version %d.%d\n", DRIVER_NAME, DRIVER_MAJOR, DRIVER_MINOR); driver.num_ioctls = 0; +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) driver.platform_device = dev; - +#endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39) return drm_init(&driver); +#else + return drm_pci_init(&driver, &mali_pci_driver); +#endif } void mali_drm_exit(void) { +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39) drm_exit(&driver); +#else + drm_pci_exit(&driver, &mali_pci_driver); +#endif } static int __devinit mali_platform_drm_probe(struct platform_device *dev) |