Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 555304f4 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: rip out intel_dpio_write again 



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.

So let's just rip it out, we can easily put it back in again.

Acked-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-Off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent b4aca010

drivers/gpu/drm/i915/intel_display.c

+0 −22
Original line number Original line Diff line number Diff line
@@ -384,28 +384,6 @@ u32 intel_dpio_read(struct drm_i915_private *dev_priv, int reg) 
	return val;

	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)

static void vlv_init_dpio(struct drm_device *dev)

{

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;