2011-06-03 13:11:47

by jiaweiwei

[permalink] [raw]
Subject: [PATCH]remove warning for drivers/gpu/drm/i915/intel_ringbuffer.c

From: Harry Wei <[email protected]>
When i compile kernel, it shows me two warnings
like below, so this patch can fix them.

[...]
CC [M] drivers/gpu/drm/i915/intel_dvo.o
CC [M] drivers/gpu/drm/i915/intel_ringbuffer.o
drivers/gpu/drm/i915/intel_ringbuffer.c:603: warning: ���ring_get_irq��� defined but not used
drivers/gpu/drm/i915/intel_ringbuffer.c:620: warning: ���ring_put_irq��� defined but not used
CC [M] drivers/gpu/drm/i915/intel_overlay.o
CC [M] drivers/gpu/drm/i915/intel_opregion.o
[...]


Signed-off-by: Harry Wei <[email protected]>

Index: prj/drivers/gpu/drm/i915/intel_ringbuffer.c
===================================================================
--- prj.orig/drivers/gpu/drm/i915/intel_ringbuffer.c 2011-06-03 20:37:35.523539547 +0800
+++ prj/drivers/gpu/drm/i915/intel_ringbuffer.c 2011-06-03 20:38:07.279539574 +0800
@@ -599,23 +599,6 @@
return 0;
}

-static bool
-ring_get_irq(struct intel_ring_buffer *ring, u32 flag)
-{
- struct drm_device *dev = ring->dev;
- drm_i915_private_t *dev_priv = dev->dev_private;
-
- if (!dev->irq_enabled)
- return false;
-
- spin_lock(&ring->irq_lock);
- if (ring->irq_refcount++ == 0)
- ironlake_enable_irq(dev_priv, flag);
- spin_unlock(&ring->irq_lock);
-
- return true;
-}
-
static void
ring_put_irq(struct intel_ring_buffer *ring, u32 flag)
{


2011-06-04 02:41:41

by jiaweiwei

[permalink] [raw]
Subject: Re: [PATCH]remove warning for drivers/gpu/drm/i915/intel_ringbuffer.c

On Fri, Jun 03, 2011 at 10:36:55AM -0700, Keith Packard wrote:
> On Fri, 3 Jun 2011 21:09:39 +0800, Harry Wei <[email protected]> wrote:
>
> > From: Harry Wei <[email protected]>
> > When i compile kernel, it shows me two warnings
> > like below, so this patch can fix them.
>
> This fix is already upstream; it wasn't included in the stable patch
> as it wasn't 'necessary' to fix the bug which is causing the warning
> (which ended up removing the last use of this function).
Hmmm..., i see.

Thanks
Harry Wei