Skip to content

Commit 7c42545

Browse files
airliedairlied
committed
Merge branch 'linux-5.6' of git://github.com/skeggsb/linux into drm-fixes
Nothing major here, another TU1xx modesetting fix, and hooking up ACR/GR support on TU11x now that NVIDIA have made the firmware available. Signed-off-by: Dave Airlie <[email protected]> From: Ben Skeggs <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/ <CACAvsv64yBq4KHJ8D-5HQ5eeotApJSMiD+V2ut4f3BonUggf0Q@mail.gmail.com
2 parents ec0bd60 + f287d3d commit 7c42545

File tree

5 files changed

+48
-0
lines changed

5 files changed

+48
-0
lines changed

‎drivers/gpu/drm/nouveau/dispnv50/wndw.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,8 @@ nv50_wndw_atomic_check(struct drm_plane *plane, struct drm_plane_state *state)
458458
asyw->clr.ntfy = armw->ntfy.handle != 0;
459459
asyw->clr.sema = armw->sema.handle != 0;
460460
asyw->clr.xlut = armw->xlut.handle != 0;
461+
if (asyw->clr.xlut && asyw->visible)
462+
asyw->set.xlut = asyw->xlut.handle != 0;
461463
asyw->clr.csc = armw->csc.valid;
462464
if (wndw->func->image_clr)
463465
asyw->clr.image = armw->image.handle[0] != 0;

