Skip to contentSkip to conversation

tests/kms_cursor_crc: HSW/BDW only have square cursors

PATCH In review Paulo Zanoni 3 participants 6 messages Oct 14, 2014 – Oct 17, 2014

lore
Share & tools
lore

Paulo Zanoni

author
#0 lore raw

PATCH 1/1 tests/kms_cursor_crc: HSW/BDW only have square cursors

From: Paulo Zanoni <[email protected]>

When I look at BSpec, and at cursor_size_ok() (from the Kernel's intel_display.c), I see that only 845g and i865g support non-square displays, so SKIP the tests on HSW/BDW instead of failing them.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=84268

Cc Ville Syrjälä <[email protected]>
Signed-off-by Paulo Zanoni <[email protected]>
---
 tests/kms_cursor_crc.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
tests/kms_cursor_crc.c +1 -4
index 92d1ce6..87b4f64 100644
@@ -371,10 +371,7 @@ static bool has_nonsquare_cursors(uint32_t devid)
 	 * Test non-square cursors a bit on the platforms
 	 * that support such things.
 	 */
-	return devid == PCI_CHIP_845_G ||
-		devid == PCI_CHIP_I865_G ||
-		(IS_GEN7(devid) && !IS_VALLEYVIEW(devid)) ||
-		(IS_GEN8(devid) && !IS_CHERRYVIEW(devid));
+	return devid == PCI_CHIP_845_G || devid == PCI_CHIP_I865_G;
 }
 
 static void test_cursor_size(data_t *data)
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw
Quoted 9 lines · Paulo Zanoni

From: Paulo Zanoni <[email protected]>

When I look at BSpec, and at cursor_size_ok() (from the Kernel's intel_display.c), I see that only 845g and i865g support non-square displays, so SKIP the tests on HSW/BDW instead of failing them.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=84268

Cc Ville Syrjälä <[email protected]>
Signed-off-by Paulo Zanoni <[email protected]>

http://lists.freedesktop.org/archives/intel-gfx/2014-September/052310.html

Sadly I hit one small extra problem with the patches and didn't manage to send out revised versions before my new BSW arrived, at which point I had actual work to do again and couldn't play around with cursors :)

Sometime soon I should hopefully have a few spare cycles to finish off that cursor stuff.

Quoted 22 lines
---
 tests/kms_cursor_crc.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
tests/kms_cursor_crc.c +1 -4
index 92d1ce6..87b4f64 100644
@@ -371,10 +371,7 @@ static bool has_nonsquare_cursors(uint32_t devid)
 	 * Test non-square cursors a bit on the platforms
 	 * that support such things.
 	 */
-	return devid == PCI_CHIP_845_G ||
-		devid == PCI_CHIP_I865_G ||
-		(IS_GEN7(devid) && !IS_VALLEYVIEW(devid)) ||
-		(IS_GEN8(devid) && !IS_CHERRYVIEW(devid));
+	return devid == PCI_CHIP_845_G || devid == PCI_CHIP_I865_G;
 }
 
 static void test_cursor_size(data_t *data)
Signature · 1 line
1.9.1
Signature · 2 lines
Ville Syrjälä
Intel OTC
author
#2 lore raw

2014-10-14 16:32 GMT-03:00 Ville Syrjälä <[email protected]>:

Quoted 11 lines · Paulo Zanoni
Quoted 9 lines

From: Paulo Zanoni <[email protected]>

When I look at BSpec, and at cursor_size_ok() (from the Kernel's intel_display.c), I see that only 845g and i865g support non-square displays, so SKIP the tests on HSW/BDW instead of failing them.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=84268

Cc Ville Syrjälä <[email protected]>
Signed-off-by Paulo Zanoni <[email protected]>
Quoted 8 lines

http://lists.freedesktop.org/archives/intel-gfx/2014-September/052310.html

Sadly I hit one small extra problem with the patches and didn't manage to send out revised versions before my new BSW arrived, at which point I had actual work to do again and couldn't play around with cursors :)

Sometime soon I should hopefully have a few spare cycles to finish off that cursor stuff.

So do we keep the bug open until there? Maybe it would be better to commit the IGT patch, close the bug, and then, when the variable-cursor-size support gets committed, update IGT.

Quoted 27 lines
Quoted 22 lines
---
 tests/kms_cursor_crc.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
tests/kms_cursor_crc.c +1 -5
index 92d1ce6..87b4f64 100644
@@ -371,10 +371,7 @@ static bool has_nonsquare_cursors(uint32_t devid)
       * Test non-square cursors a bit on the platforms
       * that support such things.
       */
