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

Commit 328fc132 authored by Chris Wilson's avatar Chris Wilson
Browse files

Revert "drm/i915: add MMIO debug output" 

We can use mmiotrace instead of our own debug printks.

This reverts commit be282fd4.

Conflicts:

	drivers/gpu/drm/i915/i915_drv.h
parent f2a630bf

drivers/gpu/drm/i915/i915_drv.h

+2 −28
Original line number Original line Diff line number Diff line
@@ -287,9 +287,6 @@ typedef struct drm_i915_private { 
	int front_offset;

	int front_offset;

	int current_page;

	int current_page;

	int page_flipping;

	int page_flipping;

#define I915_DEBUG_READ (1<<0)

#define I915_DEBUG_WRITE (1<<1)

	unsigned long debug_flags;





	wait_queue_head_t irq_queue;

	wait_queue_head_t irq_queue;

	atomic_t irq_received;

	atomic_t irq_received;
@@ -1172,26 +1169,8 @@ extern void intel_overlay_print_error_state(struct seq_file *m, struct intel_ove 
		LOCK_TEST_WITH_RETURN(dev, file_priv);			\

		LOCK_TEST_WITH_RETURN(dev, file_priv);			\

} while (0)

} while (0)





static inline u32 i915_read(struct drm_i915_private *dev_priv, u32 reg)

#define I915_READ(reg)          readl(dev_priv->regs + (reg))

{

#define I915_WRITE(reg, val)     writel(val, dev_priv->regs + (reg))

	u32 val;



	val = readl(dev_priv->regs + reg);

	if (dev_priv->debug_flags & I915_DEBUG_READ)

		printk(KERN_ERR "read 0x%08x from 0x%08x\n", val, reg);

	return val;

}



static inline void i915_write(struct drm_i915_private *dev_priv, u32 reg,

			      u32 val)

{

	writel(val, dev_priv->regs + reg);

	if (dev_priv->debug_flags & I915_DEBUG_WRITE)

		printk(KERN_ERR "wrote 0x%08x to 0x%08x\n", val, reg);

}



#define I915_READ(reg)          i915_read(dev_priv, (reg))

#define I915_WRITE(reg, val)    i915_write(dev_priv, (reg), (val))

#define I915_READ16(reg)	readw(dev_priv->regs + (reg))

#define I915_READ16(reg)	readw(dev_priv->regs + (reg))

#define I915_WRITE16(reg, val)	writel(val, dev_priv->regs + (reg))

#define I915_WRITE16(reg, val)	writel(val, dev_priv->regs + (reg))

#define I915_READ8(reg)		readb(dev_priv->regs + (reg))

#define I915_READ8(reg)		readb(dev_priv->regs + (reg))
@@ -1201,11 +1180,6 @@ static inline void i915_write(struct drm_i915_private *dev_priv, u32 reg, 
#define POSTING_READ(reg)	(void)I915_READ(reg)

#define POSTING_READ(reg)	(void)I915_READ(reg)

#define POSTING_READ16(reg)	(void)I915_READ16(reg)

#define POSTING_READ16(reg)	(void)I915_READ16(reg)





#define I915_DEBUG_ENABLE_IO() (dev_priv->debug_flags |= I915_DEBUG_READ | \

				I915_DEBUG_WRITE)

#define I915_DEBUG_DISABLE_IO() (dev_priv->debug_flags &= ~(I915_DEBUG_READ | \

							    I915_DEBUG_WRITE))



#define BEGIN_LP_RING(n) \

#define BEGIN_LP_RING(n) \

	intel_ring_begin(&dev_priv->render_ring, (n))

	intel_ring_begin(&dev_priv->render_ring, (n))