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

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

drm/nouveau/kms/nv50: remove pointless argument to window atomic_check_acquire() 



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

drivers/gpu/drm/nouveau/nv50_display.c

+6 −7
Original line number Diff line number Diff line
@@ -831,8 +831,7 @@ nv50_wndw_atomic_check_release(struct nv50_wndw *wndw, 
static int

nv50_wndw_atomic_check_acquire(struct nv50_wndw *wndw,

			       struct nv50_wndw_atom *asyw,

			       struct nv50_head_atom *asyh,

			       u32 pflip_flags)

			       struct nv50_head_atom *asyh)

{

	struct nouveau_framebuffer *fb = nouveau_framebuffer(asyw->state.fb);

	struct nouveau_drm *drm = nouveau_drm(wndw->plane.dev);
@@ -848,7 +847,10 @@ nv50_wndw_atomic_check_acquire(struct nv50_wndw *wndw, 
	asyw->image.h = fb->base.height;

	asyw->image.kind = (fb->nvbo->tile_flags & 0x0000ff00) >> 8;



	asyw->interval = pflip_flags & DRM_MODE_PAGE_FLIP_ASYNC ? 0 : 1;

	if (asyh->state.pageflip_flags & DRM_MODE_PAGE_FLIP_ASYNC)

		asyw->interval = 0;

	else

		asyw->interval = 1;



	if (asyw->image.kind) {

		asyw->image.layout = 0;
@@ -887,7 +889,6 @@ nv50_wndw_atomic_check(struct drm_plane *plane, struct drm_plane_state *state) 
	struct nv50_head_atom *harm = NULL, *asyh = NULL;

	bool varm = false, asyv = false, asym = false;

	int ret;

	u32 pflip_flags = 0;



	NV_ATOMIC(drm, "%s atomic_check\n", plane->name);

	if (asyw->state.crtc) {
@@ -896,7 +897,6 @@ nv50_wndw_atomic_check(struct drm_plane *plane, struct drm_plane_state *state) 
			return PTR_ERR(asyh);

		asym = drm_atomic_crtc_needs_modeset(&asyh->state);

		asyv = asyh->state.active;

		pflip_flags = asyh->state.pageflip_flags;

	}



	if (armw->state.crtc) {
@@ -913,8 +913,7 @@ nv50_wndw_atomic_check(struct drm_plane *plane, struct drm_plane_state *state) 
			asyw->set.point = true;



		if (!varm || asym || armw->state.fb != asyw->state.fb) {

			ret = nv50_wndw_atomic_check_acquire(

					wndw, asyw, asyh, pflip_flags);

			ret = nv50_wndw_atomic_check_acquire(wndw, asyw, asyh);

			if (ret)

				return ret;

		}