Merge branch 'linux-4.18' of git://github.com/skeggsb/linux into drm-fixes (845876a0) · Commits · 戴 / test

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -132,7 +132,7 @@ curs507a_new_(const struct nv50_wimm_func func, struct nouveau_drm drm,

		nvif_object_map(&wndw->wimm.base.user, NULL, 0);
		wndw->immd = func;
		wndw->ctxdma.parent = &disp->core->chan.base.user;
		wndw->ctxdma.parent = NULL;
		return 0;
		}

+8 −5

Original line number	Diff line number	Diff line
		@@ -444,14 +444,17 @@ nv50_wndw_prepare_fb(struct drm_plane plane, struct drm_plane_state state)
		if (ret)
		return ret;

		if (wndw->ctxdma.parent) {
		ctxdma = nv50_wndw_ctxdma_new(wndw, fb);
		if (IS_ERR(ctxdma)) {
		nouveau_bo_unpin(fb->nvbo);
		return PTR_ERR(ctxdma);
		}

		asyw->state.fence = reservation_object_get_excl_rcu(fb->nvbo->bo.resv);
		asyw->image.handle[0] = ctxdma->object.handle;
		}

		asyw->state.fence = reservation_object_get_excl_rcu(fb->nvbo->bo.resv);
		asyw->image.offset[0] = fb->nvbo->bo.offset;

		if (wndw->func->prepare) {