Commit 7a962f2b authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/kms/nv50-: attach immutable zpos property to planes 



Defaulting to the fixed layout enforced in HW by EVO, and that we
currently use by default on NVD.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 6f78991f

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

+1 −0
Original line number Diff line number Diff line
@@ -2316,6 +2316,7 @@ nv50_display_create(struct drm_device *dev) 
	disp->disp = &nouveau_display(dev)->disp;

	dev->mode_config.funcs = &nv50_disp_func;

	dev->mode_config.quirk_addfb_prefer_xbgr_30bpp = true;

	dev->mode_config.normalize_zpos = true;



	/* small shared memory area we use for notifiers and semaphores */

	ret = nouveau_bo_new(&drm->client, 4096, 0x1000, TTM_PL_FLAG_VRAM,

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

+17 −0
Original line number Diff line number Diff line
@@ -528,6 +528,13 @@ nv50_wndw_atomic_duplicate_state(struct drm_plane *plane) 
	return &asyw->state;

}



static int

nv50_wndw_zpos_default(struct drm_plane *plane)

{

	return (plane->type == DRM_PLANE_TYPE_PRIMARY) ? 0 :

	       (plane->type == DRM_PLANE_TYPE_OVERLAY) ? 1 : 255;

}



static void

nv50_wndw_reset(struct drm_plane *plane)

{
@@ -540,6 +547,8 @@ nv50_wndw_reset(struct drm_plane *plane) 
		plane->funcs->atomic_destroy_state(plane, plane->state);



	__drm_atomic_helper_plane_reset(plane, &asyw->state);

	plane->state->zpos = nv50_wndw_zpos_default(plane);

	plane->state->normalized_zpos = nv50_wndw_zpos_default(plane);

}



static void
@@ -634,6 +643,14 @@ nv50_wndw_new_(const struct nv50_wndw_func *func, struct drm_device *dev, 
	}



	wndw->notify.func = nv50_wndw_notify;



	if (1) {

		ret = drm_plane_create_zpos_immutable_property(&wndw->plane,

				nv50_wndw_zpos_default(&wndw->plane));

		if (ret)

			return ret;

	}



	return 0;

}