‎drivers/gpu/drm/nouveau/nvkm/engine/device/base.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2579,6 +2579,7 @@ nv166_chipset = {
25792579
static const struct nvkm_device_chip
25802580
nv167_chipset = {
25812581
.name = "TU117",
2582+
.acr = tu102_acr_new,
25822583
.bar = tu102_bar_new,
25832584
.bios = nvkm_bios_new,
25842585
.bus = gf100_bus_new,
@@ -2607,6 +2608,7 @@ nv167_chipset = {
26072608
.disp = tu102_disp_new,
26082609
.dma = gv100_dma_new,
26092610
.fifo = tu102_fifo_new,
2611+
.gr = tu102_gr_new,
26102612
.nvdec[0] = gm107_nvdec_new,
26112613
.nvenc[0] = gm107_nvenc_new,
26122614
.sec2 = tu102_sec2_new,
@@ -2615,6 +2617,7 @@ nv167_chipset = {
26152617
static const struct nvkm_device_chip
26162618
nv168_chipset = {
26172619
.name = "TU116",
2620+
.acr = tu102_acr_new,
26182621
.bar = tu102_bar_new,
26192622
.bios = nvkm_bios_new,
26202623
.bus = gf100_bus_new,
@@ -2643,6 +2646,7 @@ nv168_chipset = {
26432646
.disp = tu102_disp_new,
26442647
.dma = gv100_dma_new,
26452648
.fifo = tu102_fifo_new,
2649+
.gr = tu102_gr_new,
26462650
.nvdec[0] = gm107_nvdec_new,
26472651
.nvenc[0] = gm107_nvenc_new,
26482652
.sec2 = tu102_sec2_new,

‎drivers/gpu/drm/nouveau/nvkm/engine/gr/tu102.c

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,32 @@ MODULE_FIRMWARE("nvidia/tu106/gr/sw_nonctx.bin");
164164
MODULE_FIRMWARE("nvidia/tu106/gr/sw_bundle_init.bin");
165165
MODULE_FIRMWARE("nvidia/tu106/gr/sw_method_init.bin");
166166

167+
MODULE_FIRMWARE("nvidia/tu117/gr/fecs_bl.bin");
168+
MODULE_FIRMWARE("nvidia/tu117/gr/fecs_inst.bin");
169+
MODULE_FIRMWARE("nvidia/tu117/gr/fecs_data.bin");
170+
MODULE_FIRMWARE("nvidia/tu117/gr/fecs_sig.bin");
171+
MODULE_FIRMWARE("nvidia/tu117/gr/gpccs_bl.bin");
172+
MODULE_FIRMWARE("nvidia/tu117/gr/gpccs_inst.bin");
173+
MODULE_FIRMWARE("nvidia/tu117/gr/gpccs_data.bin");
174+
MODULE_FIRMWARE("nvidia/tu117/gr/gpccs_sig.bin");
175+
MODULE_FIRMWARE("nvidia/tu117/gr/sw_ctx.bin");
176+
MODULE_FIRMWARE("nvidia/tu117/gr/sw_nonctx.bin");
177+
MODULE_FIRMWARE("nvidia/tu117/gr/sw_bundle_init.bin");
178+
MODULE_FIRMWARE("nvidia/tu117/gr/sw_method_init.bin");
179+
180+
MODULE_FIRMWARE("nvidia/tu116/gr/fecs_bl.bin");
181+
MODULE_FIRMWARE("nvidia/tu116/gr/fecs_inst.bin");
182+
MODULE_FIRMWARE("nvidia/tu116/gr/fecs_data.bin");
183+
MODULE_FIRMWARE("nvidia/tu116/gr/fecs_sig.bin");
184+
MODULE_FIRMWARE("nvidia/tu116/gr/gpccs_bl.bin");
185+
MODULE_FIRMWARE("nvidia/tu116/gr/gpccs_inst.bin");
186+
MODULE_FIRMWARE("nvidia/tu116/gr/gpccs_data.bin");
187+
MODULE_FIRMWARE("nvidia/tu116/gr/gpccs_sig.bin");
188+
MODULE_FIRMWARE("nvidia/tu116/gr/sw_ctx.bin");
189+
MODULE_FIRMWARE("nvidia/tu116/gr/sw_nonctx.bin");
190+
MODULE_FIRMWARE("nvidia/tu116/gr/sw_bundle_init.bin");
191+
MODULE_FIRMWARE("nvidia/tu116/gr/sw_method_init.bin");
192+
167193
static const struct gf100_gr_fwif
168194
tu102_gr_fwif[] = {
169195
{ 0, gm200_gr_load, &tu102_gr, &gp108_gr_fecs_acr, &gp108_gr_gpccs_acr },

‎drivers/gpu/drm/nouveau/nvkm/subdev/acr/tu102.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,12 @@ MODULE_FIRMWARE("nvidia/tu104/acr/ucode_unload.bin");
107107
MODULE_FIRMWARE("nvidia/tu106/acr/unload_bl.bin");
108108
MODULE_FIRMWARE("nvidia/tu106/acr/ucode_unload.bin");
109109

110+
MODULE_FIRMWARE("nvidia/tu116/acr/unload_bl.bin");
111+
MODULE_FIRMWARE("nvidia/tu116/acr/ucode_unload.bin");
112+
113+
MODULE_FIRMWARE("nvidia/tu117/acr/unload_bl.bin");
114+
MODULE_FIRMWARE("nvidia/tu117/acr/ucode_unload.bin");
115+
110116
static const struct nvkm_acr_hsf_fwif
111117
tu102_acr_unload_fwif[] = {
112118
{ 0, nvkm_acr_hsfw_load, &gp108_acr_unload_0 },
@@ -130,6 +136,8 @@ tu102_acr_asb_0 = {
130136
MODULE_FIRMWARE("nvidia/tu102/acr/ucode_asb.bin");
131137
MODULE_FIRMWARE("nvidia/tu104/acr/ucode_asb.bin");
132138
MODULE_FIRMWARE("nvidia/tu106/acr/ucode_asb.bin");
139+
MODULE_FIRMWARE("nvidia/tu116/acr/ucode_asb.bin");
140+
MODULE_FIRMWARE("nvidia/tu117/acr/ucode_asb.bin");
133141

134142
static const struct nvkm_acr_hsf_fwif
135143
tu102_acr_asb_fwif[] = {
@@ -154,6 +162,12 @@ MODULE_FIRMWARE("nvidia/tu104/acr/ucode_ahesasc.bin");
154162
MODULE_FIRMWARE("nvidia/tu106/acr/bl.bin");
155163
MODULE_FIRMWARE("nvidia/tu106/acr/ucode_ahesasc.bin");
156164

165+
MODULE_FIRMWARE("nvidia/tu116/acr/bl.bin");
166+
MODULE_FIRMWARE("nvidia/tu116/acr/ucode_ahesasc.bin");
167+
168+
MODULE_FIRMWARE("nvidia/tu117/acr/bl.bin");
169+
MODULE_FIRMWARE("nvidia/tu117/acr/ucode_ahesasc.bin");
170+
157171
static const struct nvkm_acr_hsf_fwif
158172
tu102_acr_ahesasc_fwif[] = {
159173
{ 0, nvkm_acr_hsfw_load, &tu102_acr_ahesasc_0 },

‎drivers/gpu/drm/nouveau/nvkm/subdev/fb/gv100.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,5 @@ MODULE_FIRMWARE("nvidia/gv100/nvdec/scrubber.bin");
5151
MODULE_FIRMWARE("nvidia/tu102/nvdec/scrubber.bin");
5252
MODULE_FIRMWARE("nvidia/tu104/nvdec/scrubber.bin");
5353
MODULE_FIRMWARE("nvidia/tu106/nvdec/scrubber.bin");
54+
MODULE_FIRMWARE("nvidia/tu116/nvdec/scrubber.bin");
55+
MODULE_FIRMWARE("nvidia/tu117/nvdec/scrubber.bin");

0 commit comments

Comments
 (0)