drm/nouveau: remove PUSHBUF_CAL macro (2ccb04ec) · Commits · e / devices / android_kernel_teracube_emerald

drivers/gpu/drm/nouveau/nouveau_gem.c

+4 −6

Original line number	Original line	Diff line number	Diff line
	@@ -614,8 +614,6 @@ nouveau_gem_ioctl_pushbuf(struct drm_device dev, void data,
	return ret;		return ret;
	}		}

	#define PUSHBUF_CAL (dev_priv->card_type >= NV_20)

	int		int
	nouveau_gem_ioctl_pushbuf_call(struct drm_device dev, void data,		nouveau_gem_ioctl_pushbuf_call(struct drm_device dev, void data,
	struct drm_file *file_priv)		struct drm_file *file_priv)
	@@ -703,7 +701,7 @@ nouveau_gem_ioctl_pushbuf_call(struct drm_device dev, void data,
	/* If presumed return address doesn't match, we need to map the		/* If presumed return address doesn't match, we need to map the
	* push buffer and fix it..		* push buffer and fix it..
	*/		*/
	if (!PUSHBUF_CAL) {		if (dev_priv->card_type < NV_20) {
	uint32_t retaddy;		uint32_t retaddy;

	if (chan->dma.free < 4 + NOUVEAU_DMA_SKIPS) {		if (chan->dma.free < 4 + NOUVEAU_DMA_SKIPS) {
	@@ -741,7 +739,7 @@ nouveau_gem_ioctl_pushbuf_call(struct drm_device dev, void data,
	req->offset / 4,		req->offset / 4,
	pbvirt, is_iomem);		pbvirt, is_iomem);

	if (!PUSHBUF_CAL) {		if (dev_priv->card_type < NV_20) {
	nouveau_bo_wr32(pbbo,		nouveau_bo_wr32(pbbo,
	req->offset / 4 + req->nr_dwords - 2,		req->offset / 4 + req->nr_dwords - 2,
	req->suffix0);		req->suffix0);
	@@ -763,7 +761,7 @@ nouveau_gem_ioctl_pushbuf_call(struct drm_device dev, void data,

	nv50_dma_push(chan, pbbo, req->offset, req->nr_dwords);		nv50_dma_push(chan, pbbo, req->offset, req->nr_dwords);
	} else		} else
	if (PUSHBUF_CAL) {		if (dev_priv->card_type >= NV_20) {
	ret = RING_SPACE(chan, 2);		ret = RING_SPACE(chan, 2);
	if (ret) {		if (ret) {
	NV_ERROR(dev, "cal_space: %d\n", ret);		NV_ERROR(dev, "cal_space: %d\n", ret);
	@@ -805,7 +803,7 @@ nouveau_gem_ioctl_pushbuf_call(struct drm_device dev, void data,
	req->suffix0 = 0x00000000;		req->suffix0 = 0x00000000;
	req->suffix1 = 0x00000000;		req->suffix1 = 0x00000000;
	} else		} else
	if (PUSHBUF_CAL) {		if (dev_priv->card_type >= NV_20) {
	req->suffix0 = 0x00020000;		req->suffix0 = 0x00020000;
	req->suffix1 = 0x00000000;		req->suffix1 = 0x00000000;
	} else {		} else {