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

Commit 2126d0a4 authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/kms: make sure blit addr masks are 64 bit 



Signed-off-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Cc: stable@kernel.org
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 26bf62e4

drivers/gpu/drm/radeon/evergreen_blit_kms.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -611,8 +611,8 @@ void evergreen_kms_blit_copy(struct radeon_device *rdev, 
			int src_x = src_gpu_addr & 255;

			int src_x = src_gpu_addr & 255;

			int dst_x = dst_gpu_addr & 255;

			int dst_x = dst_gpu_addr & 255;

			int h = 1;

			int h = 1;

			src_gpu_addr = src_gpu_addr & ~255;

			src_gpu_addr = src_gpu_addr & ~255ULL;

			dst_gpu_addr = dst_gpu_addr & ~255;

			dst_gpu_addr = dst_gpu_addr & ~255ULL;





			if (!src_x && !dst_x) {

			if (!src_x && !dst_x) {

				h = (cur_size / max_bytes);

				h = (cur_size / max_bytes);
@@ -695,8 +695,8 @@ void evergreen_kms_blit_copy(struct radeon_device *rdev, 
			int src_x = (src_gpu_addr & 255);

			int src_x = (src_gpu_addr & 255);

			int dst_x = (dst_gpu_addr & 255);

			int dst_x = (dst_gpu_addr & 255);

			int h = 1;

			int h = 1;

			src_gpu_addr = src_gpu_addr & ~255;

			src_gpu_addr = src_gpu_addr & ~255ULL;

			dst_gpu_addr = dst_gpu_addr & ~255;

			dst_gpu_addr = dst_gpu_addr & ~255ULL;





			if (!src_x && !dst_x) {

			if (!src_x && !dst_x) {

				h = (cur_size / max_bytes);

				h = (cur_size / max_bytes);

drivers/gpu/drm/radeon/r600_blit_kms.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -661,8 +661,8 @@ void r600_kms_blit_copy(struct radeon_device *rdev, 
			int src_x = src_gpu_addr & 255;

			int src_x = src_gpu_addr & 255;

			int dst_x = dst_gpu_addr & 255;

			int dst_x = dst_gpu_addr & 255;

			int h = 1;

			int h = 1;

			src_gpu_addr = src_gpu_addr & ~255;

			src_gpu_addr = src_gpu_addr & ~255ULL;

			dst_gpu_addr = dst_gpu_addr & ~255;

			dst_gpu_addr = dst_gpu_addr & ~255ULL;





			if (!src_x && !dst_x) {

			if (!src_x && !dst_x) {

				h = (cur_size / max_bytes);

				h = (cur_size / max_bytes);
@@ -744,8 +744,8 @@ void r600_kms_blit_copy(struct radeon_device *rdev, 
			int src_x = (src_gpu_addr & 255);

			int src_x = (src_gpu_addr & 255);

			int dst_x = (dst_gpu_addr & 255);

			int dst_x = (dst_gpu_addr & 255);

			int h = 1;

			int h = 1;

			src_gpu_addr = src_gpu_addr & ~255;

			src_gpu_addr = src_gpu_addr & ~255ULL;

			dst_gpu_addr = dst_gpu_addr & ~255;

			dst_gpu_addr = dst_gpu_addr & ~255ULL;





			if (!src_x && !dst_x) {

			if (!src_x && !dst_x) {

				h = (cur_size / max_bytes);

				h = (cur_size / max_bytes);