search for: armw

...nt) { if (asyw->set.point = false, asyw->set.mask) @@ -334,6 +336,8 @@ nv50_wndw_atomic_check_lut(struct nv50_wndw *wndw, asyw->xlut.handle = wndw->wndw.vram.handle; asyw->xlut.i.buffer = !asyw->xlut.i.buffer; asyw->set.xlut = true; + } else { + asyw->clr.xlut = armw->xlut.handle != 0;; } /* Handle setting base SET_OUTPUT_LUT_LO_ENABLE_USE_CORE_LUT. */ @@ -341,6 +345,16 @@ nv50_wndw_atomic_check_lut(struct nv50_wndw *wndw, (!armw->visible || (armw->xlut.handle && !asyw->xlut.handle))) asyw->set.xlut = true; + if (wndw-&gt...

...} + if (asyw->set.ctm ) wndw->func->ctm_set (wndw, asyw); if (asyw->set.scale) wndw->func->scale_set(wndw, asyw); if (asyw->set.point) { if (asyw->set.point = false, asyw->set.mask) @@ -341,6 +343,15 @@ nv50_wndw_atomic_check_lut(struct nv50_wndw *wndw, (!armw->visible || (armw->xlut.handle && !asyw->xlut.handle))) asyw->set.xlut = true; + if (wndw->func->ctm && asyh->state.ctm) { + const struct drm_color_ctm *ctm = asyh->state.ctm->data; + wndw->func->ctm(wndw, asyw, ctm); + asyw->ctm.valid = t...

...ndex bb737f9281e6..39cca8eaa066 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/wndw.c +++ b/drivers/gpu/drm/nouveau/dispnv50/wndw.c @@ -397,7 +397,7 @@ nv50_wndw_atomic_check(struct drm_plane *plane, struct drm_plane_state *state) struct nv50_wndw *wndw = nv50_wndw(plane); struct nv50_wndw_atom *armw = nv50_wndw_atom(wndw->plane.state); struct nv50_wndw_atom *asyw = nv50_wndw_atom(state); - struct nv50_head_atom *harm = NULL, *asyh = NULL; + struct nv50_head_atom *armh = NULL, *asyh = NULL; bool modeset = false; int ret; @@ -418,9 +418,9 @@ nv50_wndw_atomic_check(struct drm_plane *pl...

...ndex bb737f9281e6..39cca8eaa066 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/wndw.c +++ b/drivers/gpu/drm/nouveau/dispnv50/wndw.c @@ -397,7 +397,7 @@ nv50_wndw_atomic_check(struct drm_plane *plane, struct drm_plane_state *state) struct nv50_wndw *wndw = nv50_wndw(plane); struct nv50_wndw_atom *armw = nv50_wndw_atom(wndw->plane.state); struct nv50_wndw_atom *asyw = nv50_wndw_atom(state); - struct nv50_head_atom *harm = NULL, *asyh = NULL; + struct nv50_head_atom *armh = NULL, *asyh = NULL; bool modeset = false; int ret; @@ -418,9 +418,9 @@ nv50_wndw_atomic_check(struct drm_plane *pl...

...ndex bb737f9281e6..39cca8eaa066 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/wndw.c +++ b/drivers/gpu/drm/nouveau/dispnv50/wndw.c @@ -397,7 +397,7 @@ nv50_wndw_atomic_check(struct drm_plane *plane, struct drm_plane_state *state) struct nv50_wndw *wndw = nv50_wndw(plane); struct nv50_wndw_atom *armw = nv50_wndw_atom(wndw->plane.state); struct nv50_wndw_atom *asyw = nv50_wndw_atom(state); - struct nv50_head_atom *harm = NULL, *asyh = NULL; + struct nv50_head_atom *armh = NULL, *asyh = NULL; bool modeset = false; int ret; @@ -418,9 +418,9 @@ nv50_wndw_atomic_check(struct drm_plane *pl...

...w.c b/drivers/gpu/drm/nouveau/dispnv50/wndw.c index 890315291b01..bb737f9281e6 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/wndw.c +++ b/drivers/gpu/drm/nouveau/dispnv50/wndw.c @@ -458,6 +458,8 @@ nv50_wndw_atomic_check(struct drm_plane *plane, struct drm_plane_state *state) asyw->clr.ntfy = armw->ntfy.handle != 0; asyw->clr.sema = armw->sema.handle != 0; asyw->clr.xlut = armw->xlut.handle != 0; + if (asyw->clr.xlut && asyw->visible) + asyw->set.xlut = asyw->xlut.handle != 0; asyw->clr.csc = armw->csc.valid; if (wndw->func->imag...

...m(wndw->plane.dev); > - struct nouveau_bo *nvbo = nouveau_gem_object(fb->base.obj[0]); > + struct nouveau_bo *nvbo = nouveau_gem_object(fb->obj[0]); > int ret; > > 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; > + if (fb != armw->state.fb || !armw->visible || modeset) { > + asyw->image.w = fb->width; > + asyw->image.h = fb->height; >...

...t nouveau_bo *nvbo = nouveau_gem_object(fb->base.obj[0]); >>> +??? struct nouveau_bo *nvbo = nouveau_gem_object(fb->obj[0]); >>> ????? int ret; >>> ? ????? 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; >>> +??? if (fb != armw->state.fb || !armw->visible || modeset) { >>> +??????? asyw->image...

...? struct nouveau_bo *nvbo = nouveau_gem_object(fb->base.obj[0]); >>> +??? struct nouveau_bo *nvbo = nouveau_gem_object(fb->obj[0]); >>> ????? int ret; >>> ????? 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; >>> +??? if (fb != armw->state.fb || !armw->visible || modeset) { >>> +??????? asyw->imag...

...ect(fb->base.obj[0]); > >>>> + struct nouveau_bo *nvbo = nouveau_gem_object(fb->obj[0]); > >>>> int ret; > >>>> 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; > >>>> + if (fb != armw->state.fb || !armw->visible || modeset) {...

...t;>>>>> + struct nouveau_bo *nvbo = nouveau_gem_object(fb->obj[0]); >>>>>>> int ret; >>>>>>> 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; >>>>>>> + if (fb != armw->state.fb || !arm...

...struct nouveau_drm *drm = nouveau_drm(wndw->plane.dev); - struct nouveau_bo *nvbo = nouveau_gem_object(fb->base.obj[0]); + struct nouveau_bo *nvbo = nouveau_gem_object(fb->obj[0]); int ret; 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; + if (fb != armw->state.fb || !armw->visible || modeset) { + asyw->image.w = fb->width; + asyw->image.h = fb->height; asyw->image.kind = nvbo-...

...++ b/drivers/gpu/drm/nouveau/dispnv50/wndw.c @@ -318,7 +318,7 @@ nv50_wndw_atomic_check_acquire(struct nv50_wndw *wndw, bool modeset, return wndw->func->acquire(wndw, asyw, asyh); } -static void +static int nv50_wndw_atomic_check_lut(struct nv50_wndw *wndw, struct nv50_wndw_atom *armw, struct nv50_wndw_atom *asyw, @@ -340,7 +340,7 @@ nv50_wndw_atomic_check_lut(struct nv50_wndw *wndw, */ if (!(ilut = asyh->state.gamma_lut)) { asyw->visible = false; - return; + return 0; } if (wndw->func->ilut) @@ -359,7 +359,10 @@ nv50_wndw_atomic_check_l...

...v); >> -??? struct nouveau_bo *nvbo = nouveau_gem_object(fb->base.obj[0]); >> +??? struct nouveau_bo *nvbo = nouveau_gem_object(fb->obj[0]); >> ????? int ret; >> ????? 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; >> +??? if (fb != armw->state.fb || !armw->visible || modeset) { >> +??????? asyw->image.w = fb->width; >> +...

...>> -??? struct nouveau_bo *nvbo = nouveau_gem_object(fb->base.obj[0]); >> +??? struct nouveau_bo *nvbo = nouveau_gem_object(fb->obj[0]); >> ????? int ret; >> ? ????? 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; >> +??? if (fb != armw->state.fb || !armw->visible || modeset) { >> +??????? asyw->image.w = fb->width; &...

...bo = nouveau_gem_object(fb->base.obj[0]); >>>> +??? struct nouveau_bo *nvbo = nouveau_gem_object(fb->obj[0]); >>>> ?????? int ret; >>>> ?? ????? 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; >>>> +??? if (fb != armw->state.fb || !armw->visible || modeset) { >>>> +??...

...kind; > + const u8 kind = fb->kind; > const u32 handle = 0xfb000000 | kind; > struct { > struct nv_dma_v0 base; > @@ -243,7 +243,7 @@ nv50_wndw_atomic_check_acquire(struct nv50_wndw *wndw, bool modeset, > 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; > + asyw->image.kind = fb->kind; > >...

...*nvbo = nouveau_gem_object(fb->base.obj[0]); > >>> + struct nouveau_bo *nvbo = nouveau_gem_object(fb->obj[0]); > >>> int ret; > >>> 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; > >>> + if (fb != armw->state.fb || !armw->visible || modeset) { > >>&gt...

...ase.obj[0]); >>>>>> + struct nouveau_bo *nvbo = nouveau_gem_object(fb->obj[0]); >>>>>> int ret; >>>>>> 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; >>>>>> + if (fb != armw->state.fb || !armw->visible ||...

...gt;> + struct nouveau_bo *nvbo = nouveau_gem_object(fb->obj[0]); > >>>>>>> int ret; > >>>>>>> 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; > >>>>>>> + if (fb != armw-...