Commit a0a76244 authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau/kms/gv100-: attach alpha property to planes

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 9a99e904
...@@ -223,6 +223,7 @@ struct nv50_wndw_atom { ...@@ -223,6 +223,7 @@ struct nv50_wndw_atom {
struct { struct {
u8 depth; u8 depth;
u8 k1;
} blend; } blend;
union nv50_wndw_atom_mask { union nv50_wndw_atom_mask {
......
...@@ -288,6 +288,7 @@ nv50_wndw_atomic_check_acquire(struct nv50_wndw *wndw, bool modeset, ...@@ -288,6 +288,7 @@ nv50_wndw_atomic_check_acquire(struct nv50_wndw *wndw, bool modeset,
if (wndw->func->blend_set) { if (wndw->func->blend_set) {
asyw->blend.depth = 255 - asyw->state.normalized_zpos; asyw->blend.depth = 255 - asyw->state.normalized_zpos;
asyw->blend.k1 = asyw->state.alpha >> 8;
if (memcmp(&armw->blend, &asyw->blend, sizeof(asyw->blend))) if (memcmp(&armw->blend, &asyw->blend, sizeof(asyw->blend)))
asyw->set.blend = true; asyw->set.blend = true;
} }
...@@ -656,6 +657,10 @@ nv50_wndw_new_(const struct nv50_wndw_func *func, struct drm_device *dev, ...@@ -656,6 +657,10 @@ nv50_wndw_new_(const struct nv50_wndw_func *func, struct drm_device *dev,
nv50_wndw_zpos_default(&wndw->plane), 0, 254); nv50_wndw_zpos_default(&wndw->plane), 0, 254);
if (ret) if (ret)
return ret; return ret;
ret = drm_plane_create_alpha_property(&wndw->plane);
if (ret)
return ret;
} else { } else {
ret = drm_plane_create_zpos_immutable_property(&wndw->plane, ret = drm_plane_create_zpos_immutable_property(&wndw->plane,
nv50_wndw_zpos_default(&wndw->plane)); nv50_wndw_zpos_default(&wndw->plane));
......
...@@ -88,7 +88,7 @@ wndwc37e_blend_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw) ...@@ -88,7 +88,7 @@ wndwc37e_blend_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
if ((push = evo_wait(&wndw->wndw, 8))) { if ((push = evo_wait(&wndw->wndw, 8))) {
evo_mthd(push, 0x02ec, 7); evo_mthd(push, 0x02ec, 7);
evo_data(push, asyw->blend.depth << 4); evo_data(push, asyw->blend.depth << 4);
evo_data(push, 0x000000ff); evo_data(push, asyw->blend.k1);
evo_data(push, 0x00007722); evo_data(push, 0x00007722);
evo_data(push, 0xffff0000); evo_data(push, 0xffff0000);
evo_data(push, 0xffff0000); evo_data(push, 0xffff0000);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment