Attachment 21601 Details for Bug 18879 – don't remove irq handler (take #2)

[patch] don't remove irq handler (take #2)

i915-no-irq-uninstall-2.patch (text/plain), 1.36 KB, created by Jesse Barnes on 2008-12-31 11:31:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jesse Barnes

Created: 2008-12-31 11:31:39 UTC

Size: 1.36 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
>index feec3a7..cc6551a 100644
>--- a/drivers/gpu/drm/i915/i915_gem.c
>+++ b/drivers/gpu/drm/i915/i915_gem.c
>@@ -2530,6 +2530,10 @@ i915_gem_init_hws(struct drm_device *dev)
> 	if (!I915_NEED_GFX_HWS(dev))
> 		return 0;
> 
>+	/* Already set up */
>+	if (dev_priv->hws_obj)
>+		return 0;
>+
> 	obj = drm_gem_object_alloc(dev, 4096);
> 	if (obj == NULL) {
> 		DRM_ERROR("Failed to allocate status page\n");
>@@ -2673,21 +2677,6 @@ i915_gem_cleanup_ringbuffer(struct drm_device *dev)
> 	drm_gem_object_unreference(dev_priv->ring.ring_obj);
> 	dev_priv->ring.ring_obj = NULL;
> 	memset(&dev_priv->ring, 0, sizeof(dev_priv->ring));
>-
>-	if (dev_priv->hws_obj != NULL) {
>-		struct drm_gem_object *obj = dev_priv->hws_obj;
>-		struct drm_i915_gem_object *obj_priv = obj->driver_private;
>-
>-		kunmap(obj_priv->page_list[0]);
>-		i915_gem_object_unpin(obj);
>-		drm_gem_object_unreference(obj);
>-		dev_priv->hws_obj = NULL;
>-		memset(&dev_priv->hws_map, 0, sizeof(dev_priv->hws_map));
>-		dev_priv->hw_status_page = NULL;
>-
>-		/* Write high address into HWS_PGA when disabling. */
>-		I915_WRITE(HWS_PGA, 0x1ffff000);
>-	}
> }
> 
> int
>@@ -2732,7 +2721,6 @@ i915_gem_leavevt_ioctl(struct drm_device *dev, void *data,
> 	int ret;
> 
> 	ret = i915_gem_idle(dev);
>-	drm_irq_uninstall(dev);
> 
> 	io_mapping_free(dev_priv->mm.gtt_mapping);
> 	return ret;

Actions: View | Splinter Review

Attachments on bug 18879: 21423 | 21424 | 21571 | 21582 | 21601 | 21728 | 21774

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.