Commit 35cefc53 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/kms/nv50-: use NVIDIA's headers for core head_ovly() 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
parent 2aa934ca

drivers/gpu/drm/nouveau/dispnv50/head507d.c

+5 −5
Original line number Diff line number Diff line
@@ -67,21 +67,21 @@ head507d_ovly(struct nv50_head *head, struct nv50_head_atom *asyh) 


	if (asyh->ovly.cpp) {

		switch (asyh->ovly.cpp) {

		case 4: bounds |= 0x00000300; break;

		case 2: bounds |= 0x00000100; break;

		case 4: bounds |= NVDEF(NV507D, HEAD_SET_BASE_CHANNEL_USAGE_BOUNDS, PIXEL_DEPTH, BPP_32); break;

		case 2: bounds |= NVDEF(NV507D, HEAD_SET_BASE_CHANNEL_USAGE_BOUNDS, PIXEL_DEPTH, BPP_16); break;

		default:

			WARN_ON(1);

			break;

		}

		bounds |= 0x00000001;

		bounds |= NVDEF(NV507D, HEAD_SET_BASE_CHANNEL_USAGE_BOUNDS, USABLE, TRUE);

	} else {

		bounds |= 0x00000100;

		bounds |= NVDEF(NV507D, HEAD_SET_BASE_CHANNEL_USAGE_BOUNDS, PIXEL_DEPTH, BPP_16);

	}



	if ((ret = PUSH_WAIT(push, 2)))

		return ret;



	PUSH_NVSQ(push, NV507D, 0x0904 + (i * 0x400), bounds);

	PUSH_MTHD(push, NV507D, HEAD_SET_BASE_CHANNEL_USAGE_BOUNDS(i), bounds);

	return 0;

}

drivers/gpu/drm/nouveau/dispnv50/head907d.c

+6 −6
Original line number Diff line number Diff line
@@ -94,22 +94,22 @@ head907d_ovly(struct nv50_head *head, struct nv50_head_atom *asyh) 


	if (asyh->ovly.cpp) {

		switch (asyh->ovly.cpp) {

		case 8: bounds |= 0x00000500; break;

		case 4: bounds |= 0x00000300; break;

		case 2: bounds |= 0x00000100; break;

		case 8: bounds |= NVDEF(NV907D, HEAD_SET_OVERLAY_USAGE_BOUNDS, PIXEL_DEPTH, BPP_64); break;

		case 4: bounds |= NVDEF(NV907D, HEAD_SET_OVERLAY_USAGE_BOUNDS, PIXEL_DEPTH, BPP_32); break;

		case 2: bounds |= NVDEF(NV907D, HEAD_SET_OVERLAY_USAGE_BOUNDS, PIXEL_DEPTH, BPP_16); break;

		default:

			WARN_ON(1);

			break;

		}

		bounds |= 0x00000001;

		bounds |= NVDEF(NV907D, HEAD_SET_OVERLAY_USAGE_BOUNDS, USABLE, TRUE);

	} else {

		bounds |= 0x00000100;

		bounds |= NVDEF(NV907D, HEAD_SET_OVERLAY_USAGE_BOUNDS, PIXEL_DEPTH, BPP_16);

	}



	if ((ret = PUSH_WAIT(push, 2)))

		return ret;



	PUSH_NVSQ(push, NV907D, 0x04d4 + (i * 0x300), bounds);

	PUSH_MTHD(push, NV907D, HEAD_SET_OVERLAY_USAGE_BOUNDS(i), bounds);

	return 0;

}