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

Commit 85b2331b authored by Daniel Vetter's avatar Daniel Vetter Committed by Dave Airlie
Browse files

drm: Kill DRM_*MEMORYBARRIER 



The real linux interfaces are soooo much easier on the eyes ...

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 1d6ac185

drivers/gpu/drm/gma500/psb_irq.c

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ irqreturn_t psb_irq_handler(int irq, void *arg) 


	PSB_WVDC32(vdc_stat, PSB_INT_IDENTITY_R);

	(void) PSB_RVDC32(PSB_INT_IDENTITY_R);

	DRM_READMEMORYBARRIER();

	rmb();



	if (!handled)

		return IRQ_NONE;

drivers/gpu/drm/mga/mga_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ extern void mga_driver_irq_uninstall(struct drm_device *dev); 
extern long mga_compat_ioctl(struct file *filp, unsigned int cmd,

			     unsigned long arg);



#define mga_flush_write_combine()	DRM_WRITEMEMORYBARRIER()

#define mga_flush_write_combine()	wmb()



#define MGA_READ8(reg)		DRM_READ8(dev_priv->mmio, (reg))

#define MGA_READ(reg)		DRM_READ32(dev_priv->mmio, (reg))

drivers/gpu/drm/nouveau/nouveau_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ nv50_dma_push(struct nouveau_channel *chan, struct nouveau_bo *bo, 


	chan->dma.ib_put = (chan->dma.ib_put + 1) & chan->dma.ib_max;



	DRM_MEMORYBARRIER();

	mb();

	/* Flush writes. */

	nouveau_bo_rd32(pb, 0);

drivers/gpu/drm/nouveau/nouveau_dma.h

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ BEGIN_IMC0(struct nouveau_channel *chan, int subc, int mthd, u16 data) 
}



#define WRITE_PUT(val) do {                                                    \

	DRM_MEMORYBARRIER();                                                   \

	mb();                                                   \

	nouveau_bo_rd32(chan->push.buffer, 0);                                 \

	nv_wo32(chan->object, chan->user_put, ((val) << 2) + chan->push.vma.offset);  \

} while (0)

drivers/gpu/drm/r128/r128_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -514,7 +514,7 @@ do { \ 
	if (R128_VERBOSE)						\

		DRM_INFO("COMMIT_RING() tail=0x%06x\n",			\

			 dev_priv->ring.tail);				\

	DRM_MEMORYBARRIER();						\

	mb();						\

	R128_WRITE(R128_PM4_BUFFER_DL_WPTR, dev_priv->ring.tail);	\

	R128_READ(R128_PM4_BUFFER_DL_WPTR);				\

} while (0)