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

Commit ddc23b52 authored by Ben Skeggs's avatar Ben Skeggs Committed by Greg Kroah-Hartman
Browse files

drm/nouveau/disp/gp102: fix cursor/overlay immediate channel indices 



[ Upstream commit e50fcff15fe120ef2103a9e18af6644235c2b14d ]

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 53e18968

drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild

+2 −0
Original line number Diff line number Diff line
@@ -95,9 +95,11 @@ nvkm-y += nvkm/engine/disp/cursg84.o 
nvkm-y += nvkm/engine/disp/cursgt215.o

nvkm-y += nvkm/engine/disp/cursgf119.o

nvkm-y += nvkm/engine/disp/cursgk104.o

nvkm-y += nvkm/engine/disp/cursgp102.o



nvkm-y += nvkm/engine/disp/oimmnv50.o

nvkm-y += nvkm/engine/disp/oimmg84.o

nvkm-y += nvkm/engine/disp/oimmgt215.o

nvkm-y += nvkm/engine/disp/oimmgf119.o

nvkm-y += nvkm/engine/disp/oimmgk104.o

nvkm-y += nvkm/engine/disp/oimmgp102.o

drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h

+2 −0
Original line number Diff line number Diff line
@@ -114,6 +114,8 @@ extern const struct nv50_disp_pioc_oclass gf119_disp_curs_oclass; 
extern const struct nv50_disp_pioc_oclass gk104_disp_oimm_oclass;

extern const struct nv50_disp_pioc_oclass gk104_disp_curs_oclass;



extern const struct nv50_disp_pioc_oclass gp102_disp_oimm_oclass;

extern const struct nv50_disp_pioc_oclass gp102_disp_curs_oclass;



int nv50_disp_curs_new(const struct nv50_disp_chan_func *,

		       const struct nv50_disp_chan_mthd *,

drivers/gpu/drm/nouveau/nvkm/engine/disp/cursgp102.c

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

 * Copyright 2016 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.

 *

 * Authors: Ben Skeggs <bskeggs@redhat.com>

 */

#include "channv50.h"

#include "rootnv50.h"



#include <nvif/class.h>



const struct nv50_disp_pioc_oclass

gp102_disp_curs_oclass = {

	.base.oclass = GK104_DISP_CURSOR,

	.base.minver = 0,

	.base.maxver = 0,

	.ctor = nv50_disp_curs_new,

	.func = &gf119_disp_pioc_func,

	.chid = { 13, 17 },

};

drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmgp102.c

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

 * Copyright 2016 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.

 *

 * Authors: Ben Skeggs <bskeggs@redhat.com>

 */

#include "channv50.h"

#include "rootnv50.h"



#include <nvif/class.h>



const struct nv50_disp_pioc_oclass

gp102_disp_oimm_oclass = {

	.base.oclass = GK104_DISP_OVERLAY,

	.base.minver = 0,

	.base.maxver = 0,

	.ctor = nv50_disp_oimm_new,

	.func = &gf119_disp_pioc_func,

	.chid = { 9, 13 },

};

drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgp104.c

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ gp104_disp_root = { 
		&gp104_disp_ovly_oclass,

	},

	.pioc = {

		&gk104_disp_oimm_oclass,

		&gk104_disp_curs_oclass,

		&gp102_disp_oimm_oclass,

		&gp102_disp_curs_oclass,

	},

};