fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 13:28:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nouveau/push: Handle more recent versions of 6F

Browse source 
This also requires us to rework SET_OBJECT handling a bit.

Reviewed-by: Mel Henning <mhenning@darkrefraction.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36995>
This commit is contained in:
Faith Ekstrand 2025-08-22 22:11:14 -04:00 • committed by Marge Bot
parent 38108b2c4b
commit 8e93a763a3
2 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/nouveau/headers/meson.build
View file

@ -10,6 +10,7 @@ nv_classes = [
'cla097', 'cla097',
'cla140', 'cla140',
'cla297', 'cla297',
'clb06f',
'clb097', 'clb097',
'clb0c0', 'clb0c0',
'clb197', 'clb197',

24
src/nouveau/headers/nv_push.c
View file

@ -15,6 +15,7 @@
#include "nv_push_cla040.h" #include "nv_push_cla040.h"
#include "nv_push_cla0c0.h" #include "nv_push_cla0c0.h"
#include "nv_push_cla140.h" #include "nv_push_cla140.h"
#include "nv_push_clb06f.h"
#include "nv_push_clb197.h" #include "nv_push_clb197.h"
#include "nv_push_clc0c0.h" #include "nv_push_clc0c0.h"
#include "nv_push_clc1b5.h" #include "nv_push_clc1b5.h"
@ -108,6 +109,13 @@ vk_push_print(FILE *fp, const struct nv_push *push,
fprintf(fp, "HDR %x subch %i", hdr, subchan); fprintf(fp, "HDR %x subch %i", hdr, subchan);
} }
if (mthd == 0) { /* SET_OBJECT */
curr_subchans[subchan] = value & 0xffff;
}
int class_id = curr_subchans[subchan];
int cls_hi = (class_id & 0xff00) >> 8;
int cls_lo = class_id & 0xff;
cur++; cur++;
const char *mthd_name = ""; const char *mthd_name = "";
@ -168,14 +176,13 @@ vk_push_print(FILE *fp, const struct nv_push *push,
while (count--) { while (count--) {
if (!is_tert) { if (!is_tert) {
if (mthd < 0x100) { if (mthd < 0x100) {
if (devinfo->cls_eng3d >= 0xc597) if (cls_hi >= 0xc5)
mthd_name = P_PARSE_NVC56F_MTHD(mthd); mthd_name = P_PARSE_NVC56F_MTHD(mthd);
else if (cls_hi >= 0xb0)
mthd_name = P_PARSE_NVB06F_MTHD(mthd);
else else
mthd_name = P_PARSE_NV906F_MTHD(mthd); mthd_name = P_PARSE_NV906F_MTHD(mthd);
} else { } else {
int class_id = curr_subchans[subchan];
int cls_lo = class_id & 0xff;
int cls_hi = (class_id & 0xff00) >> 8;
switch (cls_lo) { switch (cls_lo) {
case 0x97: case 0x97:
if (cls_hi >= 0xc7) if (cls_hi >= 0xc7)
@ -248,14 +255,11 @@ vk_push_print(FILE *fp, const struct nv_push *push,
fprintf(fp, "\tmthd %04x %s\n", mthd, mthd_name); fprintf(fp, "\tmthd %04x %s\n", mthd, mthd_name);
if (mthd < 0x100) { if (mthd < 0x100) {
if (cls_hi >= 0xb0)
P_DUMP_NVB06F_MTHD_DATA(fp, mthd, value, "\t\t");
else
P_DUMP_NV906F_MTHD_DATA(fp, mthd, value, "\t\t"); P_DUMP_NV906F_MTHD_DATA(fp, mthd, value, "\t\t");
if (mthd == 0) { /* SET_OBJECT */
curr_subchans[subchan] = value & 0xffff;
}
} else { } else {
int class_id = curr_subchans[subchan];
int cls_lo = class_id & 0xff;
int cls_hi = (class_id & 0xff00) >> 8;
switch (cls_lo) { switch (cls_lo) {
case 0x97: case 0x97:
if (cls_hi >= 0xc5) if (cls_hi >= 0xc5)