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

Commit e349a05d authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/kms/nv50-: plane updates don't always require image_set() 



When only the position of a window changes, there's no need to submit
an image update as well.

Will be required to support the overlays, and Volta windows.

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

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

+0 −1
Original line number Diff line number Diff line
@@ -185,7 +185,6 @@ base507c_acquire(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw, 
	asyh->base.h = asyw->state.fb->height;



	asyw->lut.enable = 1;

	asyw->set.image = true;

	return 0;

}

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

+32 −31
Original line number Diff line number Diff line
@@ -190,7 +190,8 @@ nv50_wndw_atomic_check_acquire_rgb(struct nv50_wndw_atom *asyw) 
}



static int

nv50_wndw_atomic_check_acquire(struct nv50_wndw *wndw,

nv50_wndw_atomic_check_acquire(struct nv50_wndw *wndw, bool modeset,

			       struct nv50_wndw_atom *armw,

			       struct nv50_wndw_atom *asyw,

			       struct nv50_head_atom *asyh)

{
@@ -200,6 +201,7 @@ nv50_wndw_atomic_check_acquire(struct nv50_wndw *wndw, 


	NV_ATOMIC(drm, "%s acquire\n", wndw->plane.name);



	if (asyw->state.fb != armw->state.fb || !armw->visible || modeset) {

		asyw->image.w = fb->base.width;

		asyw->image.h = fb->base.height;

		asyw->image.kind = fb->nvbo->kind;
@@ -221,19 +223,22 @@ nv50_wndw_atomic_check_acquire(struct nv50_wndw *wndw, 
			asyw->image.pitch[0] = fb->base.pitches[0];

		}



	ret = wndw->func->acquire(wndw, asyw, asyh);

	if (ret)

		return ret;



	if (asyw->set.image) {

		if (!(asyh->state.pageflip_flags & DRM_MODE_PAGE_FLIP_ASYNC))

			asyw->image.interval = 1;

		else

			asyw->image.interval = 0;

		asyw->image.mode = asyw->image.interval ? 0 : 1;

		asyw->set.image = wndw->func->image_set != NULL;

	}



	return 0;

	if (wndw->immd) {

		asyw->point.x = asyw->state.crtc_x;

		asyw->point.y = asyw->state.crtc_y;

		if (memcmp(&armw->point, &asyw->point, sizeof(asyw->point)))

			asyw->set.point = true;

	}



	return wndw->func->acquire(wndw, asyw, asyh);

}



int
@@ -271,12 +276,8 @@ nv50_wndw_atomic_check(struct drm_plane *plane, struct drm_plane_state *state) 


	/* Calculate new window state. */

	if (asyw->visible) {

		asyw->point.x = asyw->state.crtc_x;

		asyw->point.y = asyw->state.crtc_y;

		if (memcmp(&armw->point, &asyw->point, sizeof(asyw->point)))

			asyw->set.point = true;



		ret = nv50_wndw_atomic_check_acquire(wndw, asyw, asyh);

		ret = nv50_wndw_atomic_check_acquire(wndw, modeset,

						     armw, asyw, asyh);

		if (ret)

			return ret;

	} else