svn commit: r260100 - in stable: 10/sys/dev/drm 9/sys/dev/drm

[Dimitry Andric]

Author: dim
Date: Mon Dec 30 20:27:58 2013
New Revision: 260100
URL: http://svnweb.freebsd.org/changeset/base/260100

Log:
  MFC r259902:
  
  In sys/dev/drm/mach64_dma.c, remove static function mach64_set_dma_eol(),
  which has never been used, even by upstream, since its initial upstream
  commit (see http://cgit.freedesktop.org/mesa/drm/commit/?id=873e1c4d )

Modified:
  stable/9/sys/dev/drm/mach64_dma.c
Directory Properties:
  stable/9/sys/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/10/sys/dev/drm/mach64_dma.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/9/sys/dev/drm/mach64_dma.c
==============================================================================
--- stable/9/sys/dev/drm/mach64_dma.c	Mon Dec 30 20:24:05 2013	(r260099)
+++ stable/9/sys/dev/drm/mach64_dma.c	Mon Dec 30 20:27:58 2013	(r260100)
@@ -559,54 +559,6 @@ void mach64_dump_ring_info(drm_mach64_pr
 /*@{*/
 
 /**
- * Add the end mark to the ring's new tail position.
- *
- * The bus master engine will keep processing the DMA buffers listed in the ring
- * until it finds this mark, making it stop.
- *
- * \sa mach64_clear_dma_eol
- */ 
-static __inline__ void mach64_set_dma_eol(volatile u32 *addr)
-{
-#if defined(__i386__)
-	int nr = 31;
-
-	/* Taken from include/asm-i386/bitops.h linux header */
-	__asm__ __volatile__("lock;" "btsl %1,%0":"=m"(*addr)
-			     :"Ir"(nr));
-#elif defined(__powerpc__)
-	u32 old;
-	u32 mask = cpu_to_le32(MACH64_DMA_EOL);
-
-	/* Taken from the include/asm-ppc/bitops.h linux header */
-	__asm__ __volatile__("\n\
-1:	lwarx	%0,0,%3 \n\
-	or	%0,%0,%2 \n\
-	stwcx.	%0,0,%3 \n\
-	bne-	1b":"=&r"(old), "=m"(*addr)
-			     :"r"(mask), "r"(addr), "m"(*addr)
-			     :"cc");
-#elif defined(__alpha__)
-	u32 temp;
-	u32 mask = MACH64_DMA_EOL;
-
-	/* Taken from the include/asm-alpha/bitops.h linux header */
-	__asm__ __volatile__("1:	ldl_l %0,%3\n"
-			     "	bis %0,%2,%0\n"
-			     "	stl_c %0,%1\n"
-			     "	beq %0,2f\n"
-			     ".subsection 2\n"
-			     "2:	br 1b\n"
-			     ".previous":"=&r"(temp), "=m"(*addr)
-			     :"Ir"(mask), "m"(*addr));
-#else
-	u32 mask = cpu_to_le32(MACH64_DMA_EOL);
-
-	*addr |= mask;
-#endif
-}
-
-/**
  * Remove the end mark from the ring's old tail position.
  *
  * It should be called after calling mach64_set_dma_eol to mark the ring's new