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

Commit ceeb5027 authored by Dave Airlie's avatar Dave Airlie
Browse files

drm/radeon: Revert "drm/r600: avoid assigning vb twice in blit code" 



This reverts commit 49c458e5. It
seems to have some side effects in the non-kms cases.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 0549a061

drivers/gpu/drm/radeon/r600_blit.c

+7 −3
Original line number Original line Diff line number Diff line
@@ -582,6 +582,8 @@ r600_blit_copy(struct drm_device *dev, 
	u64 vb_addr;

	u64 vb_addr;

	u32 *vb;

	u32 *vb;





	vb = r600_nomm_get_vb_ptr(dev);



	if ((size_bytes & 3) || (src_gpu_addr & 3) || (dst_gpu_addr & 3)) {

	if ((size_bytes & 3) || (src_gpu_addr & 3) || (dst_gpu_addr & 3)) {

		max_bytes = 8192;

		max_bytes = 8192;
@@ -617,8 +619,8 @@ r600_blit_copy(struct drm_device *dev, 
				if (!dev_priv->blit_vb)

				if (!dev_priv->blit_vb)

					return;

					return;

				set_shaders(dev);

				set_shaders(dev);

			}

				vb = r600_nomm_get_vb_ptr(dev);

				vb = r600_nomm_get_vb_ptr(dev);

			}





			vb[0] = i2f(dst_x);

			vb[0] = i2f(dst_x);

			vb[1] = 0;

			vb[1] = 0;
@@ -706,8 +708,8 @@ r600_blit_copy(struct drm_device *dev, 
					return;

					return;





				set_shaders(dev);

				set_shaders(dev);

			}

				vb = r600_nomm_get_vb_ptr(dev);

				vb = r600_nomm_get_vb_ptr(dev);

			}





			vb[0] = i2f(dst_x / 4);

			vb[0] = i2f(dst_x / 4);

			vb[1] = 0;

			vb[1] = 0;
@@ -775,6 +777,8 @@ r600_blit_swap(struct drm_device *dev, 
	u64 vb_addr;

	u64 vb_addr;

	u32 *vb;

	u32 *vb;





	vb = r600_nomm_get_vb_ptr(dev);



	if ((dev_priv->blit_vb->used + 48) > dev_priv->blit_vb->total) {

	if ((dev_priv->blit_vb->used + 48) > dev_priv->blit_vb->total) {





		r600_nomm_put_vb(dev);

		r600_nomm_put_vb(dev);
@@ -783,8 +787,8 @@ r600_blit_swap(struct drm_device *dev, 
			return;

			return;





		set_shaders(dev);

		set_shaders(dev);

	}

		vb = r600_nomm_get_vb_ptr(dev);

		vb = r600_nomm_get_vb_ptr(dev);

	}





	if (cpp == 4) {

	if (cpp == 4) {

		cb_format = COLOR_8_8_8_8;

		cb_format = COLOR_8_8_8_8;

drivers/gpu/drm/radeon/r600_blit_kms.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -610,6 +610,7 @@ void r600_kms_blit_copy(struct radeon_device *rdev, 




	DRM_DEBUG("emitting copy %16llx %16llx %d %d\n", src_gpu_addr, dst_gpu_addr,

	DRM_DEBUG("emitting copy %16llx %16llx %d %d\n", src_gpu_addr, dst_gpu_addr,

		  size_bytes, rdev->r600_blit.vb_used);

		  size_bytes, rdev->r600_blit.vb_used);

	vb = (u32 *)(rdev->r600_blit.vb_ib->ptr + rdev->r600_blit.vb_used);

	if ((size_bytes & 3) || (src_gpu_addr & 3) || (dst_gpu_addr & 3)) {

	if ((size_bytes & 3) || (src_gpu_addr & 3) || (dst_gpu_addr & 3)) {

		max_bytes = 8192;

		max_bytes = 8192;
@@ -652,7 +653,6 @@ void r600_kms_blit_copy(struct radeon_device *rdev, 
				vb = r600_nomm_get_vb_ptr(dev);

				vb = r600_nomm_get_vb_ptr(dev);

#endif

#endif

			}

			}

			vb = (u32 *)(rdev->r600_blit.vb_ib->ptr + rdev->r600_blit.vb_used);





			vb[0] = i2f(dst_x);

			vb[0] = i2f(dst_x);

			vb[1] = 0;

			vb[1] = 0;
@@ -747,7 +747,6 @@ void r600_kms_blit_copy(struct radeon_device *rdev, 
				vb = r600_nomm_get_vb_ptr(dev);

				vb = r600_nomm_get_vb_ptr(dev);

			}

			}

#endif

#endif

			vb = (u32 *)(rdev->r600_blit.vb_ib->ptr + rdev->r600_blit.vb_used);





			vb[0] = i2f(dst_x / 4);

			vb[0] = i2f(dst_x / 4);

			vb[1] = 0;

			vb[1] = 0;