-     return devid == PCI_CHIP_845_G ||
-             devid == PCI_CHIP_I865_G ||
-             (IS_GEN7(devid) && !IS_VALLEYVIEW(devid)) ||
-             (IS_GEN8(devid) && !IS_CHERRYVIEW(devid));
+     return devid == PCI_CHIP_845_G || devid == PCI_CHIP_I865_G;
 }
 
 static void test_cursor_size(data_t *data)
--
Quoted 1 line

1.9.1

--
Ville Syrjälä
Intel OTC

Signature · 5 lines
Paulo Zanoni
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
author
#3 lore raw

2014-10-14 16:43 GMT-03:00 Paulo Zanoni <[email protected]>:

Quoted 18 lines

2014-10-14 16:32 GMT-03:00 Ville Syrjälä <[email protected]>:

Quoted 17 lines · Paulo Zanoni
Quoted 9 lines

From: Paulo Zanoni <[email protected]>

When I look at BSpec, and at cursor_size_ok() (from the Kernel's intel_display.c), I see that only 845g and i865g support non-square displays, so SKIP the tests on HSW/BDW instead of failing them.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=84268

Cc Ville Syrjälä <[email protected]>
Signed-off-by Paulo Zanoni <[email protected]>

http://lists.freedesktop.org/archives/intel-gfx/2014-September/052310.html

Sadly I hit one small extra problem with the patches and didn't manage to send out revised versions before my new BSW arrived, at which point I had actual work to do again and couldn't play around with cursors :)

Quoted 6 lines
Quoted 2 lines

Sometime soon I should hopefully have a few spare cycles to finish off that cursor stuff.

So do we keep the bug open until there? Maybe it would be better to commit the IGT patch, close the bug, and then, when the variable-cursor-size support gets committed, update IGT.

Since no demonstrated to be opposed to the above plan, and I had to spend time debugging this, and we want to improve our bug statistics and IGT pass rate, I committed the patch and closed the bug. When we merge support for non-suqare cursor sizes, we can always update IGT accordingly.

Quoted 33 lines
Quoted 21 lines
Quoted 21 lines

---
 tests/kms_cursor_crc.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
tests/kms_cursor_crc.c +1 -4
index 92d1ce6..87b4f64 100644
@@ -371,10 +371,7 @@ static bool has_nonsquare_cursors(uint32_t devid)
       * Test non-square cursors a bit on the platforms
       * that support such things.
       */
-     return devid == PCI_CHIP_845_G ||
-             devid == PCI_CHIP_I865_G ||
-             (IS_GEN7(devid) && !IS_VALLEYVIEW(devid)) ||
-             (IS_GEN8(devid) && !IS_CHERRYVIEW(devid));
+     return devid == PCI_CHIP_845_G || devid == PCI_CHIP_I865_G;
 }
Quoted 7 lines
Quoted 3 lines
tests/kms_cursor_crc.c +0 -1
 static void test_cursor_size(data_t *data)
--

1.9.1

--
Ville Syrjälä
Intel OTC

--
Paulo Zanoni

Signature · 5 lines
Paulo Zanoni
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#4 lore raw
In reply to Paulo Zanoni
Quoted 5 lines · Paulo Zanoni

From: Paulo Zanoni <[email protected]>

When I look at BSpec, and at cursor_size_ok() (from the Kernel's intel_display.c), I see that only 845g and i865g support non-square displays, so SKIP the tests on HSW/BDW instead of failing them.

Why don't we just use the information provided by the kernel as to what it supports?
-Chris

Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
author
#5 lore raw

2014-10-14 16:50 GMT-03:00 Chris Wilson <[email protected]>:

Quoted 9 lines · Paulo Zanoni
Quoted 5 lines

From: Paulo Zanoni <[email protected]>

When I look at BSpec, and at cursor_size_ok() (from the Kernel's intel_display.c), I see that only 845g and i865g support non-square displays, so SKIP the tests on HSW/BDW instead of failing them.

Why don't we just use the information provided by the kernel as to what it supports?

(just documenting what we discussed on IRC yesterday)

Apparently, there's no way to check if IVB+ has support for variable-size cursors with the current capability checks: the only way would be to check the return code from the cursor IOCTLs...

Quoted 4 lines

-Chris

--
Chris Wilson, Intel Open Source Technology Centre

Signature · 1 line
Paulo Zanoni