diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2018-05-08 20:39:47 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2018-05-18 15:01:28 +1000 |
| commit | f88bc9d3ecca5ddc29642269f4624d07265c1bf5 (patch) | |
| tree | 420189c28160b0f36c43f048b90c66b855af5037 /drivers/gpu/drm/nouveau/dispnv50/atom.h | |
| parent | 9d6c2fe1917fc5ba6a9e8586ca16d007410baf42 (diff) | |
drm/nouveau/kms/nv50-: unify set/clr masks
This is a simplification that'll be used to improve interlock handling.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/dispnv50/atom.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/dispnv50/atom.h | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/drivers/gpu/drm/nouveau/dispnv50/atom.h b/drivers/gpu/drm/nouveau/dispnv50/atom.h index 8c97e25c881f..8bf180666bb7 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/atom.h +++ b/drivers/gpu/drm/nouveau/dispnv50/atom.h @@ -105,16 +105,7 @@ struct nv50_head_atom { u8 depth:4; } or; - union { - struct { - bool ilut:1; - bool core:1; - bool curs:1; - }; - u8 mask; - } clr; - - union { + union nv50_head_atom_mask { struct { bool ilut:1; bool core:1; @@ -128,7 +119,7 @@ struct nv50_head_atom { bool or:1; }; u16 mask; - } set; + } set, clr; }; static inline struct nv50_head_atom * @@ -184,16 +175,7 @@ struct nv50_wndw_atom { u16 y; } point; - union { - struct { - bool ntfy:1; - bool sema:1; - bool image:1; - }; - u8 mask; - } clr; - - union { + union nv50_wndw_atom_mask { struct { bool ntfy:1; bool sema:1; @@ -202,6 +184,6 @@ struct nv50_wndw_atom { bool point:1; }; u8 mask; - } set; + } set, clr; }; #endif |