Commit 18618fc6 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/top: add ioctrl/nvjpg 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
parent 26fbb4c8

drivers/gpu/drm/nouveau/include/nvkm/core/layout.h

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ NVKM_LAYOUT_ONCE(NVKM_SUBDEV_ICCSENSE, struct nvkm_iccsense, iccsense) 
NVKM_LAYOUT_ONCE(NVKM_SUBDEV_THERM   , struct nvkm_therm   ,    therm)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_CLK     , struct nvkm_clk     ,      clk)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_GSP     , struct nvkm_gsp     ,      gsp)

NVKM_LAYOUT_INST(NVKM_SUBDEV_IOCTRL  , struct nvkm_subdev  ,   ioctrl, 3)



NVKM_LAYOUT_ONCE(NVKM_ENGINE_BSP     , struct nvkm_engine  ,      bsp)

NVKM_LAYOUT_INST(NVKM_ENGINE_CE      , struct nvkm_engine  ,       ce, 9)
@@ -41,6 +42,7 @@ NVKM_LAYOUT_ONCE(NVKM_ENGINE_MSPPP , struct nvkm_engine , msppp) 
NVKM_LAYOUT_ONCE(NVKM_ENGINE_MSVLD   , struct nvkm_engine  ,    msvld)

NVKM_LAYOUT_INST(NVKM_ENGINE_NVDEC   , struct nvkm_nvdec   ,    nvdec, 3)

NVKM_LAYOUT_INST(NVKM_ENGINE_NVENC   , struct nvkm_nvenc   ,    nvenc, 3)

NVKM_LAYOUT_ONCE(NVKM_ENGINE_NVJPG   , struct nvkm_engine  ,    nvjpg)

NVKM_LAYOUT_ONCE(NVKM_ENGINE_PM      , struct nvkm_pm      ,       pm)

NVKM_LAYOUT_ONCE(NVKM_ENGINE_SEC     , struct nvkm_engine  ,      sec)

NVKM_LAYOUT_ONCE(NVKM_ENGINE_SEC2    , struct nvkm_sec2    ,     sec2)

drivers/gpu/drm/nouveau/nvkm/subdev/top/gk104.c

+2 −0
Original line number Diff line number Diff line
@@ -86,8 +86,10 @@ gk104_top_oneinit(struct nvkm_top *top) 
		case 0x0000000e: I_(NVKM_ENGINE_NVENC , inst); break;

		case 0x0000000f: O_(NVKM_ENGINE_NVENC ,    1); break;

		case 0x00000010: I_(NVKM_ENGINE_NVDEC , inst); break;

		case 0x00000012: I_(NVKM_SUBDEV_IOCTRL, inst); break;

		case 0x00000013: I_(NVKM_ENGINE_CE    , inst); break;

		case 0x00000014: O_(NVKM_SUBDEV_GSP   ,    0); break;

		case 0x00000015: O_(NVKM_ENGINE_NVJPG ,    0); break;

		default:

			break;

		}