pgraph/hwtest: Nailed down Kelvin+ nop/sync methods.

envytools · Aug 12, 2017 · 5704e9cb96f4124f1dc7c42b3ec0f14fc2e1508a · 5704e9c
1 parent ea98b5a
commit 5704e9cb96f4124f1dc7c42b3ec0f14fc2e1508a
Unified Split

Showing with 17 additions and 5 deletions.

+1 −0 hwtest/pgraph_mthd.h

+14 −1 hwtest/pgraph_mthd_misc.cc

+2 −4 nvhw/pgraph_class.c
diff --git a/hwtest/pgraph_mthd.h b/hwtest/pgraph_mthd.h
@@ -88,6 +88,7 @@ class MthdNop : public SingleMthdTest {

 class MthdSync : public SingleMthdTest {
 	void emulate_mthd() override {}
+	bool is_valid_val() override;
 	bool is_valid_mthd() override { return !sync; }
 	using SingleMthdTest::SingleMthdTest;
 };
diff --git a/hwtest/pgraph_mthd_misc.cc b/hwtest/pgraph_mthd_misc.cc
@@ -119,6 +119,9 @@ class MthdNopTest : public MthdTest {
 	bool is_valid_val() override {
 		if (sync)
 			return val < 4;
+		if (pgraph_3d_class(&exp) >= PGRAPH_3D_KELVIN) {
+			return val == 0;
+		}
 		return true;
 	}
 	void emulate_mthd_pre() override {
@@ -176,7 +179,7 @@ void MthdNop::adjust_orig_mthd() {
 }

 void MthdNop::emulate_mthd_pre() {
-	if (sync) {
+	if (sync && pgraph_3d_class(&exp) < PGRAPH_3D_KELVIN) {
 		trapbit = 0;
 	}
 }
@@ -196,6 +199,16 @@ void MthdNop::emulate_mthd() {
 bool MthdNop::is_valid_val() {
 	if (sync)
 		return val < 4;
+	if (pgraph_3d_class(&exp) >= PGRAPH_3D_KELVIN) {
+		return val == 0;
+	}
+	return true;
+}
+
+bool MthdSync::is_valid_val() {
+	if (pgraph_3d_class(&exp) >= PGRAPH_3D_KELVIN) {
+		return val == 0;
+	}
 	return true;
 }

diff --git a/nvhw/pgraph_class.c b/nvhw/pgraph_class.c
@@ -30,12 +30,12 @@ bool nv04_pgraph_is_syncable_class(struct pgraph_state *state) {
 	int cls = pgraph_class(state);
 	bool alt = extr(state->debug_d, 16, 1) && state->chipset.card_type >= 0x10;
 	switch (cls) {
-		case 0x8a:
 		case 0x88:
 			return state->chipset.card_type >= 0x10;
 		case 0x62:
 		case 0x7b:
 		case 0x89:
+		case 0x8a:
 		case 0x56:
 			return state->chipset.card_type >= 0x10 && !alt;
 		case 0x79:
@@ -159,8 +159,6 @@ bool nv04_pgraph_is_sync_class(struct pgraph_state *state) {
 }

 bool nv04_pgraph_is_sync(struct pgraph_state *state) {
-	int cls = pgraph_class(state);
-	bool alt = extr(state->debug_d, 16, 1) && state->chipset.card_type >= 0x10;
 	if (state->chipset.card_type < 0x10)
 		return false;
 	if (nv04_pgraph_is_nv11p(&state->chipset)) {
@@ -170,7 +168,7 @@ bool nv04_pgraph_is_sync(struct pgraph_state *state) {
 		}
 	} else if (nv04_pgraph_is_nv15p(&state->chipset)) {
 		if (nv04_pgraph_is_syncable_class(state)) {
-			if (extr(state->ctx_switch_a, 26, 1) && (cls != 0x8a || !alt))
+			if (extr(state->ctx_switch_a, 26, 1))
 				return true;
 		}
 	}