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

Commit 88b600d4 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/kms/gk104-: add support for [XA]2R10G10B10 formats 



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

drivers/gpu/drm/nouveau/dispnv50/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ nouveau-y += dispnv50/base.o 
nouveau-y += dispnv50/base507c.o

nouveau-y += dispnv50/base827c.o

nouveau-y += dispnv50/base907c.o

nouveau-y += dispnv50/base917c.o



nouveau-y += dispnv50/curs.o

nouveau-y += dispnv50/curs507a.o

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

+2 −2
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ nv50_base_new(struct nouveau_drm *drm, int head, struct nv50_wndw **pwndw) 
		int version;

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

	} bases[] = {

		{ GK110_DISP_BASE_CHANNEL_DMA, 0, base907c_new },

		{ GK104_DISP_BASE_CHANNEL_DMA, 0, base907c_new },

		{ GK110_DISP_BASE_CHANNEL_DMA, 0, base917c_new },

		{ GK104_DISP_BASE_CHANNEL_DMA, 0, base917c_new },

		{ GF110_DISP_BASE_CHANNEL_DMA, 0, base907c_new },

		{ GT214_DISP_BASE_CHANNEL_DMA, 0, base827c_new },

		{ GT200_DISP_BASE_CHANNEL_DMA, 0, base827c_new },

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

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ void base507c_update(struct nv50_wndw *, u32 *); 
int base827c_new(struct nouveau_drm *, int, s32, struct nv50_wndw **);



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

extern const struct nv50_wndw_func base907c;



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



int nv50_base_new(struct nouveau_drm *, int head, struct nv50_wndw **);

#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ base907c_ilut(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw) 
	asyw->xlut.i.enable = 2;

}



static const struct nv50_wndw_func

const struct nv50_wndw_func

base907c = {

	.acquire = base507c_acquire,

	.release = base507c_release,

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

0 → 100644
+48 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2018 Red Hat Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 */

#include "base.h"

#include "atom.h"



const u32

base917c_format[] = {

	DRM_FORMAT_C8,

	DRM_FORMAT_XRGB8888,

	DRM_FORMAT_ARGB8888,

	DRM_FORMAT_RGB565,

	DRM_FORMAT_XRGB1555,

	DRM_FORMAT_ARGB1555,

	DRM_FORMAT_XBGR2101010,

	DRM_FORMAT_ABGR2101010,

	DRM_FORMAT_XBGR8888,

	DRM_FORMAT_ABGR8888,

	DRM_FORMAT_XRGB2101010,

	DRM_FORMAT_ARGB2101010,

	0

};



int

base917c_new(struct nouveau_drm *drm, int head, s32 oclass,

	     struct nv50_wndw **pwndw)

{

	return base507c_new_(&base907c, base917c_format, drm, head, oclass,

			     0x00000002 << (head * 4), pwndw);

}