From c93c8e0e557c60035e5e38f614df7a0ce0b8d0cc Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Mon, 4 Oct 2010 15:33:04 +0100 Subject: [PATCH] --- yaml --- r: 218143 b: refs/heads/master c: 7b4f3990a22fbe800945f12001bc30db374d0af5 h: refs/heads/master i: 218141: 5ec61e2fc8f4e7ec8b231e5bae308162edfc4945 218139: 1ab0c20aea17a3eeb4fc092a213df037830c7aac 218135: 869bbf79e1abf438b3510050967e4c3a966784fa 218127: 58948254abf8653355ad03665840770fda339fef 218111: 66d32e678627b59e2c45bde8db417154cf85e6d0 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_dma.c | 1 + trunk/drivers/gpu/drm/i915/intel_display.c | 2 -- trunk/drivers/gpu/drm/i915/intel_fb.c | 8 +++----- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index f40378191aad..02ff6347876d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2c6be944111a873ce96865f1a6033056bdf0d0e2 +refs/heads/master: 7b4f3990a22fbe800945f12001bc30db374d0af5 diff --git a/trunk/drivers/gpu/drm/i915/i915_dma.c b/trunk/drivers/gpu/drm/i915/i915_dma.c index df86d04f7968..726c3736082f 100644 --- a/trunk/drivers/gpu/drm/i915/i915_dma.c +++ b/trunk/drivers/gpu/drm/i915/i915_dma.c @@ -2106,6 +2106,7 @@ int i915_driver_unload(struct drm_device *dev) acpi_video_unregister(); if (drm_core_check_feature(dev, DRIVER_MODESET)) { + intel_fbdev_fini(dev); intel_modeset_cleanup(dev); /* diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c index f55b560c468f..69c54c5a4254 100644 --- a/trunk/drivers/gpu/drm/i915/intel_display.c +++ b/trunk/drivers/gpu/drm/i915/intel_display.c @@ -6130,8 +6130,6 @@ void intel_modeset_cleanup(struct drm_device *dev) drm_kms_helper_poll_fini(dev); mutex_lock(&dev->struct_mutex); - intel_fbdev_fini(dev); - list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { /* Skip inactive CRTCs */ if (!crtc->fb) diff --git a/trunk/drivers/gpu/drm/i915/intel_fb.c b/trunk/drivers/gpu/drm/i915/intel_fb.c index 7af4accafb7f..7dc50acd65d7 100644 --- a/trunk/drivers/gpu/drm/i915/intel_fb.c +++ b/trunk/drivers/gpu/drm/i915/intel_fb.c @@ -206,8 +206,8 @@ static struct drm_fb_helper_funcs intel_fb_helper_funcs = { .fb_probe = intel_fb_find_or_create_single, }; -static int intel_fbdev_destroy(struct drm_device *dev, - struct intel_fbdev *ifbdev) +static void intel_fbdev_destroy(struct drm_device *dev, + struct intel_fbdev *ifbdev) { struct fb_info *info; struct intel_framebuffer *ifb = &ifbdev->ifb; @@ -225,9 +225,7 @@ static int intel_fbdev_destroy(struct drm_device *dev, drm_framebuffer_cleanup(&ifb->base); if (ifb->obj) - drm_gem_object_unreference(ifb->obj); - - return 0; + drm_gem_object_unreference_unlocked(ifb->obj); } int intel_fbdev_init(struct drm_device *dev)