Skip to content

Commit ccb7b6b

Browse files
author
Ben Skeggs
committed
drm/nouveau/gr/gf117-: read NV_PGRAPH_GPC_GPM_PD_PES_TPC_ID_MASK from correct GPC
Each GPCCS unit was reading the mask from GPC0, which causes problems on boards where some GPCs are missing PPCs. Part of the fix for fdo#92761. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
1 parent 7028156 commit ccb7b6b

6 files changed

Lines changed: 897 additions & 897 deletions

File tree

drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpc.fuc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ init:
163163

164164
#if NV_PGRAPH_GPCX_UNK__SIZE > 0
165165
// figure out which, and how many, UNKs are actually present
166-
imm32($r14, 0x500c30)
166+
gpc_addr($r14, 0x500c30)
167167
clear b32 $r2
168168
clear b32 $r3
169169
clear b32 $r4

drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf117.fuc3.h

Lines changed: 172 additions & 172 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ uint32_t gf117_grgpc_code[] = {
314314
0x03f01200,
315315
0x0002d000,
316316
0x17f104bd,
317-
0x10fe0542,
317+
0x10fe0545,
318318
0x0007f100,
319319
0x0003f007,
320320
0xbd0000d0,
@@ -338,184 +338,184 @@ uint32_t gf117_grgpc_code[] = {
338338
0x02d00103,
339339
0xf104bd00,
340340
0xf00c30e7,
341-
0x24bd50e3,
342-
0x44bd34bd,
343-
/* 0x0430: init_unk_loop */
344-
0xb06821f4,
345-
0x0bf400f6,
346-
0x01f7f00f,
347-
0xfd04f2bb,
348-
0x30b6054f,
349-
/* 0x0445: init_unk_next */
350-
0x0120b601,
351-
0xb004e0b6,
352-
0x1bf40126,
353-
/* 0x0451: init_unk_done */
354-
0x070380e2,
355-
0xf1080480,
356-
0xf0010027,
357-
0x22cf0223,
358-
0x9534bd00,
359-
0x07f10825,
360-
0x03f0c000,
361-
0x0005d001,
362-
0x07f104bd,
363-
0x03f0c100,
364-
0x0005d001,
365-
0x0e9804bd,
366-
0x010f9800,
367-
0x015021f5,
368-
0xbb002fbb,
369-
0x0e98003f,
370-
0x020f9801,
371-
0x015021f5,
372-
0xfd050e98,
373-
0x2ebb00ef,
374-
0x003ebb00,
375-
0x98020e98,
376-
0x21f5030f,
377-
0x0e980150,
378-
0x00effd07,
379-
0xbb002ebb,
380-
0x35b6003e,
381-
0x0007f102,
382-
0x0103f0d3,
383-
0xbd0003d0,
384-
0x0825b604,
385-
0xb60635b6,
386-
0x30b60120,
387-
0x0824b601,
388-
0xb90834b6,
389-
0x21f5022f,
390-
0x2fbb02d3,
391-
0x003fbb00,
392-
0x010007f1,
393-
0xd00203f0,
341+
0xe5f050e3,
342+
0xbd24bd01,
343+
/* 0x0433: init_unk_loop */
344+
0xf444bd34,
345+
0xf6b06821,
346+
0x0f0bf400,
347+
0xbb01f7f0,
348+
0x4ffd04f2,
349+
0x0130b605,
350+
/* 0x0448: init_unk_next */
351+
0xb60120b6,
352+
0x26b004e0,
353+
0xe21bf401,
354+
/* 0x0454: init_unk_done */
355+
0x80070380,
356+
0x27f10804,
357+
0x23f00100,
358+
0x0022cf02,
359+
0x259534bd,
360+
0x0007f108,
361+
0x0103f0c0,
362+
0xbd0005d0,
363+
0x0007f104,
364+
0x0103f0c1,
365+
0xbd0005d0,
366+
0x000e9804,
367+
0xf5010f98,
368+
0xbb015021,
369+
0x3fbb002f,
370+
0x010e9800,
371+
0xf5020f98,
372+
0x98015021,
373+
0xeffd050e,
374+
0x002ebb00,
375+
0x98003ebb,
376+
0x0f98020e,
377+
0x5021f503,
378+
0x070e9801,
379+
0xbb00effd,
380+
0x3ebb002e,
381+
0x0235b600,
382+
0xd30007f1,
383+
0xd00103f0,
394384
0x04bd0003,
395-
0x29f024bd,
396-
0x0007f11f,
397-
0x0203f008,
398-
0xbd0002d0,
399-
/* 0x0505: main */
400-
0x0031f404,
401-
0xf00028f4,
402-
0x21f424d7,
403-
0xf401f439,
404-
0xf404e4b0,
405-
0x81fe1e18,
406-
0x0627f001,
407-
0x12fd20bd,
408-
0x01e4b604,
409-
0xfe051efd,
410-
0x21f50018,
411-
0x0ef405fa,
412-
/* 0x0535: main_not_ctx_xfer */
413-
0x10ef94d3,
414-
0xf501f5f0,
415-
0xf4037e21,
416-
/* 0x0542: ih */
417-
0x80f9c60e,
418-
0xf90188fe,
419-
0xf990f980,
420-
0xf9b0f9a0,
421-
0xf9e0f9d0,
422-
0xf104bdf0,
423-
0xf00200a7,
424-
0xaacf00a3,
425-
0x04abc400,
426-
0xf02c0bf4,
427-
0xe7f124d7,
428-
0xe3f01a00,
429-
0x00eecf00,
430-
0x1900f7f1,
431-
0xcf00f3f0,
432-
0x21f400ff,
433-
0x01e7f004,
434-
0x1d0007f1,
435-
0xd00003f0,
436-
0x04bd000e,
437-
/* 0x0590: ih_no_fifo */
438-
0x010007f1,
439-
0xd00003f0,
440-
0x04bd000a,
441-
0xe0fcf0fc,
442-
0xb0fcd0fc,
443-
0x90fca0fc,
444-
0x88fe80fc,
445-
0xf480fc00,
446-
0x01f80032,
447-
/* 0x05b4: hub_barrier_done */
448-
0x9801f7f0,
449-
0xfebb040e,
450-
0x02ffb904,
451-
0x9418e7f1,
452-
0xf440e3f0,
453-
0x00f89d21,
454-
/* 0x05cc: ctx_redswitch */
455-
0xf120f7f0,
385+
0xb60825b6,
386+
0x20b60635,
387+
0x0130b601,
388+
0xb60824b6,
389+
0x2fb90834,
390+
0xd321f502,
391+
0x002fbb02,
392+
0xf1003fbb,
393+
0xf0010007,
394+
0x03d00203,
395+
0xbd04bd00,
396+
0x1f29f024,
397+
0x080007f1,
398+
0xd00203f0,
399+
0x04bd0002,
400+
/* 0x0508: main */
401+
0xf40031f4,
402+
0xd7f00028,
403+
0x3921f424,
404+
0xb0f401f4,
405+
0x18f404e4,
406+
0x0181fe1e,
407+
0xbd0627f0,
408+
0x0412fd20,
409+
0xfd01e4b6,
410+
0x18fe051e,
411+
0xfd21f500,
412+
0xd30ef405,
413+
/* 0x0538: main_not_ctx_xfer */
414+
0xf010ef94,
415+
0x21f501f5,
416+
0x0ef4037e,
417+
/* 0x0545: ih */
418+
0xfe80f9c6,
419+
0x80f90188,
420+
0xa0f990f9,
421+
0xd0f9b0f9,
422+
0xf0f9e0f9,
423+
0xa7f104bd,
424+
0xa3f00200,
425+
0x00aacf00,
426+
0xf404abc4,
427+
0xd7f02c0b,
428+
0x00e7f124,
429+
0x00e3f01a,
430+
0xf100eecf,
431+
0xf01900f7,
432+
0xffcf00f3,
433+
0x0421f400,
434+
0xf101e7f0,
435+
0xf01d0007,
436+
0x0ed00003,
437+
/* 0x0593: ih_no_fifo */
438+
0xf104bd00,
439+
0xf0010007,
440+
0x0ad00003,
441+
0xfc04bd00,
442+
0xfce0fcf0,
443+
0xfcb0fcd0,
444+
0xfc90fca0,
445+
0x0088fe80,
446+
0x32f480fc,
447+
/* 0x05b7: hub_barrier_done */
448+
0xf001f800,
449+
0x0e9801f7,
450+
0x04febb04,
451+
0xf102ffb9,
452+
0xf09418e7,
453+
0x21f440e3,
454+
/* 0x05cf: ctx_redswitch */
455+
0xf000f89d,
456+
0x07f120f7,
457+
0x03f08500,
458+
0x000fd001,
459+
0xe7f004bd,
460+
/* 0x05e1: ctx_redswitch_delay */
461+
0x01e2b608,
462+
0xf1fd1bf4,
463+
0xf10800f5,
464+
0xf10200f5,
456465
0xf0850007,
457466
0x0fd00103,
458-
0xf004bd00,
459-
/* 0x05de: ctx_redswitch_delay */
460-
0xe2b608e7,
461-
0xfd1bf401,
462-
0x0800f5f1,
463-
0x0200f5f1,
464-
0x850007f1,
465-
0xd00103f0,
466-
0x04bd000f,
467-
/* 0x05fa: ctx_xfer */
468-
0x07f100f8,
469-
0x03f08100,
470-
0x000fd002,
471-
0x11f404bd,
472-
0xcc21f507,
473-
/* 0x060d: ctx_xfer_not_load */
474-
0x6a21f505,
475-
0xf124bd02,
476-
0xf047fc07,
477-
0x02d00203,
478-
0xf004bd00,
479-
0x20b6012c,
480-
0xfc07f103,
481-
0x0203f04a,
482-
0xbd0002d0,
483-
0x01acf004,
484-
0xf102a5f0,
485-
0xf00000b7,
486-
0x0c9850b3,
487-
0x0fc4b604,
488-
0x9800bcbb,
489-
0x0d98000c,
490-
0x00e7f001,
491-
0x016f21f5,
492-
0xf101acf0,
493-
0xf04000b7,
494-
0x0c9850b3,
495-
0x0fc4b604,
496-
0x9800bcbb,
497-
0x0d98010c,
498-
0x060f9802,
499-
0x0800e7f1,
500-
0x016f21f5,
467+
0xf804bd00,
468+
/* 0x05fd: ctx_xfer */
469+
0x0007f100,
470+
0x0203f081,
471+
0xbd000fd0,
472+
0x0711f404,
473+
0x05cf21f5,
474+
/* 0x0610: ctx_xfer_not_load */
475+
0x026a21f5,
476+
0x07f124bd,
477+
0x03f047fc,
478+
0x0002d002,
479+
0x2cf004bd,
480+
0x0320b601,
481+
0x4afc07f1,
482+
0xd00203f0,
483+
0x04bd0002,
501484
0xf001acf0,
502-
0xb7f104a5,
503-
0xb3f03000,
485+
0xb7f102a5,
486+
0xb3f00000,
504487
0x040c9850,
505488
0xbb0fc4b6,
506489
0x0c9800bc,
507-
0x030d9802,
508-
0xf1080f98,
509-
0xf50200e7,
510-
0xf5016f21,
511-
0xf4025e21,
512-
0x12f40601,
513-
/* 0x06a9: ctx_xfer_post */
514-
0x7f21f507,
515-
/* 0x06ad: ctx_xfer_done */
516-
0xb421f502,
517-
0x0000f805,
518-
0x00000000,
490+
0x010d9800,
491+
0xf500e7f0,
492+
0xf0016f21,
493+
0xb7f101ac,
494+
0xb3f04000,
495+
0x040c9850,
496+
0xbb0fc4b6,
497+
0x0c9800bc,
498+
0x020d9801,
499+
0xf1060f98,
500+
0xf50800e7,
501+
0xf0016f21,
502+
0xa5f001ac,
503+
0x00b7f104,
504+
0x50b3f030,
505+
0xb6040c98,
506+
0xbcbb0fc4,
507+
0x020c9800,
508+
0x98030d98,
509+
0xe7f1080f,
510+
0x21f50200,
511+
0x21f5016f,
512+
0x01f4025e,
513+
0x0712f406,
514+
/* 0x06ac: ctx_xfer_post */
515+
0x027f21f5,
516+
/* 0x06b0: ctx_xfer_done */
517+
0x05b721f5,
518+
0x000000f8,
519519
0x00000000,
520520
0x00000000,
521521
0x00000000,

0 commit comments

Comments
 (0)