From 0c4f98c4131c00fe11c18461e0247cd2194fac60 Mon Sep 17 00:00:00 2001 From: "Sergey Semyonov (Serge)" Date: Mon, 27 Jan 2014 20:08:29 +0000 Subject: [PATCH] ddk:update to 3.12.9 git-svn-id: svn://kolibrios.org@4538 a494cfbc-eb01-0410-851d-a64ba20cac60 --- drivers/include/drm/drm_pciids.h | 2 +- drivers/include/linux/fb.h | 2 +- drivers/include/linux/math64.h | 4 ++-- drivers/include/linux/uapi/drm/i915_drm.h | 11 +++++++++++ drivers/include/syscall.h | 4 ++-- 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/drivers/include/drm/drm_pciids.h b/drivers/include/drm/drm_pciids.h index a6f2c8a58a..b59c48a837 100644 --- a/drivers/include/drm/drm_pciids.h +++ b/drivers/include/drm/drm_pciids.h @@ -588,7 +588,7 @@ {0x1002, 0x9645, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO2|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x9647, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP},\ {0x1002, 0x9648, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP},\ - {0x1002, 0x9649, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP},\ + {0x1002, 0x9649, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO2|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP},\ {0x1002, 0x964a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x964b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x964c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ diff --git a/drivers/include/linux/fb.h b/drivers/include/linux/fb.h index c65daffd48..5e81ffe2b0 100644 --- a/drivers/include/linux/fb.h +++ b/drivers/include/linux/fb.h @@ -1010,7 +1010,7 @@ extern void fb_pad_aligned_buffer(u8 *dst, u32 d_pitch, u8 *src, u32 s_pitch, u3 extern void fb_set_suspend(struct fb_info *info, int state); extern int fb_get_color_depth(struct fb_var_screeninfo *var, struct fb_fix_screeninfo *fix); -extern int fb_get_options(char *name, char **option); +extern int fb_get_options(const char *name, char **option); extern int fb_new_modelist(struct fb_info *info); extern struct fb_info *registered_fb[FB_MAX]; diff --git a/drivers/include/linux/math64.h b/drivers/include/linux/math64.h index aaf1d82eff..69ed5f5e9f 100644 --- a/drivers/include/linux/math64.h +++ b/drivers/include/linux/math64.h @@ -6,7 +6,7 @@ #if BITS_PER_LONG == 64 -#define div64_long(x,y) div64_s64((x),(y)) +#define div64_long(x, y) div64_s64((x), (y)) #define div64_ul(x, y) div64_u64((x), (y)) /** @@ -57,7 +57,7 @@ static inline s64 div64_s64(s64 dividend, s64 divisor) #elif BITS_PER_LONG == 32 -#define div64_long(x,y) div_s64((x),(y)) +#define div64_long(x, y) div_s64((x), (y)) #define div64_ul(x, y) div_u64((x), (y)) #ifndef div_u64_rem diff --git a/drivers/include/linux/uapi/drm/i915_drm.h b/drivers/include/linux/uapi/drm/i915_drm.h index 8dc18ab3c8..d072299f57 100644 --- a/drivers/include/linux/uapi/drm/i915_drm.h +++ b/drivers/include/linux/uapi/drm/i915_drm.h @@ -1050,4 +1050,15 @@ struct drm_i915_fb_info { __u32 pipe; }; +struct drm_i915_mask_update { + __u32 handle; + __u32 dx; + __u32 dy; + __u32 width; + __u32 height; + __u32 bo_pitch; + __u32 bo_map; +}; + + #endif /* _UAPI_I915_DRM_H_ */ diff --git a/drivers/include/syscall.h b/drivers/include/syscall.h index 9da071476e..6dbe68fe3c 100644 --- a/drivers/include/syscall.h +++ b/drivers/include/syscall.h @@ -501,12 +501,12 @@ int drm_order(unsigned long size); static inline void __iomem *ioremap(uint32_t offset, size_t size) { - return (void __iomem*) MapIoMem(offset, size, PG_SW|PG_NOCACHE); + return (void __iomem*) MapIoMem(offset, size, PG_SW|PG_NOCACHE|0x100); } static inline void __iomem *ioremap_wc(uint32_t offset, size_t size) { - return (void __iomem*) MapIoMem(offset, size, PG_SW|PG_NOCACHE); + return (void __iomem*) MapIoMem(offset, size, PG_SW|0x100); }