Commit 87158992 authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

drm/savage: drop use of drm_os_linux 



Drop use of macros from the deprecated drm_os_linux header.
Simple 1:1 replacements of
- DRM_UDELAY
- DRM_CURRENTPID
- DRM_READ
- DRM_WRITE

With this change we do not need to introduce the deprecated
drm_os_linux.h header when we drop use of drmP.h.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Reviewed-by: default avatarDaniel Vetter <daniel@ffwll.ch>
Cc: David Airlie <airlied@linux.ie>
Link: https://patchwork.freedesktop.org/patch/msgid/20190605140313.13629-2-sam@ravnborg.org
parent 1b36d506

drivers/gpu/drm/savage/savage_bci.c

+10 −7
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ 
 * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

 * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

 */



#include <linux/delay.h>



#include <drm/drmP.h>

#include <drm/savage_drm.h>

#include "savage_drv.h"
@@ -53,7 +56,7 @@ savage_bci_wait_fifo_shadow(drm_savage_private_t * dev_priv, unsigned int n) 
		status = dev_priv->status_ptr[0];

		if ((status & mask) < threshold)

			return 0;

		DRM_UDELAY(1);

		udelay(1);

	}



#if SAVAGE_BCI_DEBUG
@@ -74,7 +77,7 @@ savage_bci_wait_fifo_s3d(drm_savage_private_t * dev_priv, unsigned int n) 
		status = SAVAGE_READ(SAVAGE_STATUS_WORD0);

		if ((status & SAVAGE_FIFO_USED_MASK_S3D) <= maxUsed)

			return 0;

		DRM_UDELAY(1);

		udelay(1);

	}



#if SAVAGE_BCI_DEBUG
@@ -95,7 +98,7 @@ savage_bci_wait_fifo_s4(drm_savage_private_t * dev_priv, unsigned int n) 
		status = SAVAGE_READ(SAVAGE_ALT_STATUS_WORD0);

		if ((status & SAVAGE_FIFO_USED_MASK_S4) <= maxUsed)

			return 0;

		DRM_UDELAY(1);

		udelay(1);

	}



#if SAVAGE_BCI_DEBUG
@@ -128,7 +131,7 @@ savage_bci_wait_event_shadow(drm_savage_private_t * dev_priv, uint16_t e) 
		if ((((status & 0xffff) - e) & 0xffff) <= 0x7fff ||

		    (status & 0xffff) == 0)

			return 0;

		DRM_UDELAY(1);

		udelay(1);

	}



#if SAVAGE_BCI_DEBUG
@@ -150,7 +153,7 @@ savage_bci_wait_event_reg(drm_savage_private_t * dev_priv, uint16_t e) 
		if ((((status & 0xffff) - e) & 0xffff) <= 0x7fff ||

		    (status & 0xffff) == 0)

			return 0;

		DRM_UDELAY(1);

		udelay(1);

	}



#if SAVAGE_BCI_DEBUG
@@ -1014,7 +1017,7 @@ int savage_bci_buffers(struct drm_device *dev, void *data, struct drm_file *file 
	 */

	if (d->send_count != 0) {

		DRM_ERROR("Process %d trying to send %d buffers via drmDMA\n",

			  DRM_CURRENTPID, d->send_count);

			  task_pid_nr(current), d->send_count);

		return -EINVAL;

	}
@@ -1022,7 +1025,7 @@ int savage_bci_buffers(struct drm_device *dev, void *data, struct drm_file *file 
	 */

	if (d->request_count < 0 || d->request_count > dma->buf_count) {

		DRM_ERROR("Process %d trying to get %d buffers (of %d max)\n",

			  DRM_CURRENTPID, d->request_count, dma->buf_count);

			  task_pid_nr(current), d->request_count, dma->buf_count);

		return -EINVAL;

	}

drivers/gpu/drm/savage/savage_drv.h

+4 −2
Original line number Diff line number Diff line
@@ -484,8 +484,10 @@ extern void savage_emit_clip_rect_s4(drm_savage_private_t * dev_priv, 
/*

 * access to MMIO

 */

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

#define SAVAGE_WRITE(reg)	DRM_WRITE32( dev_priv->mmio, (reg) )

#define SAVAGE_READ(reg) \

       readl(((void __iomem *)dev_priv->mmio->handle) + (reg))

#define SAVAGE_WRITE(reg) \

	writel(val, ((void __iomem *)dev_priv->mmio->handle) + (reg))



/*

 * access to the burst command interface (BCI)

CRA Git | Maintained and supported by SUSTech CRA and CCSE