On Wed, 2 May 2012 11:06:23 +0200
Daniel Vetter <daniel.vetter at ffwll.ch> wrote:
> Unfortunately it looks like further vlv patches are still stalled due
> to fried hw, and too many people are a bit annoyed about the unused
> function warning.
It is my preference that you never merge code which you know will
produce a warning. I still stand by adding a __used for intermediate
patches.
>
> So let's just rip it out, we can easily put it back in again.
>
> Cc: Jesse Barnes <jbarnes at virtuousgeek.org>
> Signed-Off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
> ---
> drivers/gpu/drm/i915/intel_display.c | 22 ----------------------
> 1 file changed, 22 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index e1716be..045f545 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -384,28 +384,6 @@ out_unlock:
> return val;
> }
>
> -static void intel_dpio_write(struct drm_i915_private *dev_priv, int reg,
> - u32 val)
> -{
> - unsigned long flags;
> -
> - spin_lock_irqsave(&dev_priv->dpio_lock, flags);
> - if (wait_for_atomic_us((I915_READ(DPIO_PKT) & DPIO_BUSY) == 0, 100)) {
> - DRM_ERROR("DPIO idle wait timed out\n");
> - goto out_unlock;
> - }
> -
> - I915_WRITE(DPIO_DATA, val);
> - I915_WRITE(DPIO_REG, reg);
> - I915_WRITE(DPIO_PKT, DPIO_RID | DPIO_OP_WRITE | DPIO_PORTID |
> - DPIO_BYTE);
> - if (wait_for_atomic_us((I915_READ(DPIO_PKT) & DPIO_BUSY) == 0, 100))
> - DRM_ERROR("DPIO write wait timed out\n");
> -
> -out_unlock:
> - spin_unlock_irqrestore(&dev_priv->dpio_lock, flags);
> -}
> -
> static void vlv_init_dpio(struct drm_device *dev)
> {
> struct drm_i915_private *dev_priv = dev->dev_private;
--
Ben Widawsky, Intel Open Source Technology Center
