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

Commit 2ce7f386 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/kms/nv50-: initial overlay support 



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

drivers/gpu/drm/nouveau/dispnv50/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -40,3 +40,4 @@ nouveau-y += dispnv50/ovly.o 
nouveau-y += dispnv50/ovly507e.o

nouveau-y += dispnv50/ovly827e.o

nouveau-y += dispnv50/ovly907e.o

nouveau-y += dispnv50/ovly917e.o

drivers/gpu/drm/nouveau/dispnv50/atom.h

+11 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ struct nv50_wndw_atom { 
		u8  mode:2;

		u8  interval:4;



		u8  colorspace:2;

		u8  format;

		u8  kind:7;

		u8  layout:1;
@@ -186,6 +187,15 @@ struct nv50_wndw_atom { 
		u64 offset[6];

	} image;



	struct {

		u16 sx;

		u16 sy;

		u16 sw;

		u16 sh;

		u16 dw;

		u16 dh;

	} scale;



	struct {

		u16 x;

		u16 y;
@@ -197,6 +207,7 @@ struct nv50_wndw_atom { 
			bool sema:1;

			bool xlut:1;

			bool image:1;

			bool scale:1;

			bool point:1;

		};

		u8 mask;

drivers/gpu/drm/nouveau/dispnv50/base.h

+0 −2
Original line number Diff line number Diff line
@@ -13,10 +13,8 @@ void base507c_release(struct nv50_wndw *, struct nv50_wndw_atom *, 
		      struct nv50_head_atom *);

void base507c_sema_set(struct nv50_wndw *, struct nv50_wndw_atom *);

void base507c_sema_clr(struct nv50_wndw *);

void base507c_ntfy_reset(struct nouveau_bo *, u32);

void base507c_ntfy_set(struct nv50_wndw *, struct nv50_wndw_atom *);

void base507c_ntfy_clr(struct nv50_wndw *);

int base507c_ntfy_wait_begun(struct nouveau_bo *, u32, struct nvif_device *);

void base507c_xlut_set(struct nv50_wndw *, struct nv50_wndw_atom *);

void base507c_xlut_clr(struct nv50_wndw *);

void base507c_image_clr(struct nv50_wndw *);

drivers/gpu/drm/nouveau/dispnv50/curs.h

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ int curs507a_new(struct nouveau_drm *, int, s32, struct nv50_wndw **); 
int curs507a_new_(const struct nv50_wimm_func *, struct nouveau_drm *,

		  int head, s32 oclass, u32 interlock_data,

		  struct nv50_wndw **);

extern const struct nv50_wimm_func curs507a;



int curs907a_new(struct nouveau_drm *, int, s32, struct nv50_wndw **);

drivers/gpu/drm/nouveau/dispnv50/disp.h

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ struct nv50_disp { 
#define NV50_DISP_BASE_SEM0(c)                    NV50_DISP_WNDW_SEM0(0 + (c))

#define NV50_DISP_BASE_SEM1(c)                    NV50_DISP_WNDW_SEM1(0 + (c))

#define NV50_DISP_BASE_NTFY(c)                    NV50_DISP_WNDW_NTFY(0 + (c))

#define NV50_DISP_OVLY_SEM0(c)                    NV50_DISP_WNDW_SEM0(4 + (c))

#define NV50_DISP_OVLY_SEM1(c)                    NV50_DISP_WNDW_SEM1(4 + (c))

#define NV50_DISP_OVLY_NTFY(c)                    NV50_DISP_WNDW_NTFY(4 + (c))

	struct nouveau_bo *sync;



	struct mutex mutex;