Commit 38a72243 authored by Ilia Mirkin's avatar Ilia Mirkin Committed by Ben Skeggs
Browse files

drm/nouveau/kms/nv50-: add fp16 scanout support 



Older hardware seems to want 0..1024 values, while new hardware takes
0..1 values. We set the gain to 1024 for the earlier display classes.

Signed-off-by: default avatarIlia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent ebf8ca6b

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

+20 −4
Original line number Diff line number Diff line
@@ -58,12 +58,21 @@ static void 
base507c_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)

{

	u32 *push;

	if ((push = evo_wait(&wndw->wndw, 10))) {

	if ((push = evo_wait(&wndw->wndw, 13))) {

		evo_mthd(push, 0x0084, 1);

		evo_data(push, asyw->image.mode << 8 |

			       asyw->image.interval << 4);

		evo_mthd(push, 0x00c0, 1);

		evo_data(push, asyw->image.handle[0]);

		if (asyw->image.format == 0xca) {

			evo_mthd(push, 0x0110, 2);

			evo_data(push, 1);

			evo_data(push, 0x6400);

		} else {

			evo_mthd(push, 0x0110, 2);

			evo_data(push, 0);

			evo_data(push, 0);

		}

		evo_mthd(push, 0x0800, 5);

		evo_data(push, asyw->image.offset[0] >> 8);

		evo_data(push, 0x00000000);
@@ -181,9 +190,6 @@ base507c_acquire(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw, 
	const struct drm_framebuffer *fb = asyw->state.fb;

	int ret;



	if (!fb->format->depth)

		return -EINVAL;



	ret = drm_atomic_helper_check_plane_state(&asyw->state, &asyh->state,

						  DRM_PLANE_HELPER_NO_SCALING,

						  DRM_PLANE_HELPER_NO_SCALING,
@@ -202,6 +208,14 @@ base507c_acquire(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw, 
	asyh->base.y = asyw->state.src.y1 >> 16;

	asyh->base.w = asyw->state.fb->width;

	asyh->base.h = asyw->state.fb->height;



	/* Some newer formats, esp FP16 ones, don't have a

	 * "depth". There's nothing that really makes sense there

	 * either, so just set it to the implicit bit count.

	 */

	if (!asyh->base.depth)

		asyh->base.depth = asyh->base.cpp * 8;



	return 0;

}
@@ -217,6 +231,8 @@ base507c_format[] = { 
	DRM_FORMAT_ABGR2101010,

	DRM_FORMAT_XBGR8888,

	DRM_FORMAT_ABGR8888,

	DRM_FORMAT_XBGR16161616F,

	DRM_FORMAT_ABGR16161616F,

	0

};

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

+10 −1
Original line number Diff line number Diff line
@@ -25,12 +25,21 @@ static void 
base827c_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)

{

	u32 *push;

	if ((push = evo_wait(&wndw->wndw, 10))) {

	if ((push = evo_wait(&wndw->wndw, 13))) {

		evo_mthd(push, 0x0084, 1);

		evo_data(push, asyw->image.mode << 8 |

			       asyw->image.interval << 4);

		evo_mthd(push, 0x00c0, 1);

		evo_data(push, asyw->image.handle[0]);

		if (asyw->image.format == 0xca) {

			evo_mthd(push, 0x0110, 2);

			evo_data(push, 1);

			evo_data(push, 0x6400);

		} else {

			evo_mthd(push, 0x0110, 2);

			evo_data(push, 0);

			evo_data(push, 0);

		}

		evo_mthd(push, 0x0800, 5);

		evo_data(push, asyw->image.offset[0] >> 8);

		evo_data(push, 0x00000000);

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

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ base917c_format[] = { 
	DRM_FORMAT_ABGR8888,

	DRM_FORMAT_XRGB2101010,

	DRM_FORMAT_ARGB2101010,

	DRM_FORMAT_XBGR16161616F,

	DRM_FORMAT_ABGR16161616F,

	0

};

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

+16 −1
Original line number Diff line number Diff line
@@ -61,10 +61,25 @@ ovly907e = { 
	.update = ovly507e_update,

};



static const u32

ovly907e_format[] = {

	DRM_FORMAT_YUYV,

	DRM_FORMAT_UYVY,

	DRM_FORMAT_XRGB8888,

	DRM_FORMAT_ARGB8888,

	DRM_FORMAT_XRGB1555,

	DRM_FORMAT_ARGB1555,

	DRM_FORMAT_XBGR2101010,

	DRM_FORMAT_ABGR2101010,

	DRM_FORMAT_XBGR16161616F,

	DRM_FORMAT_ABGR16161616F,

	0

};



int

ovly907e_new(struct nouveau_drm *drm, int head, s32 oclass,

	     struct nv50_wndw **pwndw)

{

	return ovly507e_new_(&ovly907e, ovly827e_format, drm, head, oclass,

	return ovly507e_new_(&ovly907e, ovly907e_format, drm, head, oclass,

			     0x00000004 << (head * 4), pwndw);

}

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

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ ovly917e_format[] = { 
	DRM_FORMAT_ABGR2101010,

	DRM_FORMAT_XRGB2101010,

	DRM_FORMAT_ARGB2101010,

	DRM_FORMAT_XBGR16161616F,

	DRM_FORMAT_ABGR16161616F,

	0

};