Skip to content

Commit

Permalink
drm/nouveau/devinit/tu102-: prepare for GSP-RM
Browse files Browse the repository at this point in the history
- add R535 implementation of DEVINIT, we need some of this for boot
- add display disable fuse for ga100-

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230918202149.4343-9-skeggsb@gmail.com
  • Loading branch information
Ben Skeggs authored and Dave Airlie committed Oct 31, 2023
1 parent 6a0fd03 commit 1574054
Show file tree
Hide file tree
Showing 5 changed files with 75 additions and 0 deletions.
2 changes: 2 additions & 0 deletions drivers/gpu/drm/nouveau/nvkm/subdev/devinit/Kbuild
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ nvkm-y += nvkm/subdev/devinit/gm200.o
nvkm-y += nvkm/subdev/devinit/gv100.o
nvkm-y += nvkm/subdev/devinit/tu102.o
nvkm-y += nvkm/subdev/devinit/ga100.o

nvkm-y += nvkm/subdev/devinit/r535.o
15 changes: 15 additions & 0 deletions drivers/gpu/drm/nouveau/nvkm/subdev/devinit/ga100.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <subdev/bios.h>
#include <subdev/bios/pll.h>
#include <subdev/clk/pll.h>
#include <subdev/gsp.h>

static int
ga100_devinit_pll_set(struct nvkm_devinit *init, u32 type, u32 freq)
Expand Down Expand Up @@ -62,8 +63,19 @@ ga100_devinit_pll_set(struct nvkm_devinit *init, u32 type, u32 freq)
return ret;
}

static void
ga100_devinit_disable(struct nvkm_devinit *init)
{
struct nvkm_device *device = init->subdev.device;
u32 r820c04 = nvkm_rd32(device, 0x820c04);

if (r820c04 & 0x00000001)
nvkm_subdev_disable(device, NVKM_ENGINE_DISP, 0);
}

static const struct nvkm_devinit_func
ga100_devinit = {
.disable = ga100_devinit_disable,
.init = nv50_devinit_init,
.post = tu102_devinit_post,
.pll_set = ga100_devinit_pll_set,
Expand All @@ -73,5 +85,8 @@ int
ga100_devinit_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,
struct nvkm_devinit **pinit)
{
if (nvkm_gsp_rm(device->gsp))
return r535_devinit_new(&ga100_devinit, device, type, inst, pinit);

return nv50_devinit_new_(&ga100_devinit, device, type, inst, pinit);
}
3 changes: 3 additions & 0 deletions drivers/gpu/drm/nouveau/nvkm/subdev/devinit/priv.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
#define nvkm_devinit(p) container_of((p), struct nvkm_devinit, subdev)
#include <subdev/devinit.h>

int r535_devinit_new(const struct nvkm_devinit_func *,
struct nvkm_device *, enum nvkm_subdev_type, int, struct nvkm_devinit **);

struct nvkm_devinit_func {
void *(*dtor)(struct nvkm_devinit *);
void (*preinit)(struct nvkm_devinit *);
Expand Down
51 changes: 51 additions & 0 deletions drivers/gpu/drm/nouveau/nvkm/subdev/devinit/r535.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
/*
* Copyright 2023 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 "nv50.h"

static void *
r535_devinit_dtor(struct nvkm_devinit *devinit)
{
kfree(devinit->func);
return devinit;
}

int
r535_devinit_new(const struct nvkm_devinit_func *hw,
struct nvkm_device *device, enum nvkm_subdev_type type, int inst,
struct nvkm_devinit **pdevinit)
{
struct nvkm_devinit_func *rm;
int ret;

if (!(rm = kzalloc(sizeof(*rm), GFP_KERNEL)))
return -ENOMEM;

rm->dtor = r535_devinit_dtor;
rm->post = hw->post;
rm->disable = hw->disable;

ret = nv50_devinit_new_(rm, device, type, inst, pdevinit);
if (ret)
kfree(rm);

return ret;
}
4 changes: 4 additions & 0 deletions drivers/gpu/drm/nouveau/nvkm/subdev/devinit/tu102.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <subdev/bios.h>
#include <subdev/bios/pll.h>
#include <subdev/clk/pll.h>
#include <subdev/gsp.h>

static int
tu102_devinit_pll_set(struct nvkm_devinit *init, u32 type, u32 freq)
Expand Down Expand Up @@ -100,5 +101,8 @@ int
tu102_devinit_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,
struct nvkm_devinit **pinit)
{
if (nvkm_gsp_rm(device->gsp))
return r535_devinit_new(&tu102_devinit, device, type, inst, pinit);

return nv50_devinit_new_(&tu102_devinit, device, type, inst, pinit);
}

0 comments on commit 1574054

Please sign in to comment.