lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SiS DRM: fix the memory allocator if the SIS FB is built as a module

Browse Source 
Fix the SIS DRM memory allocator if the SIS FB built as a module.  The SIS DRM
code initialises the mm allocation hooks, but _only_ if the SIS FB is not
built as a module because it depends on CONFIG_FB_SIS, and that's unset if the
SIS FB is not built in.  It must check CONFIG_FB_SIS_MODULE as well.

Signed-off-by: David Howells <dhowells@redhat.com>
Cc: Dave Airlie <airlied@linux.ie>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
David Howells
2008-07-30 12:29:37 -07:00
committed by Dave Airlie
parent ddb7f4cb81
commit 6bb9e4bff5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/sis/sis_mm.c
View File

@@ -41,7 +41,7 @@
#define AGP_TYPE 1 #define AGP_TYPE 1
#if defined(CONFIG_FB_SIS) #if defined(CONFIG_FB_SIS) || defined(CONFIG_FB_SIS_MODULE)
/* fb management via fb device */ /* fb management via fb device */
#define SIS_MM_ALIGN_SHIFT 0 #define SIS_MM_ALIGN_SHIFT 0
@@ -75,12 +75,12 @@ static unsigned long sis_sman_mm_offset(void *private, void *ref)
return ~((unsigned long)ref); return ~((unsigned long)ref);
} }
#else /* CONFIG_FB_SIS */ #else /* CONFIG_FB_SIS[_MODULE] */
#define SIS_MM_ALIGN_SHIFT 4 #define SIS_MM_ALIGN_SHIFT 4
#define SIS_MM_ALIGN_MASK ( (1 << SIS_MM_ALIGN_SHIFT) - 1) #define SIS_MM_ALIGN_MASK ( (1 << SIS_MM_ALIGN_SHIFT) - 1)
#endif /* CONFIG_FB_SIS */ #endif /* CONFIG_FB_SIS[_MODULE] */
static int sis_fb_init(struct drm_device *dev, void *data, struct drm_file *file_priv) static int sis_fb_init(struct drm_device *dev, void *data, struct drm_file *file_priv)
{ {
@@ -89,7 +89,7 @@ static int sis_fb_init(struct drm_device *dev, void *data, struct drm_file *file
int ret; int ret;
mutex_lock(&dev->struct_mutex); mutex_lock(&dev->struct_mutex);
#if defined(CONFIG_FB_SIS) #if defined(CONFIG_FB_SIS) || defined(CONFIG_FB_SIS_MODULE)
{ {
struct drm_sman_mm sman_mm; struct drm_sman_mm sman_mm;
sman_mm.private = (void *)0xFFFFFFFF; sman_mm.private = (void *)0xFFFFFFFF;