summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorHong Liu <hong.liu@intel.com>2008-05-09 10:06:17 +0800
committerJesse Barnes <jbarnes@nietzche.virtuousgeek.org>2008-05-12 12:31:56 -0700
commita51e38548cfdece2978e9b5f0d6f0467ba7a7272 (patch)
treebe8ee6a1f706d4e75a17cb04c2480e7501dc3b63 /linux-core
parentb2dee13f5d7209b62c5e9ba8cd059717a8302fec (diff)
fix kernel oops when removing fb
drm_crtc->fb may point to NULL, f.e X server will allocate a new fb and assign it to the CRTC at startup, when X server exits, it will destroy the allocated fb, making drm_crtc->fb points to NULL.
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/drmP.h2
-rw-r--r--linux-core/drm_crtc.c2
-rw-r--r--linux-core/intel_drv.h2
-rw-r--r--linux-core/intel_fb.c4
-rw-r--r--linux-core/radeon_ms_fb.c2
5 files changed, 5 insertions, 7 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index 52d2782a..60ae018e 100644
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@ -744,7 +744,7 @@ struct drm_driver {
/* FB routines, if present */
int (*fb_probe)(struct drm_device *dev, struct drm_crtc *crtc, struct drm_output *output);
- int (*fb_remove)(struct drm_device *dev, struct drm_crtc *crtc);
+ int (*fb_remove)(struct drm_device *dev, struct drm_framebuffer *fb);
int (*fb_resize)(struct drm_device *dev, struct drm_crtc *crtc);
/* Master routines */
diff --git a/linux-core/drm_crtc.c b/linux-core/drm_crtc.c
index 2bc1c4e3..c011db30 100644
--- a/linux-core/drm_crtc.c
+++ b/linux-core/drm_crtc.c
@@ -1095,7 +1095,7 @@ void drm_mode_config_cleanup(struct drm_device *dev)
if (fb->bo->type != drm_bo_type_kernel)
drm_framebuffer_destroy(fb);
else
- dev->driver->fb_remove(dev, drm_crtc_from_fb(dev, fb));
+ dev->driver->fb_remove(dev, fb);
}
list_for_each_entry_safe(crtc, ct, &dev->mode_config.crtc_list, head) {
diff --git a/linux-core/intel_drv.h b/linux-core/intel_drv.h
index 6b89c000..e97117de 100644
--- a/linux-core/intel_drv.h
+++ b/linux-core/intel_drv.h
@@ -91,7 +91,7 @@ extern int intel_sdvo_supports_hotplug(struct drm_output *output);
extern void intel_sdvo_set_hotplug(struct drm_output *output, int enable);
extern int intelfb_probe(struct drm_device *dev, struct drm_crtc *crtc, struct drm_output *output);
-extern int intelfb_remove(struct drm_device *dev, struct drm_crtc *crtc);
+extern int intelfb_remove(struct drm_device *dev, struct drm_framebuffer *fb);
extern int intelfb_resize(struct drm_device *dev, struct drm_crtc *crtc);
#endif /* __INTEL_DRV_H__ */
diff --git a/linux-core/intel_fb.c b/linux-core/intel_fb.c
index 50c24a75..9934e3af 100644
--- a/linux-core/intel_fb.c
+++ b/linux-core/intel_fb.c
@@ -767,9 +767,8 @@ int intelfb_probe(struct drm_device *dev, struct drm_crtc *crtc, struct drm_outp
}
EXPORT_SYMBOL(intelfb_probe);
-int intelfb_remove(struct drm_device *dev, struct drm_crtc *crtc)
+int intelfb_remove(struct drm_device *dev, struct drm_framebuffer *fb)
{
- struct drm_framebuffer *fb = crtc->fb;
struct fb_info *info;
if (!fb)
@@ -784,7 +783,6 @@ int intelfb_remove(struct drm_device *dev, struct drm_crtc *crtc)
drm_framebuffer_destroy(fb);
framebuffer_release(info);
}
- crtc->fb = NULL;
return 0;
}
EXPORT_SYMBOL(intelfb_remove);
diff --git a/linux-core/radeon_ms_fb.c b/linux-core/radeon_ms_fb.c
index ae4f2da5..082279ec 100644
--- a/linux-core/radeon_ms_fb.c
+++ b/linux-core/radeon_ms_fb.c
@@ -438,7 +438,7 @@ int radeonfb_probe(struct drm_device *dev, struct drm_crtc *crtc, struct drm_out
}
EXPORT_SYMBOL(radeonfb_probe);
-int radeonfb_remove(struct drm_device *dev, struct drm_crtc *crtc)
+int radeonfb_remove(struct drm_device *dev, struct drm_framebuffer *kern_fb)
{
struct drm_radeon_private *dev_priv = dev->dev_private;
struct amd_fb *fb = dev_priv->fb;