drm/nouveau/gr/gm206: remove implementation, it's now identical to gm200
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
parent
5f7e8028c7
commit
7d31cb7ca4
|
@ -41,6 +41,5 @@ int gk208_gr_new(struct nvkm_device *, int, struct nvkm_gr **);
|
|||
int gk20a_gr_new(struct nvkm_device *, int, struct nvkm_gr **);
|
||||
int gm107_gr_new(struct nvkm_device *, int, struct nvkm_gr **);
|
||||
int gm200_gr_new(struct nvkm_device *, int, struct nvkm_gr **);
|
||||
int gm206_gr_new(struct nvkm_device *, int, struct nvkm_gr **);
|
||||
int gm20b_gr_new(struct nvkm_device *, int, struct nvkm_gr **);
|
||||
#endif
|
||||
|
|
|
@ -2074,7 +2074,7 @@ nv126_chipset = {
|
|||
.disp = gm200_disp_new,
|
||||
.dma = gf119_dma_new,
|
||||
.fifo = gm200_fifo_new,
|
||||
.gr = gm206_gr_new,
|
||||
.gr = gm200_gr_new,
|
||||
.sw = gf100_sw_new,
|
||||
};
|
||||
|
||||
|
|
|
@ -30,7 +30,6 @@ nvkm-y += nvkm/engine/gr/gk208.o
|
|||
nvkm-y += nvkm/engine/gr/gk20a.o
|
||||
nvkm-y += nvkm/engine/gr/gm107.o
|
||||
nvkm-y += nvkm/engine/gr/gm200.o
|
||||
nvkm-y += nvkm/engine/gr/gm206.o
|
||||
nvkm-y += nvkm/engine/gr/gm20b.o
|
||||
|
||||
nvkm-y += nvkm/engine/gr/ctxnv40.o
|
||||
|
@ -48,5 +47,4 @@ nvkm-y += nvkm/engine/gr/ctxgk208.o
|
|||
nvkm-y += nvkm/engine/gr/ctxgk20a.o
|
||||
nvkm-y += nvkm/engine/gr/ctxgm107.o
|
||||
nvkm-y += nvkm/engine/gr/ctxgm200.o
|
||||
nvkm-y += nvkm/engine/gr/ctxgm206.o
|
||||
nvkm-y += nvkm/engine/gr/ctxgm20b.o
|
||||
|
|
|
@ -102,7 +102,6 @@ void gm200_grctx_generate_main(struct gf100_gr *, struct gf100_grctx *);
|
|||
void gm200_grctx_generate_tpcid(struct gf100_gr *);
|
||||
void gm200_grctx_generate_405b60(struct gf100_gr *);
|
||||
|
||||
extern const struct gf100_grctx_func gm206_grctx;
|
||||
extern const struct gf100_grctx_func gm20b_grctx;
|
||||
|
||||
/* context init value lists */
|
||||
|
|
|
@ -1,41 +0,0 @@
|
|||
/*
|
||||
* Copyright 2015 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 "ctxgf100.h"
|
||||
|
||||
const struct gf100_grctx_func
|
||||
gm206_grctx = {
|
||||
.main = gm200_grctx_generate_main,
|
||||
.unkn = gk104_grctx_generate_unkn,
|
||||
.bundle = gm107_grctx_generate_bundle,
|
||||
.bundle_size = 0x3000,
|
||||
.bundle_min_gpm_fifo_depth = 0x180,
|
||||
.bundle_token_limit = 0x780,
|
||||
.pagepool = gm107_grctx_generate_pagepool,
|
||||
.pagepool_size = 0x20000,
|
||||
.attrib = gm107_grctx_generate_attrib,
|
||||
.attrib_nr_max = 0x600,
|
||||
.attrib_nr = 0x400,
|
||||
.alpha_nr_max = 0x1800,
|
||||
.alpha_nr = 0x1000,
|
||||
};
|
|
@ -1,47 +0,0 @@
|
|||
/*
|
||||
* Copyright 2015 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 "gf100.h"
|
||||
#include "ctxgf100.h"
|
||||
|
||||
#include <nvif/class.h>
|
||||
|
||||
static const struct gf100_gr_func
|
||||
gm206_gr = {
|
||||
.init = gm200_gr_init,
|
||||
.ppc_nr = 2,
|
||||
.grctx = &gm206_grctx,
|
||||
.sclass = {
|
||||
{ -1, -1, FERMI_TWOD_A },
|
||||
{ -1, -1, KEPLER_INLINE_TO_MEMORY_B },
|
||||
{ -1, -1, MAXWELL_B, &gf100_fermi },
|
||||
{ -1, -1, MAXWELL_COMPUTE_B },
|
||||
{}
|
||||
}
|
||||
};
|
||||
|
||||
int
|
||||
gm206_gr_new(struct nvkm_device *device, int index, struct nvkm_gr **pgr)
|
||||
{
|
||||
return gm200_gr_new_(&gm206_gr, device, index, pgr);
|
||||
}
|
Loading…
Reference in a new issue