* [PATCH 0/5] igt test naming conventions
@ 2013-11-02 12:04 Daniel Vetter
2013-11-02 12:04 ` [PATCH 1/5] tests: Start to document " Daniel Vetter
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: Daniel Vetter @ 2013-11-02 12:04 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter
Hi all,
Spurred by the ongoing discussions about improving our tests I've started to
document some of the naming patterns a bit. I've also added a few new ones and
renamed a bunch of tests.
The idea is that developers can use this patterns to construct add-hoc test
groups with piglit's -t/-x options. I hope this here is a good start, but we
certainly need to refine the patterns and test names over time.
To ensure that we have sufficient coherency I propose the following rules:
- If you add a large pile of new tests please document any new tests patterns in
tests/NAMING-CONVENTIONS.
- Any patches that are relevant for the test naming conventions must be posted
to intel-gfx to keep everyone in the loop.
Comments and ideas both on the patches and process highly welcome.
Cheeers, Daniel
Daniel Vetter (5):
tests: Start to document naming conventions
tests: estbalish drv_ prefix
tests: establish pm_ prefix
tests: Use kms_ prefix a bit more
tests: establish core_ prefix
README | 3 +
tests/.gitignore | 16 +-
tests/Makefile.am | 26 +-
tests/NAMING-CONVENTION | 63 ++++
tests/ZZ_hangman | 70 ----
tests/ZZ_missed_irq | 72 ----
tests/core_getclient.c | 61 ++++
tests/core_getstats.c | 50 +++
tests/core_getversion.c | 49 +++
tests/debugfs_pipe_crc.c | 262 --------------
tests/debugfs_reader | 9 -
tests/drv_debugfs_reader | 9 +
tests/drv_hangman | 70 ++++
tests/drv_missed_irq_hang | 72 ++++
tests/drv_module_reload | 50 +++
tests/drv_suspend.c | 171 +++++++++
tests/gem_suspend.c | 171 ---------
tests/getclient.c | 61 ----
tests/getstats.c | 50 ---
tests/getversion.c | 49 ---
tests/kms_pipe_crc_basic.c | 262 ++++++++++++++
tests/kms_sysfs_edid_timing | 25 ++
tests/module_reload | 50 ---
tests/pc8.c | 822 --------------------------------------------
tests/pm_pc8.c | 822 ++++++++++++++++++++++++++++++++++++++++++++
tests/pm_rc6_residency.c | 121 +++++++
tests/pm_rps.c | 194 +++++++++++
tests/sysfs_edid_timing | 25 --
tests/sysfs_rc6_residency.c | 121 -------
tests/sysfs_rps.c | 194 -----------
30 files changed, 2043 insertions(+), 1977 deletions(-)
create mode 100644 tests/NAMING-CONVENTION
delete mode 100755 tests/ZZ_hangman
delete mode 100755 tests/ZZ_missed_irq
create mode 100644 tests/core_getclient.c
create mode 100644 tests/core_getstats.c
create mode 100644 tests/core_getversion.c
delete mode 100644 tests/debugfs_pipe_crc.c
delete mode 100755 tests/debugfs_reader
create mode 100755 tests/drv_debugfs_reader
create mode 100755 tests/drv_hangman
create mode 100755 tests/drv_missed_irq_hang
create mode 100755 tests/drv_module_reload
create mode 100644 tests/drv_suspend.c
delete mode 100644 tests/gem_suspend.c
delete mode 100644 tests/getclient.c
delete mode 100644 tests/getstats.c
delete mode 100644 tests/getversion.c
create mode 100644 tests/kms_pipe_crc_basic.c
create mode 100755 tests/kms_sysfs_edid_timing
delete mode 100755 tests/module_reload
delete mode 100644 tests/pc8.c
create mode 100644 tests/pm_pc8.c
create mode 100644 tests/pm_rc6_residency.c
create mode 100644 tests/pm_rps.c
delete mode 100755 tests/sysfs_edid_timing
delete mode 100644 tests/sysfs_rc6_residency.c
delete mode 100644 tests/sysfs_rps.c
--
1.8.4.rc3
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/5] tests: Start to document naming conventions
2013-11-02 12:04 [PATCH 0/5] igt test naming conventions Daniel Vetter
@ 2013-11-02 12:04 ` Daniel Vetter
2013-11-02 12:04 ` [PATCH 2/5] tests: estbalish drv_ prefix Daniel Vetter
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Daniel Vetter @ 2013-11-02 12:04 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter
Just a start and we need more work here. Some follow-up patches will
clear up some of the historical confusion.
While at it rename the pc8 "basic" test to "rte".
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
README | 3 +++
tests/NAMING-CONVENTION | 56 +++++++++++++++++++++++++++++++++++++++++++++++++
tests/pc8.c | 2 +-
3 files changed, 60 insertions(+), 1 deletion(-)
create mode 100644 tests/NAMING-CONVENTION
diff --git a/README b/README
index a04c987dc691..246e24c47ffe 100644
--- a/README
+++ b/README
@@ -62,6 +62,9 @@ tests/
options to test different kms functionality, again read the source for
the details.
+ When creating new tests or subtests please read and follow
+ tests/NAMING-CONVENTION.
+
lib/
Common helper functions and headers used by the other tools.
diff --git a/tests/NAMING-CONVENTION b/tests/NAMING-CONVENTION
new file mode 100644
index 000000000000..4ae98481ebeb
--- /dev/null
+++ b/tests/NAMING-CONVENTION
@@ -0,0 +1,56 @@
+Naming Convention of i-g-t Tests and Subtests
+=============================================
+
+To facilitate easy test selection with piglit we need a somewhat consistent
+naming scheme for tests and subtests.
+
+Test Prefixes
+-------------
+
+kms_: Used for modesetting tests.
+
+drm_: Tests for libdrm behaviour, currently just testing the buffer cache
+reaping.
+
+gem_: Used for all kinds of GEM tests.
+
+prime_: Used for buffer sharing tests, both for self-importing (used by
+dri3/wayland) and actual multi-gpu tests.
+
+gen3_: Used by Chris' gen3 specific tiling/fencing tests. Generally tests that
+only run on some platforms don't have a specific prefix but just skip on
+platforms where the test doesn't apply.
+
+debugfs_/sysfs_: Mostly for tests that use sysfs/debugfs but tend to tests all
+sorts of things. Please consider using a more appropriate prefix from above if
+the main point isn't to test sysfs/debugfs, but a driver subsystem/feature.
+
+igt_: Testcase which test the i-g-t infrastructure itself and which are all run
+through "make check" while building i-g-t.
+
+(Sub-)Test patterns
+-------------------
+
+Much more powerful for filtering sets of tests are patterns anywhere in either
+the test or subtest name.
+
+hang: Tests that provoke gpu hangs
+
+swap: Tests that force their full working sets through swap. Dreadfully slow on
+machines with spinning rust and tons of memory.
+
+thrash: Tests that tend to have really slow forward progress due to
+gtt/memory/.. thrashing. Mostly used to stress-test error-handling corner-cases.
+
+crc: Tests that use the display CRC infrastructure to check the results.
+
+tiled/tiling: Tests that exercise behaviour on tiled buffers.
+
+normal/uncached/snooped: Usual 3 variants for tests that use different coherency
+modes for the buffer objects they're using.
+
+rte: _R_un_t_ime _e_nviroment checks. For testcases which will fail if the
+machine isn't configured properly there should be a first subtest to just check
+for that.
+
+ctx: Tests that exercise the hw context support.
diff --git a/tests/pc8.c b/tests/pc8.c
index 0ec011e3b87f..e56a5f8c7a65 100644
--- a/tests/pc8.c
+++ b/tests/pc8.c
@@ -790,7 +790,7 @@ int main(int argc, char *argv[])
igt_fixture
setup_environment();
- igt_subtest("basic")
+ igt_subtest("rte")
basic_subtest();
igt_subtest("drm-resources-equal")
drm_resources_equal_subtest();
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/5] tests: estbalish drv_ prefix
2013-11-02 12:04 [PATCH 0/5] igt test naming conventions Daniel Vetter
2013-11-02 12:04 ` [PATCH 1/5] tests: Start to document " Daniel Vetter
@ 2013-11-02 12:04 ` Daniel Vetter
2013-11-02 12:04 ` [PATCH 3/5] tests: establish pm_ prefix Daniel Vetter
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Daniel Vetter @ 2013-11-02 12:04 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
tests/.gitignore | 2 +-
tests/Makefile.am | 10 +--
tests/NAMING-CONVENTION | 2 +
tests/ZZ_hangman | 70 -------------------
tests/ZZ_missed_irq | 72 -------------------
tests/debugfs_reader | 9 ---
tests/drv_debugfs_reader | 9 +++
tests/drv_hangman | 70 +++++++++++++++++++
tests/drv_missed_irq_hang | 72 +++++++++++++++++++
tests/drv_module_reload | 50 ++++++++++++++
tests/drv_suspend.c | 171 ++++++++++++++++++++++++++++++++++++++++++++++
tests/gem_suspend.c | 171 ----------------------------------------------
tests/module_reload | 50 --------------
13 files changed, 380 insertions(+), 378 deletions(-)
delete mode 100755 tests/ZZ_hangman
delete mode 100755 tests/ZZ_missed_irq
delete mode 100755 tests/debugfs_reader
create mode 100755 tests/drv_debugfs_reader
create mode 100755 tests/drv_hangman
create mode 100755 tests/drv_missed_irq_hang
create mode 100755 tests/drv_module_reload
create mode 100644 tests/drv_suspend.c
delete mode 100644 tests/gem_suspend.c
delete mode 100755 tests/module_reload
diff --git a/tests/.gitignore b/tests/.gitignore
index 8ca254983d8a..8df08364a4ca 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1,6 +1,7 @@
# Please keep sorted alphabetically
ddi_compute_wrpll
debugfs_pipe_crc
+drv_suspend
drm_get_client_auth
drm_vma_limiter
drm_vma_limiter_cached
@@ -74,7 +75,6 @@ gem_storedw_loop_bsd
gem_storedw_loop_render
gem_storedw_loop_vebox
gem_stress
-gem_suspend
gem_threaded_access_tiled
gem_tiled_blits
gem_tiled_fence_blits
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e496d69d14a4..94cdcd02f814 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -18,6 +18,7 @@ endif
TESTS_progs_M = \
debugfs_pipe_crc \
+ drv_suspend \
gem_basic \
gem_caching \
gem_concurrent_blit \
@@ -47,7 +48,6 @@ TESTS_progs_M = \
gem_ringfill \
gem_set_tiling_vs_blt \
gem_storedw_batches_loop \
- gem_suspend \
gem_tiled_blits \
gem_tiled_partial_pwrite_pread \
gem_write_read_ring_switch \
@@ -131,14 +131,14 @@ TESTS_scripts_M = \
TESTS_scripts = \
debugfs_emon_crash \
- debugfs_reader \
- module_reload \
+ drv_debugfs_reader \
+ drv_hangman \
+ drv_missed_irq_hang \
+ drv_module_reload \
sysfs_edid_timing \
sysfs_l3_parity \
test_rte_check \
tools_test \
- ZZ_hangman \
- ZZ_missed_irq \
$(NULL)
# This target contains testcases which support automagic subtest enumeration
diff --git a/tests/NAMING-CONVENTION b/tests/NAMING-CONVENTION
index 4ae98481ebeb..c22e4cf8a7fa 100644
--- a/tests/NAMING-CONVENTION
+++ b/tests/NAMING-CONVENTION
@@ -17,6 +17,8 @@ gem_: Used for all kinds of GEM tests.
prime_: Used for buffer sharing tests, both for self-importing (used by
dri3/wayland) and actual multi-gpu tests.
+drv_: Tests for overall driver behaviour like module reload, s/r, debugfs files.
+
gen3_: Used by Chris' gen3 specific tiling/fencing tests. Generally tests that
only run on some platforms don't have a specific prefix but just skip on
platforms where the test doesn't apply.
diff --git a/tests/ZZ_hangman b/tests/ZZ_hangman
deleted file mode 100755
index 6b310bc9a7b5..000000000000
--- a/tests/ZZ_hangman
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-#
-# Testcase: Simulate gpu hang
-#
-# This check uses the stop_rings facility to exercise the gpu hang code.
-# by reading /sys/kernel/debug/dri/0/i915_emon_status too quickly
-#
-
-SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
-. $SOURCE_DIR/drm_lib.sh
-
-oldpath=`pwd`
-
-cd $i915_dfs_path
-
-if [ ! -f i915_ring_stop ] ; then
- echo "kernel doesn't support ring stopping"
- exit 77
-fi
-
-function check_iface {
- dir="$1"
- file="$2"
- mandatory="$3"
-
- [ -z "$dir" ] && return
-
- path="$dir/$file"
- echo checking ${path}
-
- if [ ! -f "$path" ] ; then
- if [ $mandatory != 0 ] ; then
- echo "'${path}' not found";
- exit 1;
- else
- echo "${path} not mandatory";
- return;
- fi
- fi
-
- if cat "$path" | grep -v "no error state collected" > /dev/null ; then
- echo "gpu hang detected"
- exit 2
- fi
-
- echo 0xf > i915_ring_stop
- echo "rings stopped"
-
- (cd $oldpath; $SOURCE_DIR/gem_exec_big) > /dev/null
-
- if cat "$path" | grep -v "no error state collected" > /dev/null ; then
- echo "gpu hang correctly detected"
- else
- echo "gpu hang not detected"
- exit 3
- fi
-
-# clear error state
- echo > "$path"
-
- if cat "$path" | grep -v "no error state collected" > /dev/null ; then
- echo "gpu hang still present"
- exit 4
- fi
-}
-
-check_iface "$i915_dfs_path" i915_error_state 1
-check_iface "$i915_sfs_path" error 0
-
-exit 0
diff --git a/tests/ZZ_missed_irq b/tests/ZZ_missed_irq
deleted file mode 100755
index a99dc80c57ae..000000000000
--- a/tests/ZZ_missed_irq
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/bash
-#
-# Testcase: Simulate missed breadcrumb interrupts
-#
-
-SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
-. $SOURCE_DIR/drm_lib.sh
-
-oldpath=`pwd`
-
-cd $i915_dfs_path
-
-echo $SOURCE_DIR
-
-function check_for_missed_irq {
- if test `cat i915_ring_missed_irq` = 0x00000000; then
- echo "missed interrupts undetected"
- exit 1
- fi
-}
-
-function check_for_hang {
- if cat i915_error_state | grep -v "no error state collected" > /dev/null ; then
- echo "gpu hang reported"
- exit 2
- fi
-}
-
-if [ ! -f i915_ring_missed_irq ] ; then
- echo "kernel doesn't support interrupt masking"
- exit 77
-fi
-
-# clear error state first
-echo > i915_error_state
-check_for_hang
-
-echo 0xf > i915_ring_test_irq
-echo "Interrupts masked"
-if test `cat i915_ring_test_irq` != 0x0000000f; then
- echo "Failed to set interrupt mask"
- exit 3
-fi
-
-(cd $oldpath; $SOURCE_DIR/gem_exec_big) > /dev/null
-
-check_for_missed_irq
-check_for_hang
-
-(cd $oldpath; $SOURCE_DIR/gem_exec_big) > /dev/null
-
-check_for_hang
-
-echo 0 > i915_ring_test_irq
-echo "Interrupts unmasked"
-if test `cat i915_ring_test_irq` != 0x00000000; then
- echo "Failed to clear interrupt mask"
- exit 3
-fi
-
-(cd $oldpath; $SOURCE_DIR/gem_exec_big) > /dev/null
-
-check_for_hang
-
-echo 0 > i915_ring_missed_irq
-echo "Cleared missed interrupts"
-if test `cat i915_ring_missed_irq` != 0x00000000; then
- echo "Failed to clear missed interrupts"
- exit 3
-fi
-
-exit 0
diff --git a/tests/debugfs_reader b/tests/debugfs_reader
deleted file mode 100755
index 9e2845ebc2bd..000000000000
--- a/tests/debugfs_reader
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
-. $SOURCE_DIR/drm_lib.sh
-
-# read everything we can
-cat $i915_dfs_path/* > /dev/null 2>&1
-
-exit 0
diff --git a/tests/drv_debugfs_reader b/tests/drv_debugfs_reader
new file mode 100755
index 000000000000..9e2845ebc2bd
--- /dev/null
+++ b/tests/drv_debugfs_reader
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
+. $SOURCE_DIR/drm_lib.sh
+
+# read everything we can
+cat $i915_dfs_path/* > /dev/null 2>&1
+
+exit 0
diff --git a/tests/drv_hangman b/tests/drv_hangman
new file mode 100755
index 000000000000..6b310bc9a7b5
--- /dev/null
+++ b/tests/drv_hangman
@@ -0,0 +1,70 @@
+#!/bin/bash
+#
+# Testcase: Simulate gpu hang
+#
+# This check uses the stop_rings facility to exercise the gpu hang code.
+# by reading /sys/kernel/debug/dri/0/i915_emon_status too quickly
+#
+
+SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
+. $SOURCE_DIR/drm_lib.sh
+
+oldpath=`pwd`
+
+cd $i915_dfs_path
+
+if [ ! -f i915_ring_stop ] ; then
+ echo "kernel doesn't support ring stopping"
+ exit 77
+fi
+
+function check_iface {
+ dir="$1"
+ file="$2"
+ mandatory="$3"
+
+ [ -z "$dir" ] && return
+
+ path="$dir/$file"
+ echo checking ${path}
+
+ if [ ! -f "$path" ] ; then
+ if [ $mandatory != 0 ] ; then
+ echo "'${path}' not found";
+ exit 1;
+ else
+ echo "${path} not mandatory";
+ return;
+ fi
+ fi
+
+ if cat "$path" | grep -v "no error state collected" > /dev/null ; then
+ echo "gpu hang detected"
+ exit 2
+ fi
+
+ echo 0xf > i915_ring_stop
+ echo "rings stopped"
+
+ (cd $oldpath; $SOURCE_DIR/gem_exec_big) > /dev/null
+
+ if cat "$path" | grep -v "no error state collected" > /dev/null ; then
+ echo "gpu hang correctly detected"
+ else
+ echo "gpu hang not detected"
+ exit 3
+ fi
+
+# clear error state
+ echo > "$path"
+
+ if cat "$path" | grep -v "no error state collected" > /dev/null ; then
+ echo "gpu hang still present"
+ exit 4
+ fi
+}
+
+check_iface "$i915_dfs_path" i915_error_state 1
+check_iface "$i915_sfs_path" error 0
+
+exit 0
diff --git a/tests/drv_missed_irq_hang b/tests/drv_missed_irq_hang
new file mode 100755
index 000000000000..a99dc80c57ae
--- /dev/null
+++ b/tests/drv_missed_irq_hang
@@ -0,0 +1,72 @@
+#!/bin/bash
+#
+# Testcase: Simulate missed breadcrumb interrupts
+#
+
+SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
+. $SOURCE_DIR/drm_lib.sh
+
+oldpath=`pwd`
+
+cd $i915_dfs_path
+
+echo $SOURCE_DIR
+
+function check_for_missed_irq {
+ if test `cat i915_ring_missed_irq` = 0x00000000; then
+ echo "missed interrupts undetected"
+ exit 1
+ fi
+}
+
+function check_for_hang {
+ if cat i915_error_state | grep -v "no error state collected" > /dev/null ; then
+ echo "gpu hang reported"
+ exit 2
+ fi
+}
+
+if [ ! -f i915_ring_missed_irq ] ; then
+ echo "kernel doesn't support interrupt masking"
+ exit 77
+fi
+
+# clear error state first
+echo > i915_error_state
+check_for_hang
+
+echo 0xf > i915_ring_test_irq
+echo "Interrupts masked"
+if test `cat i915_ring_test_irq` != 0x0000000f; then
+ echo "Failed to set interrupt mask"
+ exit 3
+fi
+
+(cd $oldpath; $SOURCE_DIR/gem_exec_big) > /dev/null
+
+check_for_missed_irq
+check_for_hang
+
+(cd $oldpath; $SOURCE_DIR/gem_exec_big) > /dev/null
+
+check_for_hang
+
+echo 0 > i915_ring_test_irq
+echo "Interrupts unmasked"
+if test `cat i915_ring_test_irq` != 0x00000000; then
+ echo "Failed to clear interrupt mask"
+ exit 3
+fi
+
+(cd $oldpath; $SOURCE_DIR/gem_exec_big) > /dev/null
+
+check_for_hang
+
+echo 0 > i915_ring_missed_irq
+echo "Cleared missed interrupts"
+if test `cat i915_ring_missed_irq` != 0x00000000; then
+ echo "Failed to clear missed interrupts"
+ exit 3
+fi
+
+exit 0
diff --git a/tests/drv_module_reload b/tests/drv_module_reload
new file mode 100755
index 000000000000..c1fd395731ca
--- /dev/null
+++ b/tests/drv_module_reload
@@ -0,0 +1,50 @@
+#!/bin/bash
+#
+# Testcase: Reload the drm module
+#
+# ... we've broken this way too often :(
+#
+
+SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
+. $SOURCE_DIR/drm_lib.sh
+
+# no other drm service should be running, so we can just unbind
+
+# vtcon0 is vga, vtcon1 fbcon and let's pray that won't change due to boot load
+# time changes
+if ! echo 0 > /sys/class/vtconsole/vtcon1/bind ; then
+ echo -e "no kms unload support"
+ echo "please enable CONFIG_VT_HW_CONSOLE_BINDING in the kernel"
+ exit 77
+fi
+
+# The sound driver uses our power well
+pkill alsactl
+rmmod snd_hda_intel &> /dev/null
+
+#ignore errors in ips - gen5 only
+rmmod intel_ips &> /dev/null
+rmmod i915
+#ignore errors in intel-gtt, often built-in
+rmmod intel-gtt &> /dev/null
+# drm may be used by other devices (nouveau, radeon, udl, etc)
+rmmod drm_kms_helper &> /dev/null
+rmmod drm &> /dev/null
+
+if lsmod | grep i915 &> /dev/null ; then
+ echo WARNING: i915.ko still loaded!
+ exitcode=1
+else
+ echo module successfully unloaded
+ exitcode=0
+fi
+
+modprobe i915
+echo 1 > /sys/class/vtconsole/vtcon1/bind
+
+modprobe snd_hda_intel
+
+# try to run something
+$SOURCE_DIR/gem_exec_nop > /dev/null && echo "module successfully loaded again"
+
+exit $exitcode
diff --git a/tests/drv_suspend.c b/tests/drv_suspend.c
new file mode 100644
index 000000000000..e526e2a21916
--- /dev/null
+++ b/tests/drv_suspend.c
@@ -0,0 +1,171 @@
+/*
+ * Copyright © 2013 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ * Daniel Vetter <daniel.vetter@ffwll.ch>
+ *
+ */
+
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <fcntl.h>
+#include <inttypes.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include "drm.h"
+#include "i915_drm.h"
+#include "drmtest.h"
+
+#define OBJECT_SIZE (16*1024*1024)
+
+static void
+test_fence_restore(int fd, bool tiled2untiled)
+{
+ uint32_t handle1, handle2, handle_tiled;
+ uint32_t *ptr1, *ptr2, *ptr_tiled;
+ int i;
+
+ /* We wall the tiled object with untiled canary objects to make sure
+ * that we detect tile leaking in both directions. */
+ handle1 = gem_create(fd, OBJECT_SIZE);
+ handle2 = gem_create(fd, OBJECT_SIZE);
+ handle_tiled = gem_create(fd, OBJECT_SIZE);
+
+ /* Access the buffer objects in the order we want to have the laid out. */
+ ptr1 = gem_mmap(fd, handle1, OBJECT_SIZE, PROT_READ | PROT_WRITE);
+ igt_assert(ptr1 != MAP_FAILED);
+ for (i = 0; i < OBJECT_SIZE/sizeof(uint32_t); i++)
+ ptr1[i] = i;
+
+ ptr_tiled = gem_mmap(fd, handle_tiled, OBJECT_SIZE, PROT_READ | PROT_WRITE);
+ igt_assert(ptr_tiled != MAP_FAILED);
+ if (tiled2untiled)
+ gem_set_tiling(fd, handle_tiled, I915_TILING_X, 2048);
+ for (i = 0; i < OBJECT_SIZE/sizeof(uint32_t); i++)
+ ptr_tiled[i] = i;
+
+ ptr2 = gem_mmap(fd, handle2, OBJECT_SIZE, PROT_READ | PROT_WRITE);
+ igt_assert(ptr2 != MAP_FAILED);
+ for (i = 0; i < OBJECT_SIZE/sizeof(uint32_t); i++)
+ ptr2[i] = i;
+
+ if (tiled2untiled)
+ gem_set_tiling(fd, handle_tiled, I915_TILING_NONE, 2048);
+ else
+ gem_set_tiling(fd, handle_tiled, I915_TILING_X, 2048);
+
+ igt_system_suspend_autoresume();
+
+ printf("checking the first canary object\n");
+ for (i = 0; i < OBJECT_SIZE/sizeof(uint32_t); i++)
+ igt_assert(ptr1[i] == i);
+
+ printf("checking the second canary object\n");
+ for (i = 0; i < OBJECT_SIZE/sizeof(uint32_t); i++)
+ igt_assert(ptr2[i] == i);
+
+ gem_close(fd, handle1);
+ gem_close(fd, handle2);
+ gem_close(fd, handle_tiled);
+
+ munmap(ptr1, OBJECT_SIZE);
+ munmap(ptr2, OBJECT_SIZE);
+ munmap(ptr_tiled, OBJECT_SIZE);
+}
+
+static void
+test_debugfs_reader(void)
+{
+ struct igt_helper_process reader = {};
+ reader.use_SIGKILL = true;
+
+ igt_fork_helper(&reader) {
+ static const char dfs_base[] = "/sys/kernel/debug/dri";
+ static char tmp[1024];
+
+ snprintf(tmp, sizeof(tmp) - 1,
+ "while true; do find %s/%i/ -type f | xargs cat &> /dev/null; done",
+ dfs_base, drm_get_card());
+ assert(execl("/bin/sh", "sh", "-c", tmp, (char *) NULL) != -1);
+ }
+
+ sleep(1);
+
+ igt_system_suspend_autoresume();
+
+ sleep(1);
+
+ igt_stop_helper(&reader);
+}
+
+static void
+test_sysfs_reader(void)
+{
+ struct igt_helper_process reader = {};
+ reader.use_SIGKILL = true;
+
+ igt_fork_helper(&reader) {
+ static const char dfs_base[] = "/sys/class/drm/card";
+ static char tmp[1024];
+
+ snprintf(tmp, sizeof(tmp) - 1,
+ "while true; do find %s%i*/ -type f | xargs cat &> /dev/null; done",
+ dfs_base, drm_get_card());
+ assert(execl("/bin/sh", "sh", "-c", tmp, (char *) NULL) != -1);
+ }
+
+ sleep(1);
+
+ igt_system_suspend_autoresume();
+
+ sleep(1);
+
+ igt_stop_helper(&reader);
+}
+
+int fd;
+
+igt_main
+{
+ igt_skip_on_simulation();
+
+ igt_fixture
+ fd = drm_open_any();
+
+ igt_subtest("fence-restore-tiled2untiled")
+ test_fence_restore(fd, true);
+
+ igt_subtest("fence-restore-untiled")
+ test_fence_restore(fd, false);
+
+ igt_subtest("debugfs-reader")
+ test_debugfs_reader();
+
+ igt_subtest("sysfs-reader")
+ test_sysfs_reader();
+
+ igt_fixture
+ close(fd);
+}
diff --git a/tests/gem_suspend.c b/tests/gem_suspend.c
deleted file mode 100644
index e526e2a21916..000000000000
--- a/tests/gem_suspend.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright © 2013 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * Authors:
- * Daniel Vetter <daniel.vetter@ffwll.ch>
- *
- */
-
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include "drm.h"
-#include "i915_drm.h"
-#include "drmtest.h"
-
-#define OBJECT_SIZE (16*1024*1024)
-
-static void
-test_fence_restore(int fd, bool tiled2untiled)
-{
- uint32_t handle1, handle2, handle_tiled;
- uint32_t *ptr1, *ptr2, *ptr_tiled;
- int i;
-
- /* We wall the tiled object with untiled canary objects to make sure
- * that we detect tile leaking in both directions. */
- handle1 = gem_create(fd, OBJECT_SIZE);
- handle2 = gem_create(fd, OBJECT_SIZE);
- handle_tiled = gem_create(fd, OBJECT_SIZE);
-
- /* Access the buffer objects in the order we want to have the laid out. */
- ptr1 = gem_mmap(fd, handle1, OBJECT_SIZE, PROT_READ | PROT_WRITE);
- igt_assert(ptr1 != MAP_FAILED);
- for (i = 0; i < OBJECT_SIZE/sizeof(uint32_t); i++)
- ptr1[i] = i;
-
- ptr_tiled = gem_mmap(fd, handle_tiled, OBJECT_SIZE, PROT_READ | PROT_WRITE);
- igt_assert(ptr_tiled != MAP_FAILED);
- if (tiled2untiled)
- gem_set_tiling(fd, handle_tiled, I915_TILING_X, 2048);
- for (i = 0; i < OBJECT_SIZE/sizeof(uint32_t); i++)
- ptr_tiled[i] = i;
-
- ptr2 = gem_mmap(fd, handle2, OBJECT_SIZE, PROT_READ | PROT_WRITE);
- igt_assert(ptr2 != MAP_FAILED);
- for (i = 0; i < OBJECT_SIZE/sizeof(uint32_t); i++)
- ptr2[i] = i;
-
- if (tiled2untiled)
- gem_set_tiling(fd, handle_tiled, I915_TILING_NONE, 2048);
- else
- gem_set_tiling(fd, handle_tiled, I915_TILING_X, 2048);
-
- igt_system_suspend_autoresume();
-
- printf("checking the first canary object\n");
- for (i = 0; i < OBJECT_SIZE/sizeof(uint32_t); i++)
- igt_assert(ptr1[i] == i);
-
- printf("checking the second canary object\n");
- for (i = 0; i < OBJECT_SIZE/sizeof(uint32_t); i++)
- igt_assert(ptr2[i] == i);
-
- gem_close(fd, handle1);
- gem_close(fd, handle2);
- gem_close(fd, handle_tiled);
-
- munmap(ptr1, OBJECT_SIZE);
- munmap(ptr2, OBJECT_SIZE);
- munmap(ptr_tiled, OBJECT_SIZE);
-}
-
-static void
-test_debugfs_reader(void)
-{
- struct igt_helper_process reader = {};
- reader.use_SIGKILL = true;
-
- igt_fork_helper(&reader) {
- static const char dfs_base[] = "/sys/kernel/debug/dri";
- static char tmp[1024];
-
- snprintf(tmp, sizeof(tmp) - 1,
- "while true; do find %s/%i/ -type f | xargs cat &> /dev/null; done",
- dfs_base, drm_get_card());
- assert(execl("/bin/sh", "sh", "-c", tmp, (char *) NULL) != -1);
- }
-
- sleep(1);
-
- igt_system_suspend_autoresume();
-
- sleep(1);
-
- igt_stop_helper(&reader);
-}
-
-static void
-test_sysfs_reader(void)
-{
- struct igt_helper_process reader = {};
- reader.use_SIGKILL = true;
-
- igt_fork_helper(&reader) {
- static const char dfs_base[] = "/sys/class/drm/card";
- static char tmp[1024];
-
- snprintf(tmp, sizeof(tmp) - 1,
- "while true; do find %s%i*/ -type f | xargs cat &> /dev/null; done",
- dfs_base, drm_get_card());
- assert(execl("/bin/sh", "sh", "-c", tmp, (char *) NULL) != -1);
- }
-
- sleep(1);
-
- igt_system_suspend_autoresume();
-
- sleep(1);
-
- igt_stop_helper(&reader);
-}
-
-int fd;
-
-igt_main
-{
- igt_skip_on_simulation();
-
- igt_fixture
- fd = drm_open_any();
-
- igt_subtest("fence-restore-tiled2untiled")
- test_fence_restore(fd, true);
-
- igt_subtest("fence-restore-untiled")
- test_fence_restore(fd, false);
-
- igt_subtest("debugfs-reader")
- test_debugfs_reader();
-
- igt_subtest("sysfs-reader")
- test_sysfs_reader();
-
- igt_fixture
- close(fd);
-}
diff --git a/tests/module_reload b/tests/module_reload
deleted file mode 100755
index c1fd395731ca..000000000000
--- a/tests/module_reload
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-#
-# Testcase: Reload the drm module
-#
-# ... we've broken this way too often :(
-#
-
-SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
-. $SOURCE_DIR/drm_lib.sh
-
-# no other drm service should be running, so we can just unbind
-
-# vtcon0 is vga, vtcon1 fbcon and let's pray that won't change due to boot load
-# time changes
-if ! echo 0 > /sys/class/vtconsole/vtcon1/bind ; then
- echo -e "no kms unload support"
- echo "please enable CONFIG_VT_HW_CONSOLE_BINDING in the kernel"
- exit 77
-fi
-
-# The sound driver uses our power well
-pkill alsactl
-rmmod snd_hda_intel &> /dev/null
-
-#ignore errors in ips - gen5 only
-rmmod intel_ips &> /dev/null
-rmmod i915
-#ignore errors in intel-gtt, often built-in
-rmmod intel-gtt &> /dev/null
-# drm may be used by other devices (nouveau, radeon, udl, etc)
-rmmod drm_kms_helper &> /dev/null
-rmmod drm &> /dev/null
-
-if lsmod | grep i915 &> /dev/null ; then
- echo WARNING: i915.ko still loaded!
- exitcode=1
-else
- echo module successfully unloaded
- exitcode=0
-fi
-
-modprobe i915
-echo 1 > /sys/class/vtconsole/vtcon1/bind
-
-modprobe snd_hda_intel
-
-# try to run something
-$SOURCE_DIR/gem_exec_nop > /dev/null && echo "module successfully loaded again"
-
-exit $exitcode
--
1.8.4.rc3
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/5] tests: establish pm_ prefix
2013-11-02 12:04 [PATCH 0/5] igt test naming conventions Daniel Vetter
2013-11-02 12:04 ` [PATCH 1/5] tests: Start to document " Daniel Vetter
2013-11-02 12:04 ` [PATCH 2/5] tests: estbalish drv_ prefix Daniel Vetter
@ 2013-11-02 12:04 ` Daniel Vetter
2013-11-02 12:04 ` [PATCH 4/5] tests: Use kms_ prefix a bit more Daniel Vetter
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Daniel Vetter @ 2013-11-02 12:04 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter
Imo power management, power consumption and performance are tightly
enough coupled that we can throw them all into one bin.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
tests/.gitignore | 6 +-
tests/Makefile.am | 6 +-
tests/NAMING-CONVENTION | 3 +
tests/pc8.c | 822 --------------------------------------------
tests/pm_pc8.c | 822 ++++++++++++++++++++++++++++++++++++++++++++
tests/pm_rc6_residency.c | 121 +++++++
tests/pm_rps.c | 194 +++++++++++
tests/sysfs_rc6_residency.c | 121 -------
tests/sysfs_rps.c | 194 -----------
9 files changed, 1146 insertions(+), 1143 deletions(-)
delete mode 100644 tests/pc8.c
create mode 100644 tests/pm_pc8.c
create mode 100644 tests/pm_rc6_residency.c
create mode 100644 tests/pm_rps.c
delete mode 100644 tests/sysfs_rc6_residency.c
delete mode 100644 tests/sysfs_rps.c
diff --git a/tests/.gitignore b/tests/.gitignore
index 8df08364a4ca..e99b2da04c20 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -106,13 +106,13 @@ kms_cursor_crc
kms_flip
kms_render
kms_setmode
-pc8
+pm_pc8
+pm_rc6_residency
+pm_rps
prime_nv_api
prime_nv_pcopy
prime_nv_test
prime_self_import
prime_udl
-sysfs_rc6_residency
-sysfs_rps
template
testdisplay
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 94cdcd02f814..4e2813fffc4c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -57,7 +57,7 @@ TESTS_progs_M = \
kms_render \
kms_setmode \
$(NOUVEAU_TESTS_M) \
- pc8 \
+ pm_pc8 \
prime_self_import \
template \
$(NULL)
@@ -120,8 +120,8 @@ TESTS_progs = \
getstats \
getversion \
prime_udl \
- sysfs_rc6_residency \
- sysfs_rps \
+ pm_rc6_residency \
+ pm_rps \
$(NULL)
# IMPORTANT: The ZZ_ tests need to be run last!
diff --git a/tests/NAMING-CONVENTION b/tests/NAMING-CONVENTION
index c22e4cf8a7fa..f57033c0a6cc 100644
--- a/tests/NAMING-CONVENTION
+++ b/tests/NAMING-CONVENTION
@@ -19,6 +19,9 @@ dri3/wayland) and actual multi-gpu tests.
drv_: Tests for overall driver behaviour like module reload, s/r, debugfs files.
+pm_: Tests for power management features like runtime PM, tuning knobs in sysfs
+and also performance tuning features.
+
gen3_: Used by Chris' gen3 specific tiling/fencing tests. Generally tests that
only run on some platforms don't have a specific prefix but just skip on
platforms where the test doesn't apply.
diff --git a/tests/pc8.c b/tests/pc8.c
deleted file mode 100644
index e56a5f8c7a65..000000000000
--- a/tests/pc8.c
+++ /dev/null
@@ -1,822 +0,0 @@
-/*
- * Copyright © 2013 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * Authors:
- * Paulo Zanoni <paulo.r.zanoni@intel.com>
- *
- */
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include <string.h>
-
-#include <unistd.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <linux/i2c.h>
-#include <linux/i2c-dev.h>
-
-#include "drm.h"
-#include "drmtest.h"
-#include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
-#include "i915_drm.h"
-
-#define MSR_PC8_RES 0x630
-#define MSR_PC9_RES 0x631
-#define MSR_PC10_RES 0x632
-
-#define MAX_CONNECTORS 32
-#define MAX_ENCODERS 32
-#define MAX_CRTCS 16
-
-enum screen_type {
- SCREEN_TYPE_LPSP,
- SCREEN_TYPE_NON_LPSP,
- SCREEN_TYPE_ANY,
-};
-
-enum residency_wait {
- WAIT,
- DONT_WAIT,
-};
-
-int drm_fd, msr_fd;
-struct mode_set_data ms_data;
-
-/* Stuff used when creating FBs and mode setting. */
-struct mode_set_data {
- drmModeResPtr res;
- drmModeConnectorPtr connectors[MAX_CONNECTORS];
- drmModePropertyBlobPtr edids[MAX_CONNECTORS];
-
- drm_intel_bufmgr *bufmgr;
- uint32_t devid;
-};
-
-/* Stuff we query at different times so we can compare. */
-struct compare_data {
- drmModeResPtr res;
- drmModeEncoderPtr encoders[MAX_ENCODERS];
- drmModeConnectorPtr connectors[MAX_CONNECTORS];
- drmModeCrtcPtr crtcs[MAX_CRTCS];
- drmModePropertyBlobPtr edids[MAX_CONNECTORS];
-};
-
-struct compare_registers {
- /* We know these are lost */
- uint32_t arb_mode;
- uint32_t tilectl;
-
- /* Stuff touched at init_clock_gating, so we can make sure we
- * don't need to call it when reiniting. */
- uint32_t gen6_ucgctl2;
- uint32_t gen7_l3cntlreg1;
- uint32_t transa_chicken1;
-
- uint32_t deier;
- uint32_t gtier;
-
- uint32_t ddi_buf_trans_a_1;
- uint32_t ddi_buf_trans_b_5;
- uint32_t ddi_buf_trans_c_10;
- uint32_t ddi_buf_trans_d_15;
- uint32_t ddi_buf_trans_e_20;
-};
-
-/* If the read fails, then the machine doesn't support PC8+ residencies. */
-static bool supports_pc8_plus_residencies(void)
-{
- int rc;
- uint64_t val;
-
- rc = pread(msr_fd, &val, sizeof(uint64_t), MSR_PC8_RES);
- if (rc != sizeof(val))
- return false;
- rc = pread(msr_fd, &val, sizeof(uint64_t), MSR_PC9_RES);
- if (rc != sizeof(val))
- return false;
- rc = pread(msr_fd, &val, sizeof(uint64_t), MSR_PC10_RES);
- if (rc != sizeof(val))
- return false;
-
- return true;
-}
-
-static uint64_t get_residency(uint32_t type)
-{
- int rc;
- uint64_t ret;
-
- rc = pread(msr_fd, &ret, sizeof(uint64_t), type);
- igt_assert(rc == sizeof(ret));
-
- return ret;
-}
-
-static bool pc8_plus_residency_changed(unsigned int timeout_sec)
-{
- unsigned int i;
- uint64_t res_pc8, res_pc9, res_pc10;
- int to_sleep = 100 * 1000;
-
- res_pc8 = get_residency(MSR_PC8_RES);
- res_pc9 = get_residency(MSR_PC9_RES);
- res_pc10 = get_residency(MSR_PC10_RES);
-
- for (i = 0; i < timeout_sec * 1000 * 1000; i += to_sleep) {
- if (res_pc8 != get_residency(MSR_PC8_RES) ||
- res_pc9 != get_residency(MSR_PC9_RES) ||
- res_pc10 != get_residency(MSR_PC10_RES)) {
- return true;
- }
- usleep(to_sleep);
- }
-
- return false;
-}
-
-/* Checks not only if PC8+ is allowed, but also if we're reaching it.
- * We call this when we expect this function to return quickly since PC8 is
- * actually enabled, so the 30s timeout we use shouldn't matter. */
-static bool pc8_plus_enabled(void)
-{
- return pc8_plus_residency_changed(30);
-}
-
-/* We call this when we expect PC8+ to be actually disabled, so we should not
- * return until the 5s timeout expires. In other words: in the "happy case",
- * every time we call this function the program will take 5s more to finish. */
-static bool pc8_plus_disabled(void)
-{
- return !pc8_plus_residency_changed(5);
-}
-
-static void disable_all_screens(struct mode_set_data *data)
-{
- int i, rc;
-
- for (i = 0; i < data->res->count_crtcs; i++) {
- rc = drmModeSetCrtc(drm_fd, data->res->crtcs[i], -1, 0, 0,
- NULL, 0, NULL);
- igt_assert(rc == 0);
- }
-}
-
-static uint32_t create_fb(struct mode_set_data *data, int width, int height)
-{
- struct kmstest_fb fb;
- cairo_t *cr;
- uint32_t buffer_id;
-
- buffer_id = kmstest_create_fb(drm_fd, width, height, 32, 24, false,
- &fb);
- cr = kmstest_get_cairo_ctx(drm_fd, &fb);
- kmstest_paint_test_pattern(cr, width, height);
- return buffer_id;
-}
-
-static bool enable_one_screen_with_type(struct mode_set_data *data,
- enum screen_type type)
-{
- uint32_t crtc_id = 0, buffer_id = 0, connector_id = 0;
- drmModeModeInfoPtr mode = NULL;
- int i, rc;
-
- for (i = 0; i < data->res->count_connectors; i++) {
- drmModeConnectorPtr c = data->connectors[i];
-
- if (type == SCREEN_TYPE_LPSP &&
- c->connector_type != DRM_MODE_CONNECTOR_eDP)
- continue;
-
- if (type == SCREEN_TYPE_NON_LPSP &&
- c->connector_type == DRM_MODE_CONNECTOR_eDP)
- continue;
-
- if (c->connection == DRM_MODE_CONNECTED && c->count_modes) {
- connector_id = c->connector_id;
- mode = &c->modes[0];
- break;
- }
- }
-
- if (connector_id == 0)
- return false;
-
- crtc_id = data->res->crtcs[0];
- buffer_id = create_fb(data, mode->hdisplay, mode->vdisplay);
-
- igt_assert(crtc_id);
- igt_assert(buffer_id);
- igt_assert(connector_id);
- igt_assert(mode);
-
- rc = drmModeSetCrtc(drm_fd, crtc_id, buffer_id, 0, 0, &connector_id,
- 1, mode);
- igt_assert(rc == 0);
-
- return true;
-}
-
-static void enable_one_screen(struct mode_set_data *data)
-{
- igt_assert(enable_one_screen_with_type(data, SCREEN_TYPE_ANY));
-}
-
-static drmModePropertyBlobPtr get_connector_edid(drmModeConnectorPtr connector,
- int index)
-{
- unsigned int i;
- drmModeObjectPropertiesPtr props;
- drmModePropertyBlobPtr ret = NULL;
-
- props = drmModeObjectGetProperties(drm_fd, connector->connector_id,
- DRM_MODE_OBJECT_CONNECTOR);
-
- for (i = 0; i < props->count_props; i++) {
- drmModePropertyPtr prop = drmModeGetProperty(drm_fd,
- props->props[i]);
-
- if (strcmp(prop->name, "EDID") == 0) {
- igt_assert(prop->flags & DRM_MODE_PROP_BLOB);
- igt_assert(prop->count_blobs == 0);
- ret = drmModeGetPropertyBlob(drm_fd,
- props->prop_values[i]);
- }
-
- drmModeFreeProperty(prop);
- }
-
- drmModeFreeObjectProperties(props);
- return ret;
-}
-
-static void init_mode_set_data(struct mode_set_data *data)
-{
- int i;
-
- data->res = drmModeGetResources(drm_fd);
- igt_assert(data->res);
- igt_assert(data->res->count_connectors <= MAX_CONNECTORS);
-
- for (i = 0; i < data->res->count_connectors; i++) {
- data->connectors[i] = drmModeGetConnector(drm_fd,
- data->res->connectors[i]);
- data->edids[i] = get_connector_edid(data->connectors[i], i);
- }
-
- data->bufmgr = drm_intel_bufmgr_gem_init(drm_fd, 4096);
- data->devid = intel_get_drm_devid(drm_fd);
-
- igt_set_vt_graphics_mode();
- drm_intel_bufmgr_gem_enable_reuse(data->bufmgr);
-}
-
-static void fini_mode_set_data(struct mode_set_data *data)
-{
- int i;
-
- drm_intel_bufmgr_destroy(data->bufmgr);
-
- for (i = 0; i < data->res->count_connectors; i++) {
- drmModeFreeConnector(data->connectors[i]);
- drmModeFreePropertyBlob(data->edids[i]);
- }
- drmModeFreeResources(data->res);
-}
-
-static void get_drm_info(struct compare_data *data)
-{
- int i;
-
- data->res = drmModeGetResources(drm_fd);
- igt_assert(data->res);
-
- igt_assert(data->res->count_connectors <= MAX_CONNECTORS);
- igt_assert(data->res->count_encoders <= MAX_ENCODERS);
- igt_assert(data->res->count_crtcs <= MAX_CRTCS);
-
- for (i = 0; i < data->res->count_connectors; i++) {
- data->connectors[i] = drmModeGetConnector(drm_fd,
- data->res->connectors[i]);
- data->edids[i] = get_connector_edid(data->connectors[i], i);
- }
- for (i = 0; i < data->res->count_encoders; i++)
- data->encoders[i] = drmModeGetEncoder(drm_fd,
- data->res->encoders[i]);
- for (i = 0; i < data->res->count_crtcs; i++)
- data->crtcs[i] = drmModeGetCrtc(drm_fd, data->res->crtcs[i]);
-}
-
-static void get_registers(struct compare_registers *data)
-{
- intel_register_access_init(intel_get_pci_device(), 0);
- data->arb_mode = INREG(0x4030);
- data->tilectl = INREG(0x101000);
- data->gen6_ucgctl2 = INREG(0x9404);
- data->gen7_l3cntlreg1 = INREG(0xB0C1);
- data->transa_chicken1 = INREG(0xF0060);
- data->deier = INREG(0x4400C);
- data->gtier = INREG(0x4401C);
- data->ddi_buf_trans_a_1 = INREG(0x64E00);
- data->ddi_buf_trans_b_5 = INREG(0x64E70);
- data->ddi_buf_trans_c_10 = INREG(0x64EE0);
- data->ddi_buf_trans_d_15 = INREG(0x64F58);
- data->ddi_buf_trans_e_20 = INREG(0x64FCC);
- intel_register_access_fini();
-}
-
-static void free_drm_info(struct compare_data *data)
-{
- int i;
-
- for (i = 0; i < data->res->count_connectors; i++) {
- drmModeFreeConnector(data->connectors[i]);
- drmModeFreePropertyBlob(data->edids[i]);
- }
- for (i = 0; i < data->res->count_encoders; i++)
- drmModeFreeEncoder(data->encoders[i]);
- for (i = 0; i < data->res->count_crtcs; i++)
- drmModeFreeCrtc(data->crtcs[i]);
-
- drmModeFreeResources(data->res);
-}
-
-#define COMPARE(d1, d2, data) igt_assert(d1->data == d2->data)
-#define COMPARE_ARRAY(d1, d2, size, data) do { \
- for (i = 0; i < size; i++) \
- igt_assert(d1->data[i] == d2->data[i]); \
-} while (0)
-
-static void assert_drm_resources_equal(struct compare_data *d1,
- struct compare_data *d2)
-{
- COMPARE(d1, d2, res->count_connectors);
- COMPARE(d1, d2, res->count_encoders);
- COMPARE(d1, d2, res->count_crtcs);
- COMPARE(d1, d2, res->min_width);
- COMPARE(d1, d2, res->max_width);
- COMPARE(d1, d2, res->min_height);
- COMPARE(d1, d2, res->max_height);
-}
-
-static void assert_modes_equal(drmModeModeInfoPtr m1, drmModeModeInfoPtr m2)
-{
- COMPARE(m1, m2, clock);
- COMPARE(m1, m2, hdisplay);
- COMPARE(m1, m2, hsync_start);
- COMPARE(m1, m2, hsync_end);
- COMPARE(m1, m2, htotal);
- COMPARE(m1, m2, hskew);
- COMPARE(m1, m2, vdisplay);
- COMPARE(m1, m2, vsync_start);
- COMPARE(m1, m2, vsync_end);
- COMPARE(m1, m2, vtotal);
- COMPARE(m1, m2, vscan);
- COMPARE(m1, m2, vrefresh);
- COMPARE(m1, m2, flags);
- COMPARE(m1, m2, type);
- igt_assert(strcmp(m1->name, m2->name) == 0);
-}
-
-static void assert_drm_connectors_equal(drmModeConnectorPtr c1,
- drmModeConnectorPtr c2)
-{
- int i;
-
- COMPARE(c1, c2, connector_id);
- COMPARE(c1, c2, connector_type);
- COMPARE(c1, c2, connector_type_id);
- COMPARE(c1, c2, mmWidth);
- COMPARE(c1, c2, mmHeight);
- COMPARE(c1, c2, count_modes);
- COMPARE(c1, c2, count_props);
- COMPARE(c1, c2, count_encoders);
- COMPARE_ARRAY(c1, c2, c1->count_props, props);
- COMPARE_ARRAY(c1, c2, c1->count_encoders, encoders);
-
- for (i = 0; i < c1->count_modes; i++)
- assert_modes_equal(&c1->modes[0], &c2->modes[0]);
-}
-
-static void assert_drm_encoders_equal(drmModeEncoderPtr e1,
- drmModeEncoderPtr e2)
-{
- COMPARE(e1, e2, encoder_id);
- COMPARE(e1, e2, encoder_type);
- COMPARE(e1, e2, possible_crtcs);
- COMPARE(e1, e2, possible_clones);
-}
-
-static void assert_drm_crtcs_equal(drmModeCrtcPtr c1, drmModeCrtcPtr c2)
-{
- COMPARE(c1, c2, crtc_id);
-}
-
-static void assert_drm_edids_equal(drmModePropertyBlobPtr e1,
- drmModePropertyBlobPtr e2)
-{
- if (!e1 && !e2)
- return;
- igt_assert(e1 && e2);
-
- COMPARE(e1, e2, id);
- COMPARE(e1, e2, length);
-
- igt_assert(memcmp(e1->data, e2->data, e1->length) == 0);
-}
-
-static void compare_registers(struct compare_registers *d1,
- struct compare_registers *d2)
-{
- COMPARE(d1, d2, gen6_ucgctl2);
- COMPARE(d1, d2, gen7_l3cntlreg1);
- COMPARE(d1, d2, transa_chicken1);
- COMPARE(d1, d2, arb_mode);
- COMPARE(d1, d2, tilectl);
- COMPARE(d1, d2, arb_mode);
- COMPARE(d1, d2, tilectl);
- COMPARE(d1, d2, gtier);
- COMPARE(d1, d2, ddi_buf_trans_a_1);
- COMPARE(d1, d2, ddi_buf_trans_b_5);
- COMPARE(d1, d2, ddi_buf_trans_c_10);
- COMPARE(d1, d2, ddi_buf_trans_d_15);
- COMPARE(d1, d2, ddi_buf_trans_e_20);
-}
-
-static void assert_drm_infos_equal(struct compare_data *d1,
- struct compare_data *d2)
-{
- int i;
-
- assert_drm_resources_equal(d1, d2);
-
- for (i = 0; i < d1->res->count_connectors; i++) {
- assert_drm_connectors_equal(d1->connectors[i],
- d2->connectors[i]);
- assert_drm_edids_equal(d1->edids[i], d2->edids[i]);
- }
-
- for (i = 0; i < d1->res->count_encoders; i++)
- assert_drm_encoders_equal(d1->encoders[i], d2->encoders[i]);
-
- for (i = 0; i < d1->res->count_crtcs; i++)
- assert_drm_crtcs_equal(d1->crtcs[i], d2->crtcs[i]);
-}
-
-static void blt_color_fill(struct intel_batchbuffer *batch,
- drm_intel_bo *buf,
- const unsigned int pages)
-{
- const unsigned short height = pages/4;
- const unsigned short width = 4096;
-
- BEGIN_BATCH(5);
- OUT_BATCH(COLOR_BLT_CMD | COLOR_BLT_WRITE_ALPHA | COLOR_BLT_WRITE_RGB);
- OUT_BATCH((3 << 24) | /* 32 Bit Color */
- 0xF0 | /* Raster OP copy background register */
- 0); /* Dest pitch is 0 */
- OUT_BATCH(width << 16 | height);
- OUT_RELOC(buf, I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, 0);
- OUT_BATCH(rand()); /* random pattern */
- ADVANCE_BATCH();
-}
-
-static void test_batch(struct mode_set_data *data)
-{
- struct intel_batchbuffer *batch;
- int64_t timeout_ns = 1000 * 1000 * 1000 * 2;
- drm_intel_bo *dst;
- int i, rc;
-
- dst = drm_intel_bo_alloc(data->bufmgr, "dst", (8 << 20), 4096);
-
- batch = intel_batchbuffer_alloc(data->bufmgr,
- intel_get_drm_devid(drm_fd));
-
- for (i = 0; i < 1000; i++)
- blt_color_fill(batch, dst, ((8 << 20) >> 12));
-
- rc = drm_intel_gem_bo_wait(dst, timeout_ns);
- igt_assert(!rc);
-
- intel_batchbuffer_free(batch);
-}
-
-/* We could check the checksum too, but just the header is probably enough. */
-static bool edid_is_valid(const unsigned char *edid)
-{
- char edid_header[] = {
- 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0,
- };
-
- return (memcmp(edid, edid_header, sizeof(edid_header)) == 0);
-}
-
-static int count_drm_valid_edids(struct mode_set_data *data)
-{
- int i, ret = 0;
-
- for (i = 0; i < data->res->count_connectors; i++)
- if (data->edids[i] && edid_is_valid(data->edids[i]->data))
- ret++;
- return ret;
-}
-
-static bool i2c_edid_is_valid(int fd)
-{
- int rc;
- unsigned char edid[128] = {};
- struct i2c_msg msgs[] = {
- { /* Start at 0. */
- .addr = 0x50,
- .flags = 0,
- .len = 1,
- .buf = edid,
- }, { /* Now read the EDID. */
- .addr = 0x50,
- .flags = I2C_M_RD,
- .len = 128,
- .buf = edid,
- }
- };
- struct i2c_rdwr_ioctl_data msgset = {
- .msgs = msgs,
- .nmsgs = 2,
- };
-
- rc = ioctl(fd, I2C_RDWR, &msgset);
- return (rc >= 0) ? edid_is_valid(edid) : false;
-}
-
-static int count_i2c_valid_edids(void)
-{
- int fd, ret = 0;
- DIR *dir;
-
- struct dirent *dirent;
- char full_name[32];
-
- dir = opendir("/dev/");
- igt_assert(dir);
-
- while ((dirent = readdir(dir))) {
- if (strncmp(dirent->d_name, "i2c-", 4) == 0) {
- snprintf(full_name, 32, "/dev/%s", dirent->d_name);
- fd = open(full_name, O_RDWR);
- igt_assert(fd != -1);
- if (i2c_edid_is_valid(fd))
- ret++;
- close(fd);
- }
- }
-
- closedir(dir);
-
- return ret;
-}
-
-static bool test_i2c(struct mode_set_data *data)
-{
- int i2c_edids = count_i2c_valid_edids();
- int drm_edids = count_drm_valid_edids(data);
-
- return i2c_edids == drm_edids;
-}
-
-static void setup_environment(void)
-{
- drm_fd = drm_open_any();
- igt_assert(drm_fd >= 0);
-
- init_mode_set_data(&ms_data);
-
- /* Only Haswell supports the PC8 feature. */
- igt_require_f(IS_HASWELL(ms_data.devid),
- "PC8+ feature only supported on Haswell.\n");
-
- /* Make sure our Kernel supports MSR and the module is loaded. */
- msr_fd = open("/dev/cpu/0/msr", O_RDONLY);
- igt_assert_f(msr_fd >= 0,
- "Can't open /dev/cpu/0/msr.\n");
-
- /* Non-ULT machines don't support PC8+. */
- igt_require_f(supports_pc8_plus_residencies(),
- "Machine doesn't support PC8+ residencies.\n");
-}
-
-static void basic_subtest(void)
-{
- /* Make sure PC8+ residencies move! */
- disable_all_screens(&ms_data);
- igt_assert_f(pc8_plus_enabled(),
- "Machine is not reaching PC8+ states, please check its "
- "configuration.\n");
-
- /* Make sure PC8+ residencies stop! */
- enable_one_screen(&ms_data);
- igt_assert_f(pc8_plus_disabled(),
- "PC8+ residency didn't stop with screen enabled.\n");
-}
-
-static void modeset_subtest(enum screen_type type, int rounds,
- enum residency_wait wait)
-{
- int i;
-
- for (i = 0; i < rounds; i++) {
- disable_all_screens(&ms_data);
- if (wait == WAIT)
- igt_assert(pc8_plus_enabled());
-
- /* If we skip this line it's because the type of screen we want
- * is not connected. */
- igt_require(enable_one_screen_with_type(&ms_data, type));
- if (wait == WAIT)
- igt_assert(pc8_plus_disabled());
- }
-}
-
-static void teardown_environment(void)
-{
- fini_mode_set_data(&ms_data);
- drmClose(drm_fd);
- close(msr_fd);
-}
-
-/* Test of the DRM resources reported by the IOCTLs are still the same. This
- * ensures we still see the monitors with the same eyes. We get the EDIDs and
- * compare them, which ensures we use DP AUX or GMBUS depending on what's
- * connected. */
-static void drm_resources_equal_subtest(void)
-{
- struct compare_data pre_pc8, during_pc8, post_pc8;
-
- enable_one_screen(&ms_data);
- igt_assert(pc8_plus_disabled());
- get_drm_info(&pre_pc8);
- igt_assert(pc8_plus_disabled());
-
- disable_all_screens(&ms_data);
- igt_assert(pc8_plus_enabled());
- get_drm_info(&during_pc8);
- igt_assert(pc8_plus_enabled());
-
- enable_one_screen(&ms_data);
- igt_assert(pc8_plus_disabled());
- get_drm_info(&post_pc8);
- igt_assert(pc8_plus_disabled());
-
- assert_drm_infos_equal(&pre_pc8, &during_pc8);
- assert_drm_infos_equal(&pre_pc8, &post_pc8);
-
- free_drm_info(&pre_pc8);
- free_drm_info(&during_pc8);
- free_drm_info(&post_pc8);
-}
-
-/* Make sure interrupts are working. */
-static void batch_subtest(void)
-{
- enable_one_screen(&ms_data);
- igt_assert(pc8_plus_disabled());
-
- disable_all_screens(&ms_data);
- igt_assert(pc8_plus_enabled());
- test_batch(&ms_data);
- igt_assert(pc8_plus_enabled());
-}
-
-/* Try to use raw I2C, which also needs interrupts. */
-static void i2c_subtest(void)
-{
- int i2c_dev_files = 0;
- DIR *dev_dir;
- struct dirent *dirent;
-
- /* Make sure the /dev/i2c-* files exist. */
- dev_dir = opendir("/dev");
- igt_assert(dev_dir);
- while ((dirent = readdir(dev_dir))) {
- if (strncmp(dirent->d_name, "i2c-", 4) == 0)
- i2c_dev_files++;
- }
- closedir(dev_dir);
- igt_require(i2c_dev_files);
-
- enable_one_screen(&ms_data);
- igt_assert(pc8_plus_disabled());
-
- disable_all_screens(&ms_data);
- igt_assert(pc8_plus_enabled());
- igt_assert(test_i2c(&ms_data));
- igt_assert(pc8_plus_enabled());
-
- enable_one_screen(&ms_data);
-}
-
-/* Make us enter/leave PC8+ many times. */
-static void stress_test(void)
-{
- int i;
-
- for (i = 0; i < 100; i++) {
- disable_all_screens(&ms_data);
- igt_assert(pc8_plus_enabled());
- test_batch(&ms_data);
- igt_assert(pc8_plus_enabled());
- }
-}
-
-/* Just reading/writing registers from outside the Kernel is not really a safe
- * thing to do on Haswell, so don't do this test on the default case. */
-static void register_compare_subtest(void)
-{
- struct compare_registers pre_pc8, post_pc8;
-
- enable_one_screen(&ms_data);
- igt_assert(pc8_plus_disabled());
- get_registers(&pre_pc8);
- igt_assert(pc8_plus_disabled());
-
- disable_all_screens(&ms_data);
- igt_assert(pc8_plus_enabled());
- enable_one_screen(&ms_data);
- igt_assert(pc8_plus_disabled());
- /* Wait for the registers to be restored. */
- sleep(1);
- get_registers(&post_pc8);
- igt_assert(pc8_plus_disabled());
-
- compare_registers(&pre_pc8, &post_pc8);
-}
-
-int main(int argc, char *argv[])
-{
- bool do_register_compare = false;
-
- if (argc > 1 && strcmp(argv[1], "--do-register-compare") == 0)
- do_register_compare = true;
-
- igt_subtest_init(argc, argv);
-
- /* Skip instead of failing in case the machine is not prepared to reach
- * PC8+. We don't want bug reports from cases where the machine is just
- * not properly configured. */
- igt_fixture
- setup_environment();
-
- igt_subtest("rte")
- basic_subtest();
- igt_subtest("drm-resources-equal")
- drm_resources_equal_subtest();
- igt_subtest("modeset-lpsp")
- modeset_subtest(SCREEN_TYPE_LPSP, 1, WAIT);
- igt_subtest("modeset-non-lpsp")
- modeset_subtest(SCREEN_TYPE_NON_LPSP, 1, WAIT);
- igt_subtest("batch")
- batch_subtest();
- igt_subtest("i2c")
- i2c_subtest();
- igt_subtest("stress-test")
- stress_test();
- igt_subtest("modeset-non-lpsp-stress")
- modeset_subtest(SCREEN_TYPE_NON_LPSP, 50, WAIT);
- igt_subtest("modeset-lpsp-stress-no-wait")
- modeset_subtest(SCREEN_TYPE_LPSP, 50, DONT_WAIT);
- igt_subtest("modeset-non-lpsp-stress-no-wait")
- modeset_subtest(SCREEN_TYPE_NON_LPSP, 50, DONT_WAIT);
- igt_subtest("register-compare") {
- igt_require(do_register_compare);
- register_compare_subtest();
- }
-
- igt_fixture
- teardown_environment();
-
- igt_exit();
-}
diff --git a/tests/pm_pc8.c b/tests/pm_pc8.c
new file mode 100644
index 000000000000..e56a5f8c7a65
--- /dev/null
+++ b/tests/pm_pc8.c
@@ -0,0 +1,822 @@
+/*
+ * Copyright © 2013 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ * Paulo Zanoni <paulo.r.zanoni@intel.com>
+ *
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <string.h>
+
+#include <unistd.h>
+#include <fcntl.h>
+#include <dirent.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <linux/i2c.h>
+#include <linux/i2c-dev.h>
+
+#include "drm.h"
+#include "drmtest.h"
+#include "intel_batchbuffer.h"
+#include "intel_gpu_tools.h"
+#include "i915_drm.h"
+
+#define MSR_PC8_RES 0x630
+#define MSR_PC9_RES 0x631
+#define MSR_PC10_RES 0x632
+
+#define MAX_CONNECTORS 32
+#define MAX_ENCODERS 32
+#define MAX_CRTCS 16
+
+enum screen_type {
+ SCREEN_TYPE_LPSP,
+ SCREEN_TYPE_NON_LPSP,
+ SCREEN_TYPE_ANY,
+};
+
+enum residency_wait {
+ WAIT,
+ DONT_WAIT,
+};
+
+int drm_fd, msr_fd;
+struct mode_set_data ms_data;
+
+/* Stuff used when creating FBs and mode setting. */
+struct mode_set_data {
+ drmModeResPtr res;
+ drmModeConnectorPtr connectors[MAX_CONNECTORS];
+ drmModePropertyBlobPtr edids[MAX_CONNECTORS];
+
+ drm_intel_bufmgr *bufmgr;
+ uint32_t devid;
+};
+
+/* Stuff we query at different times so we can compare. */
+struct compare_data {
+ drmModeResPtr res;
+ drmModeEncoderPtr encoders[MAX_ENCODERS];
+ drmModeConnectorPtr connectors[MAX_CONNECTORS];
+ drmModeCrtcPtr crtcs[MAX_CRTCS];
+ drmModePropertyBlobPtr edids[MAX_CONNECTORS];
+};
+
+struct compare_registers {
+ /* We know these are lost */
+ uint32_t arb_mode;
+ uint32_t tilectl;
+
+ /* Stuff touched at init_clock_gating, so we can make sure we
+ * don't need to call it when reiniting. */
+ uint32_t gen6_ucgctl2;
+ uint32_t gen7_l3cntlreg1;
+ uint32_t transa_chicken1;
+
+ uint32_t deier;
+ uint32_t gtier;
+
+ uint32_t ddi_buf_trans_a_1;
+ uint32_t ddi_buf_trans_b_5;
+ uint32_t ddi_buf_trans_c_10;
+ uint32_t ddi_buf_trans_d_15;
+ uint32_t ddi_buf_trans_e_20;
+};
+
+/* If the read fails, then the machine doesn't support PC8+ residencies. */
+static bool supports_pc8_plus_residencies(void)
+{
+ int rc;
+ uint64_t val;
+
+ rc = pread(msr_fd, &val, sizeof(uint64_t), MSR_PC8_RES);
+ if (rc != sizeof(val))
+ return false;
+ rc = pread(msr_fd, &val, sizeof(uint64_t), MSR_PC9_RES);
+ if (rc != sizeof(val))
+ return false;
+ rc = pread(msr_fd, &val, sizeof(uint64_t), MSR_PC10_RES);
+ if (rc != sizeof(val))
+ return false;
+
+ return true;
+}
+
+static uint64_t get_residency(uint32_t type)
+{
+ int rc;
+ uint64_t ret;
+
+ rc = pread(msr_fd, &ret, sizeof(uint64_t), type);
+ igt_assert(rc == sizeof(ret));
+
+ return ret;
+}
+
+static bool pc8_plus_residency_changed(unsigned int timeout_sec)
+{
+ unsigned int i;
+ uint64_t res_pc8, res_pc9, res_pc10;
+ int to_sleep = 100 * 1000;
+
+ res_pc8 = get_residency(MSR_PC8_RES);
+ res_pc9 = get_residency(MSR_PC9_RES);
+ res_pc10 = get_residency(MSR_PC10_RES);
+
+ for (i = 0; i < timeout_sec * 1000 * 1000; i += to_sleep) {
+ if (res_pc8 != get_residency(MSR_PC8_RES) ||
+ res_pc9 != get_residency(MSR_PC9_RES) ||
+ res_pc10 != get_residency(MSR_PC10_RES)) {
+ return true;
+ }
+ usleep(to_sleep);
+ }
+
+ return false;
+}
+
+/* Checks not only if PC8+ is allowed, but also if we're reaching it.
+ * We call this when we expect this function to return quickly since PC8 is
+ * actually enabled, so the 30s timeout we use shouldn't matter. */
+static bool pc8_plus_enabled(void)
+{
+ return pc8_plus_residency_changed(30);
+}
+
+/* We call this when we expect PC8+ to be actually disabled, so we should not
+ * return until the 5s timeout expires. In other words: in the "happy case",
+ * every time we call this function the program will take 5s more to finish. */
+static bool pc8_plus_disabled(void)
+{
+ return !pc8_plus_residency_changed(5);
+}
+
+static void disable_all_screens(struct mode_set_data *data)
+{
+ int i, rc;
+
+ for (i = 0; i < data->res->count_crtcs; i++) {
+ rc = drmModeSetCrtc(drm_fd, data->res->crtcs[i], -1, 0, 0,
+ NULL, 0, NULL);
+ igt_assert(rc == 0);
+ }
+}
+
+static uint32_t create_fb(struct mode_set_data *data, int width, int height)
+{
+ struct kmstest_fb fb;
+ cairo_t *cr;
+ uint32_t buffer_id;
+
+ buffer_id = kmstest_create_fb(drm_fd, width, height, 32, 24, false,
+ &fb);
+ cr = kmstest_get_cairo_ctx(drm_fd, &fb);
+ kmstest_paint_test_pattern(cr, width, height);
+ return buffer_id;
+}
+
+static bool enable_one_screen_with_type(struct mode_set_data *data,
+ enum screen_type type)
+{
+ uint32_t crtc_id = 0, buffer_id = 0, connector_id = 0;
+ drmModeModeInfoPtr mode = NULL;
+ int i, rc;
+
+ for (i = 0; i < data->res->count_connectors; i++) {
+ drmModeConnectorPtr c = data->connectors[i];
+
+ if (type == SCREEN_TYPE_LPSP &&
+ c->connector_type != DRM_MODE_CONNECTOR_eDP)
+ continue;
+
+ if (type == SCREEN_TYPE_NON_LPSP &&
+ c->connector_type == DRM_MODE_CONNECTOR_eDP)
+ continue;
+
+ if (c->connection == DRM_MODE_CONNECTED && c->count_modes) {
+ connector_id = c->connector_id;
+ mode = &c->modes[0];
+ break;
+ }
+ }
+
+ if (connector_id == 0)
+ return false;
+
+ crtc_id = data->res->crtcs[0];
+ buffer_id = create_fb(data, mode->hdisplay, mode->vdisplay);
+
+ igt_assert(crtc_id);
+ igt_assert(buffer_id);
+ igt_assert(connector_id);
+ igt_assert(mode);
+
+ rc = drmModeSetCrtc(drm_fd, crtc_id, buffer_id, 0, 0, &connector_id,
+ 1, mode);
+ igt_assert(rc == 0);
+
+ return true;
+}
+
+static void enable_one_screen(struct mode_set_data *data)
+{
+ igt_assert(enable_one_screen_with_type(data, SCREEN_TYPE_ANY));
+}
+
+static drmModePropertyBlobPtr get_connector_edid(drmModeConnectorPtr connector,
+ int index)
+{
+ unsigned int i;
+ drmModeObjectPropertiesPtr props;
+ drmModePropertyBlobPtr ret = NULL;
+
+ props = drmModeObjectGetProperties(drm_fd, connector->connector_id,
+ DRM_MODE_OBJECT_CONNECTOR);
+
+ for (i = 0; i < props->count_props; i++) {
+ drmModePropertyPtr prop = drmModeGetProperty(drm_fd,
+ props->props[i]);
+
+ if (strcmp(prop->name, "EDID") == 0) {
+ igt_assert(prop->flags & DRM_MODE_PROP_BLOB);
+ igt_assert(prop->count_blobs == 0);
+ ret = drmModeGetPropertyBlob(drm_fd,
+ props->prop_values[i]);
+ }
+
+ drmModeFreeProperty(prop);
+ }
+
+ drmModeFreeObjectProperties(props);
+ return ret;
+}
+
+static void init_mode_set_data(struct mode_set_data *data)
+{
+ int i;
+
+ data->res = drmModeGetResources(drm_fd);
+ igt_assert(data->res);
+ igt_assert(data->res->count_connectors <= MAX_CONNECTORS);
+
+ for (i = 0; i < data->res->count_connectors; i++) {
+ data->connectors[i] = drmModeGetConnector(drm_fd,
+ data->res->connectors[i]);
+ data->edids[i] = get_connector_edid(data->connectors[i], i);
+ }
+
+ data->bufmgr = drm_intel_bufmgr_gem_init(drm_fd, 4096);
+ data->devid = intel_get_drm_devid(drm_fd);
+
+ igt_set_vt_graphics_mode();
+ drm_intel_bufmgr_gem_enable_reuse(data->bufmgr);
+}
+
+static void fini_mode_set_data(struct mode_set_data *data)
+{
+ int i;
+
+ drm_intel_bufmgr_destroy(data->bufmgr);
+
+ for (i = 0; i < data->res->count_connectors; i++) {
+ drmModeFreeConnector(data->connectors[i]);
+ drmModeFreePropertyBlob(data->edids[i]);
+ }
+ drmModeFreeResources(data->res);
+}
+
+static void get_drm_info(struct compare_data *data)
+{
+ int i;
+
+ data->res = drmModeGetResources(drm_fd);
+ igt_assert(data->res);
+
+ igt_assert(data->res->count_connectors <= MAX_CONNECTORS);
+ igt_assert(data->res->count_encoders <= MAX_ENCODERS);
+ igt_assert(data->res->count_crtcs <= MAX_CRTCS);
+
+ for (i = 0; i < data->res->count_connectors; i++) {
+ data->connectors[i] = drmModeGetConnector(drm_fd,
+ data->res->connectors[i]);
+ data->edids[i] = get_connector_edid(data->connectors[i], i);
+ }
+ for (i = 0; i < data->res->count_encoders; i++)
+ data->encoders[i] = drmModeGetEncoder(drm_fd,
+ data->res->encoders[i]);
+ for (i = 0; i < data->res->count_crtcs; i++)
+ data->crtcs[i] = drmModeGetCrtc(drm_fd, data->res->crtcs[i]);
+}
+
+static void get_registers(struct compare_registers *data)
+{
+ intel_register_access_init(intel_get_pci_device(), 0);
+ data->arb_mode = INREG(0x4030);
+ data->tilectl = INREG(0x101000);
+ data->gen6_ucgctl2 = INREG(0x9404);
+ data->gen7_l3cntlreg1 = INREG(0xB0C1);
+ data->transa_chicken1 = INREG(0xF0060);
+ data->deier = INREG(0x4400C);
+ data->gtier = INREG(0x4401C);
+ data->ddi_buf_trans_a_1 = INREG(0x64E00);
+ data->ddi_buf_trans_b_5 = INREG(0x64E70);
+ data->ddi_buf_trans_c_10 = INREG(0x64EE0);
+ data->ddi_buf_trans_d_15 = INREG(0x64F58);
+ data->ddi_buf_trans_e_20 = INREG(0x64FCC);
+ intel_register_access_fini();
+}
+
+static void free_drm_info(struct compare_data *data)
+{
+ int i;
+
+ for (i = 0; i < data->res->count_connectors; i++) {
+ drmModeFreeConnector(data->connectors[i]);
+ drmModeFreePropertyBlob(data->edids[i]);
+ }
+ for (i = 0; i < data->res->count_encoders; i++)
+ drmModeFreeEncoder(data->encoders[i]);
+ for (i = 0; i < data->res->count_crtcs; i++)
+ drmModeFreeCrtc(data->crtcs[i]);
+
+ drmModeFreeResources(data->res);
+}
+
+#define COMPARE(d1, d2, data) igt_assert(d1->data == d2->data)
+#define COMPARE_ARRAY(d1, d2, size, data) do { \
+ for (i = 0; i < size; i++) \
+ igt_assert(d1->data[i] == d2->data[i]); \
+} while (0)
+
+static void assert_drm_resources_equal(struct compare_data *d1,
+ struct compare_data *d2)
+{
+ COMPARE(d1, d2, res->count_connectors);
+ COMPARE(d1, d2, res->count_encoders);
+ COMPARE(d1, d2, res->count_crtcs);
+ COMPARE(d1, d2, res->min_width);
+ COMPARE(d1, d2, res->max_width);
+ COMPARE(d1, d2, res->min_height);
+ COMPARE(d1, d2, res->max_height);
+}
+
+static void assert_modes_equal(drmModeModeInfoPtr m1, drmModeModeInfoPtr m2)
+{
+ COMPARE(m1, m2, clock);
+ COMPARE(m1, m2, hdisplay);
+ COMPARE(m1, m2, hsync_start);
+ COMPARE(m1, m2, hsync_end);
+ COMPARE(m1, m2, htotal);
+ COMPARE(m1, m2, hskew);
+ COMPARE(m1, m2, vdisplay);
+ COMPARE(m1, m2, vsync_start);
+ COMPARE(m1, m2, vsync_end);
+ COMPARE(m1, m2, vtotal);
+ COMPARE(m1, m2, vscan);
+ COMPARE(m1, m2, vrefresh);
+ COMPARE(m1, m2, flags);
+ COMPARE(m1, m2, type);
+ igt_assert(strcmp(m1->name, m2->name) == 0);
+}
+
+static void assert_drm_connectors_equal(drmModeConnectorPtr c1,
+ drmModeConnectorPtr c2)
+{
+ int i;
+
+ COMPARE(c1, c2, connector_id);
+ COMPARE(c1, c2, connector_type);
+ COMPARE(c1, c2, connector_type_id);
+ COMPARE(c1, c2, mmWidth);
+ COMPARE(c1, c2, mmHeight);
+ COMPARE(c1, c2, count_modes);
+ COMPARE(c1, c2, count_props);
+ COMPARE(c1, c2, count_encoders);
+ COMPARE_ARRAY(c1, c2, c1->count_props, props);
+ COMPARE_ARRAY(c1, c2, c1->count_encoders, encoders);
+
+ for (i = 0; i < c1->count_modes; i++)
+ assert_modes_equal(&c1->modes[0], &c2->modes[0]);
+}
+
+static void assert_drm_encoders_equal(drmModeEncoderPtr e1,
+ drmModeEncoderPtr e2)
+{
+ COMPARE(e1, e2, encoder_id);
+ COMPARE(e1, e2, encoder_type);
+ COMPARE(e1, e2, possible_crtcs);
+ COMPARE(e1, e2, possible_clones);
+}
+
+static void assert_drm_crtcs_equal(drmModeCrtcPtr c1, drmModeCrtcPtr c2)
+{
+ COMPARE(c1, c2, crtc_id);
+}
+
+static void assert_drm_edids_equal(drmModePropertyBlobPtr e1,
+ drmModePropertyBlobPtr e2)
+{
+ if (!e1 && !e2)
+ return;
+ igt_assert(e1 && e2);
+
+ COMPARE(e1, e2, id);
+ COMPARE(e1, e2, length);
+
+ igt_assert(memcmp(e1->data, e2->data, e1->length) == 0);
+}
+
+static void compare_registers(struct compare_registers *d1,
+ struct compare_registers *d2)
+{
+ COMPARE(d1, d2, gen6_ucgctl2);
+ COMPARE(d1, d2, gen7_l3cntlreg1);
+ COMPARE(d1, d2, transa_chicken1);
+ COMPARE(d1, d2, arb_mode);
+ COMPARE(d1, d2, tilectl);
+ COMPARE(d1, d2, arb_mode);
+ COMPARE(d1, d2, tilectl);
+ COMPARE(d1, d2, gtier);
+ COMPARE(d1, d2, ddi_buf_trans_a_1);
+ COMPARE(d1, d2, ddi_buf_trans_b_5);
+ COMPARE(d1, d2, ddi_buf_trans_c_10);
+ COMPARE(d1, d2, ddi_buf_trans_d_15);
+ COMPARE(d1, d2, ddi_buf_trans_e_20);
+}
+
+static void assert_drm_infos_equal(struct compare_data *d1,
+ struct compare_data *d2)
+{
+ int i;
+
+ assert_drm_resources_equal(d1, d2);
+
+ for (i = 0; i < d1->res->count_connectors; i++) {
+ assert_drm_connectors_equal(d1->connectors[i],
+ d2->connectors[i]);
+ assert_drm_edids_equal(d1->edids[i], d2->edids[i]);
+ }
+
+ for (i = 0; i < d1->res->count_encoders; i++)
+ assert_drm_encoders_equal(d1->encoders[i], d2->encoders[i]);
+
+ for (i = 0; i < d1->res->count_crtcs; i++)
+ assert_drm_crtcs_equal(d1->crtcs[i], d2->crtcs[i]);
+}
+
+static void blt_color_fill(struct intel_batchbuffer *batch,
+ drm_intel_bo *buf,
+ const unsigned int pages)
+{
+ const unsigned short height = pages/4;
+ const unsigned short width = 4096;
+
+ BEGIN_BATCH(5);
+ OUT_BATCH(COLOR_BLT_CMD | COLOR_BLT_WRITE_ALPHA | COLOR_BLT_WRITE_RGB);
+ OUT_BATCH((3 << 24) | /* 32 Bit Color */
+ 0xF0 | /* Raster OP copy background register */
+ 0); /* Dest pitch is 0 */
+ OUT_BATCH(width << 16 | height);
+ OUT_RELOC(buf, I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, 0);
+ OUT_BATCH(rand()); /* random pattern */
+ ADVANCE_BATCH();
+}
+
+static void test_batch(struct mode_set_data *data)
+{
+ struct intel_batchbuffer *batch;
+ int64_t timeout_ns = 1000 * 1000 * 1000 * 2;
+ drm_intel_bo *dst;
+ int i, rc;
+
+ dst = drm_intel_bo_alloc(data->bufmgr, "dst", (8 << 20), 4096);
+
+ batch = intel_batchbuffer_alloc(data->bufmgr,
+ intel_get_drm_devid(drm_fd));
+
+ for (i = 0; i < 1000; i++)
+ blt_color_fill(batch, dst, ((8 << 20) >> 12));
+
+ rc = drm_intel_gem_bo_wait(dst, timeout_ns);
+ igt_assert(!rc);
+
+ intel_batchbuffer_free(batch);
+}
+
+/* We could check the checksum too, but just the header is probably enough. */
+static bool edid_is_valid(const unsigned char *edid)
+{
+ char edid_header[] = {
+ 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0,
+ };
+
+ return (memcmp(edid, edid_header, sizeof(edid_header)) == 0);
+}
+
+static int count_drm_valid_edids(struct mode_set_data *data)
+{
+ int i, ret = 0;
+
+ for (i = 0; i < data->res->count_connectors; i++)
+ if (data->edids[i] && edid_is_valid(data->edids[i]->data))
+ ret++;
+ return ret;
+}
+
+static bool i2c_edid_is_valid(int fd)
+{
+ int rc;
+ unsigned char edid[128] = {};
+ struct i2c_msg msgs[] = {
+ { /* Start at 0. */
+ .addr = 0x50,
+ .flags = 0,
+ .len = 1,
+ .buf = edid,
+ }, { /* Now read the EDID. */
+ .addr = 0x50,
+ .flags = I2C_M_RD,
+ .len = 128,
+ .buf = edid,
+ }
+ };
+ struct i2c_rdwr_ioctl_data msgset = {
+ .msgs = msgs,
+ .nmsgs = 2,
+ };
+
+ rc = ioctl(fd, I2C_RDWR, &msgset);
+ return (rc >= 0) ? edid_is_valid(edid) : false;
+}
+
+static int count_i2c_valid_edids(void)
+{
+ int fd, ret = 0;
+ DIR *dir;
+
+ struct dirent *dirent;
+ char full_name[32];
+
+ dir = opendir("/dev/");
+ igt_assert(dir);
+
+ while ((dirent = readdir(dir))) {
+ if (strncmp(dirent->d_name, "i2c-", 4) == 0) {
+ snprintf(full_name, 32, "/dev/%s", dirent->d_name);
+ fd = open(full_name, O_RDWR);
+ igt_assert(fd != -1);
+ if (i2c_edid_is_valid(fd))
+ ret++;
+ close(fd);
+ }
+ }
+
+ closedir(dir);
+
+ return ret;
+}
+
+static bool test_i2c(struct mode_set_data *data)
+{
+ int i2c_edids = count_i2c_valid_edids();
+ int drm_edids = count_drm_valid_edids(data);
+
+ return i2c_edids == drm_edids;
+}
+
+static void setup_environment(void)
+{
+ drm_fd = drm_open_any();
+ igt_assert(drm_fd >= 0);
+
+ init_mode_set_data(&ms_data);
+
+ /* Only Haswell supports the PC8 feature. */
+ igt_require_f(IS_HASWELL(ms_data.devid),
+ "PC8+ feature only supported on Haswell.\n");
+
+ /* Make sure our Kernel supports MSR and the module is loaded. */
+ msr_fd = open("/dev/cpu/0/msr", O_RDONLY);
+ igt_assert_f(msr_fd >= 0,
+ "Can't open /dev/cpu/0/msr.\n");
+
+ /* Non-ULT machines don't support PC8+. */
+ igt_require_f(supports_pc8_plus_residencies(),
+ "Machine doesn't support PC8+ residencies.\n");
+}
+
+static void basic_subtest(void)
+{
+ /* Make sure PC8+ residencies move! */
+ disable_all_screens(&ms_data);
+ igt_assert_f(pc8_plus_enabled(),
+ "Machine is not reaching PC8+ states, please check its "
+ "configuration.\n");
+
+ /* Make sure PC8+ residencies stop! */
+ enable_one_screen(&ms_data);
+ igt_assert_f(pc8_plus_disabled(),
+ "PC8+ residency didn't stop with screen enabled.\n");
+}
+
+static void modeset_subtest(enum screen_type type, int rounds,
+ enum residency_wait wait)
+{
+ int i;
+
+ for (i = 0; i < rounds; i++) {
+ disable_all_screens(&ms_data);
+ if (wait == WAIT)
+ igt_assert(pc8_plus_enabled());
+
+ /* If we skip this line it's because the type of screen we want
+ * is not connected. */
+ igt_require(enable_one_screen_with_type(&ms_data, type));
+ if (wait == WAIT)
+ igt_assert(pc8_plus_disabled());
+ }
+}
+
+static void teardown_environment(void)
+{
+ fini_mode_set_data(&ms_data);
+ drmClose(drm_fd);
+ close(msr_fd);
+}
+
+/* Test of the DRM resources reported by the IOCTLs are still the same. This
+ * ensures we still see the monitors with the same eyes. We get the EDIDs and
+ * compare them, which ensures we use DP AUX or GMBUS depending on what's
+ * connected. */
+static void drm_resources_equal_subtest(void)
+{
+ struct compare_data pre_pc8, during_pc8, post_pc8;
+
+ enable_one_screen(&ms_data);
+ igt_assert(pc8_plus_disabled());
+ get_drm_info(&pre_pc8);
+ igt_assert(pc8_plus_disabled());
+
+ disable_all_screens(&ms_data);
+ igt_assert(pc8_plus_enabled());
+ get_drm_info(&during_pc8);
+ igt_assert(pc8_plus_enabled());
+
+ enable_one_screen(&ms_data);
+ igt_assert(pc8_plus_disabled());
+ get_drm_info(&post_pc8);
+ igt_assert(pc8_plus_disabled());
+
+ assert_drm_infos_equal(&pre_pc8, &during_pc8);
+ assert_drm_infos_equal(&pre_pc8, &post_pc8);
+
+ free_drm_info(&pre_pc8);
+ free_drm_info(&during_pc8);
+ free_drm_info(&post_pc8);
+}
+
+/* Make sure interrupts are working. */
+static void batch_subtest(void)
+{
+ enable_one_screen(&ms_data);
+ igt_assert(pc8_plus_disabled());
+
+ disable_all_screens(&ms_data);
+ igt_assert(pc8_plus_enabled());
+ test_batch(&ms_data);
+ igt_assert(pc8_plus_enabled());
+}
+
+/* Try to use raw I2C, which also needs interrupts. */
+static void i2c_subtest(void)
+{
+ int i2c_dev_files = 0;
+ DIR *dev_dir;
+ struct dirent *dirent;
+
+ /* Make sure the /dev/i2c-* files exist. */
+ dev_dir = opendir("/dev");
+ igt_assert(dev_dir);
+ while ((dirent = readdir(dev_dir))) {
+ if (strncmp(dirent->d_name, "i2c-", 4) == 0)
+ i2c_dev_files++;
+ }
+ closedir(dev_dir);
+ igt_require(i2c_dev_files);
+
+ enable_one_screen(&ms_data);
+ igt_assert(pc8_plus_disabled());
+
+ disable_all_screens(&ms_data);
+ igt_assert(pc8_plus_enabled());
+ igt_assert(test_i2c(&ms_data));
+ igt_assert(pc8_plus_enabled());
+
+ enable_one_screen(&ms_data);
+}
+
+/* Make us enter/leave PC8+ many times. */
+static void stress_test(void)
+{
+ int i;
+
+ for (i = 0; i < 100; i++) {
+ disable_all_screens(&ms_data);
+ igt_assert(pc8_plus_enabled());
+ test_batch(&ms_data);
+ igt_assert(pc8_plus_enabled());
+ }
+}
+
+/* Just reading/writing registers from outside the Kernel is not really a safe
+ * thing to do on Haswell, so don't do this test on the default case. */
+static void register_compare_subtest(void)
+{
+ struct compare_registers pre_pc8, post_pc8;
+
+ enable_one_screen(&ms_data);
+ igt_assert(pc8_plus_disabled());
+ get_registers(&pre_pc8);
+ igt_assert(pc8_plus_disabled());
+
+ disable_all_screens(&ms_data);
+ igt_assert(pc8_plus_enabled());
+ enable_one_screen(&ms_data);
+ igt_assert(pc8_plus_disabled());
+ /* Wait for the registers to be restored. */
+ sleep(1);
+ get_registers(&post_pc8);
+ igt_assert(pc8_plus_disabled());
+
+ compare_registers(&pre_pc8, &post_pc8);
+}
+
+int main(int argc, char *argv[])
+{
+ bool do_register_compare = false;
+
+ if (argc > 1 && strcmp(argv[1], "--do-register-compare") == 0)
+ do_register_compare = true;
+
+ igt_subtest_init(argc, argv);
+
+ /* Skip instead of failing in case the machine is not prepared to reach
+ * PC8+. We don't want bug reports from cases where the machine is just
+ * not properly configured. */
+ igt_fixture
+ setup_environment();
+
+ igt_subtest("rte")
+ basic_subtest();
+ igt_subtest("drm-resources-equal")
+ drm_resources_equal_subtest();
+ igt_subtest("modeset-lpsp")
+ modeset_subtest(SCREEN_TYPE_LPSP, 1, WAIT);
+ igt_subtest("modeset-non-lpsp")
+ modeset_subtest(SCREEN_TYPE_NON_LPSP, 1, WAIT);
+ igt_subtest("batch")
+ batch_subtest();
+ igt_subtest("i2c")
+ i2c_subtest();
+ igt_subtest("stress-test")
+ stress_test();
+ igt_subtest("modeset-non-lpsp-stress")
+ modeset_subtest(SCREEN_TYPE_NON_LPSP, 50, WAIT);
+ igt_subtest("modeset-lpsp-stress-no-wait")
+ modeset_subtest(SCREEN_TYPE_LPSP, 50, DONT_WAIT);
+ igt_subtest("modeset-non-lpsp-stress-no-wait")
+ modeset_subtest(SCREEN_TYPE_NON_LPSP, 50, DONT_WAIT);
+ igt_subtest("register-compare") {
+ igt_require(do_register_compare);
+ register_compare_subtest();
+ }
+
+ igt_fixture
+ teardown_environment();
+
+ igt_exit();
+}
diff --git a/tests/pm_rc6_residency.c b/tests/pm_rc6_residency.c
new file mode 100644
index 000000000000..3b873a08286d
--- /dev/null
+++ b/tests/pm_rc6_residency.c
@@ -0,0 +1,121 @@
+/*
+ * Copyright © 2012 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ * Ben Widawsky <ben@bwidawsk.net>
+ *
+ */
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include "drmtest.h"
+
+#define SLEEP_DURATION 3000 // in milliseconds
+#define RC6_FUDGE 900 // in milliseconds
+
+static unsigned int readit(const char *path)
+{
+ unsigned int ret;
+ int scanned;
+
+ FILE *file;
+ file = fopen(path, "r");
+ if (file == NULL) {
+ fprintf(stderr, "Couldn't open %s (%d)\n", path, errno);
+ abort();
+ }
+ scanned = fscanf(file, "%u", &ret);
+ igt_assert(scanned == 1);
+
+ fclose(file);
+
+ return ret;
+}
+
+int main(int argc, char *argv[])
+{
+ const int device = drm_get_card();
+ char *path, *pathp, *pathpp;
+ int fd, ret;
+ unsigned int value1, value1p, value1pp, value2, value2p, value2pp;
+ FILE *file;
+ int diff;
+
+ igt_skip_on_simulation();
+
+ /* Use drm_open_any to verify device existence */
+ fd = drm_open_any();
+ close(fd);
+
+ ret = asprintf(&path, "/sys/class/drm/card%d/power/rc6_enable", device);
+ igt_assert(ret != -1);
+
+ /* For some reason my ivb isn't idle even after syncing up with the gpu.
+ * Let's add a sleept just to make it happy. */
+ sleep(5);
+
+ file = fopen(path, "r");
+ igt_require(file);
+
+ /* claim success if no rc6 enabled. */
+ if (readit(path) == 0)
+ igt_success();
+
+ ret = asprintf(&path, "/sys/class/drm/card%d/power/rc6_residency_ms", device);
+ igt_assert(ret != -1);
+ ret = asprintf(&pathp, "/sys/class/drm/card%d/power/rc6p_residency_ms", device);
+ igt_assert(ret != -1);
+ ret = asprintf(&pathpp, "/sys/class/drm/card%d/power/rc6pp_residency_ms", device);
+ igt_assert(ret != -1);
+
+ value1 = readit(path);
+ value1p = readit(pathp);
+ value1pp = readit(pathpp);
+ sleep(SLEEP_DURATION / 1000);
+ value2 = readit(path);
+ value2p = readit(pathp);
+ value2pp = readit(pathpp);
+
+ free(pathpp);
+ free(pathp);
+ free(path);
+
+ diff = (value2pp - value1pp) +
+ (value2p - value1p) +
+ (value2 - value1);
+
+ if (diff > (SLEEP_DURATION + RC6_FUDGE)) {
+ fprintf(stderr, "Diff was too high. That is unpossible\n");
+ igt_fail(1);
+ }
+ if (diff < (SLEEP_DURATION - RC6_FUDGE)) {
+ fprintf(stderr, "GPU was not in RC6 long enough. Check that "
+ "the GPU is as idle as possible (ie. no X, "
+ "running and running no other tests)\n");
+ igt_fail(1);
+ }
+
+ igt_success();
+}
diff --git a/tests/pm_rps.c b/tests/pm_rps.c
new file mode 100644
index 000000000000..e663a3cf841c
--- /dev/null
+++ b/tests/pm_rps.c
@@ -0,0 +1,194 @@
+/*
+ * Copyright © 2012 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ * Ben Widawsky <ben@bwidawsk.net>
+ *
+ */
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include "drmtest.h"
+
+static bool verbose = false;
+static int origmin, origmax;
+
+#define restore_assert(COND) do { \
+ if (!(COND)) { \
+ writeval(stuff[MIN].filp, origmin); \
+ writeval(stuff[MAX].filp, origmax); \
+ igt_assert(0); \
+ } \
+} while (0);
+
+static const char sysfs_base_path[] = "/sys/class/drm/card%d/gt_%s_freq_mhz";
+enum {
+ CUR,
+ MIN,
+ MAX,
+ RP0,
+ RP1,
+ RPn
+};
+
+struct junk {
+ const char *name;
+ const char *mode;
+ FILE *filp;
+} stuff[] = {
+ { "cur", "r", NULL }, { "min", "rb+", NULL }, { "max", "rb+", NULL }, { "RP0", "r", NULL }, { "RP1", "r", NULL }, { "RPn", "r", NULL }, { NULL, NULL, NULL }
+};
+
+static int readval(FILE *filp)
+{
+ int val;
+ int scanned;
+
+ fflush(filp);
+ rewind(filp);
+ scanned = fscanf(filp, "%d", &val);
+ igt_assert(scanned == 1);
+
+ return val;
+}
+
+static int do_writeval(FILE *filp, int val, int lerrno)
+{
+ /* Must write twice to sysfs since the first one simply calculates the size and won't return the error */
+ int ret;
+ rewind(filp);
+ ret = fprintf(filp, "%d", val);
+ rewind(filp);
+ ret = fprintf(filp, "%d", val);
+ if (ret && lerrno)
+ igt_assert(errno = lerrno);
+ fflush(filp);
+ return ret;
+}
+#define writeval(filp, val) do_writeval(filp, val, 0)
+
+#define fcur (readval(stuff[CUR].filp))
+#define fmin (readval(stuff[MIN].filp))
+#define fmax (readval(stuff[MAX].filp))
+#define frp0 (readval(stuff[RP0].filp))
+#define frp1 (readval(stuff[RP1].filp))
+#define frpn (readval(stuff[RPn].filp))
+
+static void setfreq(int val)
+{
+ writeval(stuff[MIN].filp, val);
+ writeval(stuff[MAX].filp, val);
+}
+
+static void checkit(void)
+{
+ restore_assert(fmin <= fmax);
+ restore_assert(fcur <= fmax);
+ restore_assert(fmin <= fcur);
+ restore_assert(frpn <= fmin);
+ restore_assert(fmax <= frp0);
+ restore_assert(frp1 <= frp0);
+ restore_assert(frpn <= frp1);
+ restore_assert(frp0 != 0);
+ restore_assert(frp1 != 0);
+}
+
+static void dumpit(void)
+{
+ struct junk *junk = stuff;
+ do {
+ printf("gt frequency %s (MHz): %d\n", junk->name, readval(junk->filp));
+ junk++;
+ } while(junk->name != NULL);
+
+ printf("\n");
+}
+
+
+int main(int argc, char *argv[])
+{
+ const int device = drm_get_card();
+ struct junk *junk = stuff;
+ int fd, ret;
+
+ igt_skip_on_simulation();
+
+ if (argc > 1)
+ verbose++;
+
+ /* Use drm_open_any to verify device existence */
+ fd = drm_open_any();
+ close(fd);
+
+ do {
+ int val = -1;
+ char *path;
+ ret = asprintf(&path, sysfs_base_path, device, junk->name);
+ igt_assert(ret != -1);
+ junk->filp = fopen(path, junk->mode);
+ igt_require(junk->filp);
+
+ val = readval(junk->filp);
+ igt_assert(val >= 0);
+ junk++;
+ } while(junk->name != NULL);
+
+ origmin = fmin;
+ origmax = fmax;
+
+ if (verbose)
+ printf("Original min = %d\nOriginal max = %d\n", origmin, origmax);
+
+ if (verbose)
+ dumpit();
+
+ checkit();
+ setfreq(fmin);
+ if (verbose)
+ dumpit();
+ restore_assert(fcur == fmin);
+ setfreq(fmax);
+ if (verbose)
+ dumpit();
+ restore_assert(fcur == fmax);
+ checkit();
+
+ /* And some errors */
+ writeval(stuff[MIN].filp, frpn - 1);
+ writeval(stuff[MAX].filp, frp0 + 1000);
+ checkit();
+
+ writeval(stuff[MIN].filp, fmax + 1000);
+ writeval(stuff[MAX].filp, fmin - 1);
+ checkit();
+
+ do_writeval(stuff[MIN].filp, 0x11111110, EINVAL);
+ do_writeval(stuff[MAX].filp, 0, EINVAL);
+
+ writeval(stuff[MIN].filp, origmin);
+ writeval(stuff[MAX].filp, origmax);
+
+ igt_success();
+}
diff --git a/tests/sysfs_rc6_residency.c b/tests/sysfs_rc6_residency.c
deleted file mode 100644
index 3b873a08286d..000000000000
--- a/tests/sysfs_rc6_residency.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright © 2012 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * Authors:
- * Ben Widawsky <ben@bwidawsk.net>
- *
- */
-
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "drmtest.h"
-
-#define SLEEP_DURATION 3000 // in milliseconds
-#define RC6_FUDGE 900 // in milliseconds
-
-static unsigned int readit(const char *path)
-{
- unsigned int ret;
- int scanned;
-
- FILE *file;
- file = fopen(path, "r");
- if (file == NULL) {
- fprintf(stderr, "Couldn't open %s (%d)\n", path, errno);
- abort();
- }
- scanned = fscanf(file, "%u", &ret);
- igt_assert(scanned == 1);
-
- fclose(file);
-
- return ret;
-}
-
-int main(int argc, char *argv[])
-{
- const int device = drm_get_card();
- char *path, *pathp, *pathpp;
- int fd, ret;
- unsigned int value1, value1p, value1pp, value2, value2p, value2pp;
- FILE *file;
- int diff;
-
- igt_skip_on_simulation();
-
- /* Use drm_open_any to verify device existence */
- fd = drm_open_any();
- close(fd);
-
- ret = asprintf(&path, "/sys/class/drm/card%d/power/rc6_enable", device);
- igt_assert(ret != -1);
-
- /* For some reason my ivb isn't idle even after syncing up with the gpu.
- * Let's add a sleept just to make it happy. */
- sleep(5);
-
- file = fopen(path, "r");
- igt_require(file);
-
- /* claim success if no rc6 enabled. */
- if (readit(path) == 0)
- igt_success();
-
- ret = asprintf(&path, "/sys/class/drm/card%d/power/rc6_residency_ms", device);
- igt_assert(ret != -1);
- ret = asprintf(&pathp, "/sys/class/drm/card%d/power/rc6p_residency_ms", device);
- igt_assert(ret != -1);
- ret = asprintf(&pathpp, "/sys/class/drm/card%d/power/rc6pp_residency_ms", device);
- igt_assert(ret != -1);
-
- value1 = readit(path);
- value1p = readit(pathp);
- value1pp = readit(pathpp);
- sleep(SLEEP_DURATION / 1000);
- value2 = readit(path);
- value2p = readit(pathp);
- value2pp = readit(pathpp);
-
- free(pathpp);
- free(pathp);
- free(path);
-
- diff = (value2pp - value1pp) +
- (value2p - value1p) +
- (value2 - value1);
-
- if (diff > (SLEEP_DURATION + RC6_FUDGE)) {
- fprintf(stderr, "Diff was too high. That is unpossible\n");
- igt_fail(1);
- }
- if (diff < (SLEEP_DURATION - RC6_FUDGE)) {
- fprintf(stderr, "GPU was not in RC6 long enough. Check that "
- "the GPU is as idle as possible (ie. no X, "
- "running and running no other tests)\n");
- igt_fail(1);
- }
-
- igt_success();
-}
diff --git a/tests/sysfs_rps.c b/tests/sysfs_rps.c
deleted file mode 100644
index e663a3cf841c..000000000000
--- a/tests/sysfs_rps.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright © 2012 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * Authors:
- * Ben Widawsky <ben@bwidawsk.net>
- *
- */
-
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "drmtest.h"
-
-static bool verbose = false;
-static int origmin, origmax;
-
-#define restore_assert(COND) do { \
- if (!(COND)) { \
- writeval(stuff[MIN].filp, origmin); \
- writeval(stuff[MAX].filp, origmax); \
- igt_assert(0); \
- } \
-} while (0);
-
-static const char sysfs_base_path[] = "/sys/class/drm/card%d/gt_%s_freq_mhz";
-enum {
- CUR,
- MIN,
- MAX,
- RP0,
- RP1,
- RPn
-};
-
-struct junk {
- const char *name;
- const char *mode;
- FILE *filp;
-} stuff[] = {
- { "cur", "r", NULL }, { "min", "rb+", NULL }, { "max", "rb+", NULL }, { "RP0", "r", NULL }, { "RP1", "r", NULL }, { "RPn", "r", NULL }, { NULL, NULL, NULL }
-};
-
-static int readval(FILE *filp)
-{
- int val;
- int scanned;
-
- fflush(filp);
- rewind(filp);
- scanned = fscanf(filp, "%d", &val);
- igt_assert(scanned == 1);
-
- return val;
-}
-
-static int do_writeval(FILE *filp, int val, int lerrno)
-{
- /* Must write twice to sysfs since the first one simply calculates the size and won't return the error */
- int ret;
- rewind(filp);
- ret = fprintf(filp, "%d", val);
- rewind(filp);
- ret = fprintf(filp, "%d", val);
- if (ret && lerrno)
- igt_assert(errno = lerrno);
- fflush(filp);
- return ret;
-}
-#define writeval(filp, val) do_writeval(filp, val, 0)
-
-#define fcur (readval(stuff[CUR].filp))
-#define fmin (readval(stuff[MIN].filp))
-#define fmax (readval(stuff[MAX].filp))
-#define frp0 (readval(stuff[RP0].filp))
-#define frp1 (readval(stuff[RP1].filp))
-#define frpn (readval(stuff[RPn].filp))
-
-static void setfreq(int val)
-{
- writeval(stuff[MIN].filp, val);
- writeval(stuff[MAX].filp, val);
-}
-
-static void checkit(void)
-{
- restore_assert(fmin <= fmax);
- restore_assert(fcur <= fmax);
- restore_assert(fmin <= fcur);
- restore_assert(frpn <= fmin);
- restore_assert(fmax <= frp0);
- restore_assert(frp1 <= frp0);
- restore_assert(frpn <= frp1);
- restore_assert(frp0 != 0);
- restore_assert(frp1 != 0);
-}
-
-static void dumpit(void)
-{
- struct junk *junk = stuff;
- do {
- printf("gt frequency %s (MHz): %d\n", junk->name, readval(junk->filp));
- junk++;
- } while(junk->name != NULL);
-
- printf("\n");
-}
-
-
-int main(int argc, char *argv[])
-{
- const int device = drm_get_card();
- struct junk *junk = stuff;
- int fd, ret;
-
- igt_skip_on_simulation();
-
- if (argc > 1)
- verbose++;
-
- /* Use drm_open_any to verify device existence */
- fd = drm_open_any();
- close(fd);
-
- do {
- int val = -1;
- char *path;
- ret = asprintf(&path, sysfs_base_path, device, junk->name);
- igt_assert(ret != -1);
- junk->filp = fopen(path, junk->mode);
- igt_require(junk->filp);
-
- val = readval(junk->filp);
- igt_assert(val >= 0);
- junk++;
- } while(junk->name != NULL);
-
- origmin = fmin;
- origmax = fmax;
-
- if (verbose)
- printf("Original min = %d\nOriginal max = %d\n", origmin, origmax);
-
- if (verbose)
- dumpit();
-
- checkit();
- setfreq(fmin);
- if (verbose)
- dumpit();
- restore_assert(fcur == fmin);
- setfreq(fmax);
- if (verbose)
- dumpit();
- restore_assert(fcur == fmax);
- checkit();
-
- /* And some errors */
- writeval(stuff[MIN].filp, frpn - 1);
- writeval(stuff[MAX].filp, frp0 + 1000);
- checkit();
-
- writeval(stuff[MIN].filp, fmax + 1000);
- writeval(stuff[MAX].filp, fmin - 1);
- checkit();
-
- do_writeval(stuff[MIN].filp, 0x11111110, EINVAL);
- do_writeval(stuff[MAX].filp, 0, EINVAL);
-
- writeval(stuff[MIN].filp, origmin);
- writeval(stuff[MAX].filp, origmax);
-
- igt_success();
-}
--
1.8.4.rc3
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 4/5] tests: Use kms_ prefix a bit more
2013-11-02 12:04 [PATCH 0/5] igt test naming conventions Daniel Vetter
` (2 preceding siblings ...)
2013-11-02 12:04 ` [PATCH 3/5] tests: establish pm_ prefix Daniel Vetter
@ 2013-11-02 12:04 ` Daniel Vetter
2013-11-02 12:04 ` [PATCH 5/5] tests: establish core_ prefix Daniel Vetter
2013-11-04 18:53 ` [PATCH 0/5] igt test naming conventions Daniel Vetter
5 siblings, 0 replies; 7+ messages in thread
From: Daniel Vetter @ 2013-11-02 12:04 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter
I was a bit on the fence about the basic pipe CRC test since that
doesn't really test kms, but debug infrastructure in debugfs.
Otoh running this one for a full kms testrun is always good, to make
sure that all the other (real) CRC based tests work sanely.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
tests/.gitignore | 8 +-
tests/Makefile.am | 4 +-
tests/debugfs_pipe_crc.c | 262 --------------------------------------------
tests/kms_pipe_crc_basic.c | 262 ++++++++++++++++++++++++++++++++++++++++++++
tests/kms_sysfs_edid_timing | 25 +++++
tests/sysfs_edid_timing | 25 -----
6 files changed, 293 insertions(+), 293 deletions(-)
delete mode 100644 tests/debugfs_pipe_crc.c
create mode 100644 tests/kms_pipe_crc_basic.c
create mode 100755 tests/kms_sysfs_edid_timing
delete mode 100755 tests/sysfs_edid_timing
diff --git a/tests/.gitignore b/tests/.gitignore
index e99b2da04c20..09ea074f4d2c 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1,6 +1,8 @@
# Please keep sorted alphabetically
+core_getclient
+core_getstats
+core_getversion
ddi_compute_wrpll
-debugfs_pipe_crc
drv_suspend
drm_get_client_auth
drm_vma_limiter
@@ -93,9 +95,6 @@ gen3_render_linear_blits
gen3_render_mixed_blits
gen3_render_tiledx_blits
gen3_render_tiledy_blits
-getclient
-getstats
-getversion
igt_fork_helper
igt_list_only
igt_no_exit
@@ -104,6 +103,7 @@ igt_no_subtest
kms_addfb
kms_cursor_crc
kms_flip
+kms_pipe_crc_basic
kms_render
kms_setmode
pm_pc8
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4e2813fffc4c..807a67c09a45 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -17,7 +17,6 @@ NOUVEAU_TESTS_M = \
endif
TESTS_progs_M = \
- debugfs_pipe_crc \
drv_suspend \
gem_basic \
gem_caching \
@@ -54,6 +53,7 @@ TESTS_progs_M = \
kms_addfb \
kms_cursor_crc \
kms_flip \
+ kms_pipe_crc_basic \
kms_render \
kms_setmode \
$(NOUVEAU_TESTS_M) \
@@ -135,7 +135,7 @@ TESTS_scripts = \
drv_hangman \
drv_missed_irq_hang \
drv_module_reload \
- sysfs_edid_timing \
+ kms_sysfs_edid_timing \
sysfs_l3_parity \
test_rte_check \
tools_test \
diff --git a/tests/debugfs_pipe_crc.c b/tests/debugfs_pipe_crc.c
deleted file mode 100644
index 2545233187cc..000000000000
--- a/tests/debugfs_pipe_crc.c
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * Copyright © 2013 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- */
-
-#include <errno.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <glib.h>
-
-#include "drmtest.h"
-#include "igt_debugfs.h"
-
-typedef struct {
- struct kmstest_connector_config config;
- struct kmstest_fb fb;
- bool valid;
-} connector_t;
-
-typedef struct {
- int drm_fd;
- igt_debugfs_t debugfs;
- drmModeRes *resources;
- int n_connectors;
- connector_t *connectors;
- FILE *ctl;
-} data_t;
-
-static void test_bad_command(data_t *data, const char *cmd)
-{
- size_t written;
-
- written = fwrite(cmd, 1, strlen(cmd), data->ctl);
- fflush(data->ctl);
- igt_assert_cmpint(written, ==, (strlen(cmd)));
- igt_assert(ferror(data->ctl));
- igt_assert_cmpint(errno, ==, EINVAL);
-}
-
-static void connector_init(data_t *data, connector_t *connector,
- uint32_t id, uint32_t crtc_id_mask)
-{
- int ret;
-
- ret = kmstest_get_connector_config(data->drm_fd, id, crtc_id_mask,
- &connector->config);
- if (ret == 0)
- connector->valid = true;
- else
- connector->valid = false;
-
-}
-
-static void connector_fini(connector_t *connector)
-{
- kmstest_free_connector_config(&connector->config);
-}
-
-static bool
-connector_set_mode(data_t *data, connector_t *connector, drmModeModeInfo *mode)
-{
- struct kmstest_connector_config *config = &connector->config;
- unsigned int fb_id;
- cairo_t *cr;
- int ret;
-
- fb_id = kmstest_create_fb(data->drm_fd,
- mode->hdisplay, mode->vdisplay,
- 32 /* bpp */, 24 /* depth */,
- false /* tiling */,
- &connector->fb);
- igt_assert(fb_id);
-
- cr = kmstest_get_cairo_ctx(data->drm_fd, &connector->fb);
- kmstest_paint_color(cr, 0, 0, mode->hdisplay, mode->vdisplay,
- 0.0, 1.0, 0.0);
- igt_assert(cairo_status(cr) == 0);
-
-#if 0
- fprintf(stdout, "Using pipe %c, %dx%d\n", pipe_name(config->pipe),
- mode->hdisplay, mode->vdisplay);
-#endif
-
- ret = drmModeSetCrtc(data->drm_fd,
- config->crtc->crtc_id,
- connector->fb.fb_id,
- 0, 0, /* x, y */
- &config->connector->connector_id,
- 1,
- mode);
- igt_assert(ret == 0);
-
- return 0;
-}
-
-static void display_init(data_t *data)
-{
- data->resources = drmModeGetResources(data->drm_fd);
- igt_assert(data->resources);
-
- data->n_connectors = data->resources->count_connectors;
- data->connectors = calloc(data->n_connectors, sizeof(connector_t));
- igt_assert(data->connectors);
-}
-
-static void connectors_init(data_t *data, uint32_t crtc_id_mask)
-{
- int i;
-
- for (i = 0; i < data->n_connectors; i++) {
- uint32_t id = data->resources->connectors[i];
-
- connector_init(data, &data->connectors[i], id, crtc_id_mask);
- }
-}
-
-static void display_fini(data_t *data)
-{
- int i;
-
- for (i = 0; i < data->n_connectors; i++)
- connector_fini(&data->connectors[i]);
- free(data->connectors);
-
- drmModeFreeResources(data->resources);
-}
-
-#define TEST_SEQUENCE (1<<0)
-
-static void test_read_crc(data_t *data, int pipe, unsigned flags)
-{
- connector_t *connector;
- igt_pipe_crc_t *pipe_crc;
- igt_crc_t *crcs = NULL;
- int valid_connectors = 0, i;
-
- connectors_init(data, 1 << pipe);
-
- for (i = 0; i < data->n_connectors; i++) {
- connector = &data->connectors[i];
-
- if (!connector->valid)
- continue;
-
- fprintf(stdout, "%s: Testing connector %u\n",
- igt_subtest_name(), connector->config.connector->connector_id);
-
- connector_set_mode(data, connector, &connector->config.default_mode);
-
- pipe_crc = igt_pipe_crc_new(&data->debugfs, data->drm_fd,
- connector->config.pipe,
- INTEL_PIPE_CRC_SOURCE_AUTO);
-
- if (!pipe_crc)
- continue;
- valid_connectors++;
-
- igt_assert(igt_pipe_crc_start(pipe_crc));
-
- /* wait for 3 vblanks and the corresponding 3 CRCs */
- igt_pipe_crc_get_crcs(pipe_crc, 3, &crcs);
-
- igt_pipe_crc_stop(pipe_crc);
-
- /* ensure the CRCs are not all 0s */
- igt_assert(!igt_crc_is_null(&crcs[0]));
- igt_assert(!igt_crc_is_null(&crcs[1]));
- igt_assert(!igt_crc_is_null(&crcs[2]));
-
- /* and ensure that they'are all equal, we haven't changed the fb */
- igt_assert(igt_crc_equal(&crcs[0], &crcs[1]));
- igt_assert(igt_crc_equal(&crcs[1], &crcs[2]));
-
- if (flags & TEST_SEQUENCE) {
- igt_assert(crcs[0].frame + 1 == crcs[1].frame);
- igt_assert(crcs[1].frame + 1 == crcs[2].frame);
- }
-
- free(crcs);
- igt_pipe_crc_free(pipe_crc);
- kmstest_remove_fb(data->drm_fd, &connector->fb);
- }
-
- igt_require_f(valid_connectors, "No connector found for pipe %i\n", pipe);
-
-}
-
-igt_main
-{
- data_t data = {0, };
-
- igt_skip_on_simulation();
-
- igt_fixture {
- size_t written;
- int ret;
- const char *cmd = "pipe A none";
-
- data.drm_fd = drm_open_any();
- igt_require(data.drm_fd >= 0);
-
- igt_set_vt_graphics_mode();
-
- display_init(&data);
-
- igt_debugfs_init(&data.debugfs);
- data.ctl = igt_debugfs_fopen(&data.debugfs,
- "i915_display_crc_ctl", "r+");
- igt_require_f(data.ctl,
- "No display_crc_ctl found, kernel too old\n");
- written = fwrite(cmd, 1, strlen(cmd), data.ctl);
- ret = fflush(data.ctl);
- igt_require_f((written == strlen(cmd) && ret == 0) || errno != ENODEV,
- "CRCs not supported on this platform\n");
- }
-
- igt_subtest("bad-pipe")
- test_bad_command(&data, "pipe D none");
-
- igt_subtest("bad-source")
- test_bad_command(&data, "pipe A foo");
-
- igt_subtest("bad-nb-words-1")
- test_bad_command(&data, "pipe foo");
-
- igt_subtest("bad-nb-words-3")
- test_bad_command(&data, "pipe A none option");
-
- for (int i = 0; i < 3; i++) {
- igt_subtest_f("read-crc-pipe-%c", 'A'+i)
- test_read_crc(&data, i, 0);
-
- igt_subtest_f("read-crc-pipe-%c-frame-sequence", 'A'+i)
- test_read_crc(&data, i, TEST_SEQUENCE);
- }
-
- igt_fixture {
- display_fini(&data);
- fclose(data.ctl);
- }
-}
diff --git a/tests/kms_pipe_crc_basic.c b/tests/kms_pipe_crc_basic.c
new file mode 100644
index 000000000000..2545233187cc
--- /dev/null
+++ b/tests/kms_pipe_crc_basic.c
@@ -0,0 +1,262 @@
+/*
+ * Copyright © 2013 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ */
+
+#include <errno.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <glib.h>
+
+#include "drmtest.h"
+#include "igt_debugfs.h"
+
+typedef struct {
+ struct kmstest_connector_config config;
+ struct kmstest_fb fb;
+ bool valid;
+} connector_t;
+
+typedef struct {
+ int drm_fd;
+ igt_debugfs_t debugfs;
+ drmModeRes *resources;
+ int n_connectors;
+ connector_t *connectors;
+ FILE *ctl;
+} data_t;
+
+static void test_bad_command(data_t *data, const char *cmd)
+{
+ size_t written;
+
+ written = fwrite(cmd, 1, strlen(cmd), data->ctl);
+ fflush(data->ctl);
+ igt_assert_cmpint(written, ==, (strlen(cmd)));
+ igt_assert(ferror(data->ctl));
+ igt_assert_cmpint(errno, ==, EINVAL);
+}
+
+static void connector_init(data_t *data, connector_t *connector,
+ uint32_t id, uint32_t crtc_id_mask)
+{
+ int ret;
+
+ ret = kmstest_get_connector_config(data->drm_fd, id, crtc_id_mask,
+ &connector->config);
+ if (ret == 0)
+ connector->valid = true;
+ else
+ connector->valid = false;
+
+}
+
+static void connector_fini(connector_t *connector)
+{
+ kmstest_free_connector_config(&connector->config);
+}
+
+static bool
+connector_set_mode(data_t *data, connector_t *connector, drmModeModeInfo *mode)
+{
+ struct kmstest_connector_config *config = &connector->config;
+ unsigned int fb_id;
+ cairo_t *cr;
+ int ret;
+
+ fb_id = kmstest_create_fb(data->drm_fd,
+ mode->hdisplay, mode->vdisplay,
+ 32 /* bpp */, 24 /* depth */,
+ false /* tiling */,
+ &connector->fb);
+ igt_assert(fb_id);
+
+ cr = kmstest_get_cairo_ctx(data->drm_fd, &connector->fb);
+ kmstest_paint_color(cr, 0, 0, mode->hdisplay, mode->vdisplay,
+ 0.0, 1.0, 0.0);
+ igt_assert(cairo_status(cr) == 0);
+
+#if 0
+ fprintf(stdout, "Using pipe %c, %dx%d\n", pipe_name(config->pipe),
+ mode->hdisplay, mode->vdisplay);
+#endif
+
+ ret = drmModeSetCrtc(data->drm_fd,
+ config->crtc->crtc_id,
+ connector->fb.fb_id,
+ 0, 0, /* x, y */
+ &config->connector->connector_id,
+ 1,
+ mode);
+ igt_assert(ret == 0);
+
+ return 0;
+}
+
+static void display_init(data_t *data)
+{
+ data->resources = drmModeGetResources(data->drm_fd);
+ igt_assert(data->resources);
+
+ data->n_connectors = data->resources->count_connectors;
+ data->connectors = calloc(data->n_connectors, sizeof(connector_t));
+ igt_assert(data->connectors);
+}
+
+static void connectors_init(data_t *data, uint32_t crtc_id_mask)
+{
+ int i;
+
+ for (i = 0; i < data->n_connectors; i++) {
+ uint32_t id = data->resources->connectors[i];
+
+ connector_init(data, &data->connectors[i], id, crtc_id_mask);
+ }
+}
+
+static void display_fini(data_t *data)
+{
+ int i;
+
+ for (i = 0; i < data->n_connectors; i++)
+ connector_fini(&data->connectors[i]);
+ free(data->connectors);
+
+ drmModeFreeResources(data->resources);
+}
+
+#define TEST_SEQUENCE (1<<0)
+
+static void test_read_crc(data_t *data, int pipe, unsigned flags)
+{
+ connector_t *connector;
+ igt_pipe_crc_t *pipe_crc;
+ igt_crc_t *crcs = NULL;
+ int valid_connectors = 0, i;
+
+ connectors_init(data, 1 << pipe);
+
+ for (i = 0; i < data->n_connectors; i++) {
+ connector = &data->connectors[i];
+
+ if (!connector->valid)
+ continue;
+
+ fprintf(stdout, "%s: Testing connector %u\n",
+ igt_subtest_name(), connector->config.connector->connector_id);
+
+ connector_set_mode(data, connector, &connector->config.default_mode);
+
+ pipe_crc = igt_pipe_crc_new(&data->debugfs, data->drm_fd,
+ connector->config.pipe,
+ INTEL_PIPE_CRC_SOURCE_AUTO);
+
+ if (!pipe_crc)
+ continue;
+ valid_connectors++;
+
+ igt_assert(igt_pipe_crc_start(pipe_crc));
+
+ /* wait for 3 vblanks and the corresponding 3 CRCs */
+ igt_pipe_crc_get_crcs(pipe_crc, 3, &crcs);
+
+ igt_pipe_crc_stop(pipe_crc);
+
+ /* ensure the CRCs are not all 0s */
+ igt_assert(!igt_crc_is_null(&crcs[0]));
+ igt_assert(!igt_crc_is_null(&crcs[1]));
+ igt_assert(!igt_crc_is_null(&crcs[2]));
+
+ /* and ensure that they'are all equal, we haven't changed the fb */
+ igt_assert(igt_crc_equal(&crcs[0], &crcs[1]));
+ igt_assert(igt_crc_equal(&crcs[1], &crcs[2]));
+
+ if (flags & TEST_SEQUENCE) {
+ igt_assert(crcs[0].frame + 1 == crcs[1].frame);
+ igt_assert(crcs[1].frame + 1 == crcs[2].frame);
+ }
+
+ free(crcs);
+ igt_pipe_crc_free(pipe_crc);
+ kmstest_remove_fb(data->drm_fd, &connector->fb);
+ }
+
+ igt_require_f(valid_connectors, "No connector found for pipe %i\n", pipe);
+
+}
+
+igt_main
+{
+ data_t data = {0, };
+
+ igt_skip_on_simulation();
+
+ igt_fixture {
+ size_t written;
+ int ret;
+ const char *cmd = "pipe A none";
+
+ data.drm_fd = drm_open_any();
+ igt_require(data.drm_fd >= 0);
+
+ igt_set_vt_graphics_mode();
+
+ display_init(&data);
+
+ igt_debugfs_init(&data.debugfs);
+ data.ctl = igt_debugfs_fopen(&data.debugfs,
+ "i915_display_crc_ctl", "r+");
+ igt_require_f(data.ctl,
+ "No display_crc_ctl found, kernel too old\n");
+ written = fwrite(cmd, 1, strlen(cmd), data.ctl);
+ ret = fflush(data.ctl);
+ igt_require_f((written == strlen(cmd) && ret == 0) || errno != ENODEV,
+ "CRCs not supported on this platform\n");
+ }
+
+ igt_subtest("bad-pipe")
+ test_bad_command(&data, "pipe D none");
+
+ igt_subtest("bad-source")
+ test_bad_command(&data, "pipe A foo");
+
+ igt_subtest("bad-nb-words-1")
+ test_bad_command(&data, "pipe foo");
+
+ igt_subtest("bad-nb-words-3")
+ test_bad_command(&data, "pipe A none option");
+
+ for (int i = 0; i < 3; i++) {
+ igt_subtest_f("read-crc-pipe-%c", 'A'+i)
+ test_read_crc(&data, i, 0);
+
+ igt_subtest_f("read-crc-pipe-%c-frame-sequence", 'A'+i)
+ test_read_crc(&data, i, TEST_SEQUENCE);
+ }
+
+ igt_fixture {
+ display_fini(&data);
+ fclose(data.ctl);
+ }
+}
diff --git a/tests/kms_sysfs_edid_timing b/tests/kms_sysfs_edid_timing
new file mode 100755
index 000000000000..ec704f6725b7
--- /dev/null
+++ b/tests/kms_sysfs_edid_timing
@@ -0,0 +1,25 @@
+#!/bin/bash
+#
+# This check the time we take to read the content of all the possible connectors.
+# Without the edid -ENXIO patch (http://permalink.gmane.org/gmane.comp.video.dri.devel/62083),
+# we sometimes take a *really* long time. So let's just check for some reasonable timing here
+#
+
+DRM_LIB_ALLOW_NO_MASTER=1
+
+SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
+. $SOURCE_DIR/drm_lib.sh
+
+TIME1=$(date +%s%N)
+cat $(find /sys/devices/|grep drm | grep /status) > /dev/null
+TIME2=$(date +%s%N)
+
+# time in ms
+RES=$(((TIME2 - TIME1) / 1000000))
+
+if [ $RES -gt 600 ]; then
+ echo "Talking to outputs took ${RES}ms, something is wrong"
+ exit 1
+fi
+
+exit 0
diff --git a/tests/sysfs_edid_timing b/tests/sysfs_edid_timing
deleted file mode 100755
index ec704f6725b7..000000000000
--- a/tests/sysfs_edid_timing
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-#
-# This check the time we take to read the content of all the possible connectors.
-# Without the edid -ENXIO patch (http://permalink.gmane.org/gmane.comp.video.dri.devel/62083),
-# we sometimes take a *really* long time. So let's just check for some reasonable timing here
-#
-
-DRM_LIB_ALLOW_NO_MASTER=1
-
-SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
-. $SOURCE_DIR/drm_lib.sh
-
-TIME1=$(date +%s%N)
-cat $(find /sys/devices/|grep drm | grep /status) > /dev/null
-TIME2=$(date +%s%N)
-
-# time in ms
-RES=$(((TIME2 - TIME1) / 1000000))
-
-if [ $RES -gt 600 ]; then
- echo "Talking to outputs took ${RES}ms, something is wrong"
- exit 1
-fi
-
-exit 0
--
1.8.4.rc3
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 5/5] tests: establish core_ prefix
2013-11-02 12:04 [PATCH 0/5] igt test naming conventions Daniel Vetter
` (3 preceding siblings ...)
2013-11-02 12:04 ` [PATCH 4/5] tests: Use kms_ prefix a bit more Daniel Vetter
@ 2013-11-02 12:04 ` Daniel Vetter
2013-11-04 18:53 ` [PATCH 0/5] igt test naming conventions Daniel Vetter
5 siblings, 0 replies; 7+ messages in thread
From: Daniel Vetter @ 2013-11-02 12:04 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
tests/Makefile.am | 6 ++---
tests/NAMING-CONVENTION | 2 ++
tests/core_getclient.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++
tests/core_getstats.c | 50 ++++++++++++++++++++++++++++++++++++++++
tests/core_getversion.c | 49 +++++++++++++++++++++++++++++++++++++++
tests/getclient.c | 61 -------------------------------------------------
tests/getstats.c | 50 ----------------------------------------
tests/getversion.c | 49 ---------------------------------------
8 files changed, 165 insertions(+), 163 deletions(-)
create mode 100644 tests/core_getclient.c
create mode 100644 tests/core_getstats.c
create mode 100644 tests/core_getversion.c
delete mode 100644 tests/getclient.c
delete mode 100644 tests/getstats.c
delete mode 100644 tests/getversion.c
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 807a67c09a45..a9bd8b2a3d90 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -63,6 +63,9 @@ TESTS_progs_M = \
$(NULL)
TESTS_progs = \
+ core_getclient \
+ core_getstats \
+ core_getversion \
drm_get_client_auth \
drm_vma_limiter \
drm_vma_limiter_cached \
@@ -116,9 +119,6 @@ TESTS_progs = \
gen3_render_mixed_blits \
gen3_render_tiledx_blits \
gen3_render_tiledy_blits \
- getclient \
- getstats \
- getversion \
prime_udl \
pm_rc6_residency \
pm_rps \
diff --git a/tests/NAMING-CONVENTION b/tests/NAMING-CONVENTION
index f57033c0a6cc..f08e2828022a 100644
--- a/tests/NAMING-CONVENTION
+++ b/tests/NAMING-CONVENTION
@@ -7,6 +7,8 @@ naming scheme for tests and subtests.
Test Prefixes
-------------
+core_: Test for core drm ioctls and behaviour.
+
kms_: Used for modesetting tests.
drm_: Tests for libdrm behaviour, currently just testing the buffer cache
diff --git a/tests/core_getclient.c b/tests/core_getclient.c
new file mode 100644
index 000000000000..dcb7b326820d
--- /dev/null
+++ b/tests/core_getclient.c
@@ -0,0 +1,61 @@
+/*
+ * Copyright © 2007 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ * Eric Anholt <eric@anholt.net>
+ *
+ */
+
+#include <limits.h>
+#include <sys/ioctl.h>
+#include "drmtest.h"
+
+/**
+ * Checks DRM_IOCTL_GET_CLIENT.
+ */
+int main(int argc, char **argv)
+{
+ int fd, ret;
+ drm_client_t client;
+
+ fd = drm_open_any();
+
+ /* Look for client index 0. This should exist whether we're operating
+ * on an otherwise unused drm device, or the X Server is running on
+ * the device.
+ */
+ client.idx = 0;
+ ret = ioctl(fd, DRM_IOCTL_GET_CLIENT, &client);
+ igt_assert(ret == 0);
+
+ /* Look for some absurd client index and make sure it's invalid.
+ * The DRM drivers currently always return data, so the user has
+ * no real way to detect when the list has terminated. That's bad,
+ * and this test is XFAIL as a result.
+ */
+ client.idx = 0x7fffffff;
+ ret = ioctl(fd, DRM_IOCTL_GET_CLIENT, &client);
+ igt_assert(ret == -1 && errno == EINVAL);
+
+ close(fd);
+ return 0;
+}
diff --git a/tests/core_getstats.c b/tests/core_getstats.c
new file mode 100644
index 000000000000..7975257d74da
--- /dev/null
+++ b/tests/core_getstats.c
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2007 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ * Eric Anholt <eric@anholt.net>
+ *
+ */
+
+#include <limits.h>
+#include <sys/ioctl.h>
+#include "drmtest.h"
+
+/**
+ * Checks DRM_IOCTL_GET_STATS.
+ *
+ * I don't care too much about the actual contents, just that the kernel
+ * doesn't crash.
+ */
+int main(int argc, char **argv)
+{
+ int fd, ret;
+ drm_stats_t stats;
+
+ fd = drm_open_any();
+
+ ret = ioctl(fd, DRM_IOCTL_GET_STATS, &stats);
+ igt_assert(ret == 0);
+
+ close(fd);
+ return 0;
+}
diff --git a/tests/core_getversion.c b/tests/core_getversion.c
new file mode 100644
index 000000000000..d6da2ad6e8a8
--- /dev/null
+++ b/tests/core_getversion.c
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2007 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ * Eric Anholt <eric@anholt.net>
+ *
+ */
+
+#include <string.h>
+#include <sys/ioctl.h>
+#include "drmtest.h"
+
+/**
+ * Checks DRM_IOCTL_GET_VERSION and libdrm's drmGetVersion() interface to it.
+ */
+int main(int argc, char **argv)
+{
+ int fd;
+ drmVersionPtr v;
+
+ fd = drm_open_any();
+ v = drmGetVersion(fd);
+ igt_assert(strlen(v->name) != 0);
+ igt_assert(strlen(v->date) != 0);
+ igt_assert(strlen(v->desc) != 0);
+ igt_assert(v->version_major >= 1);
+ drmFree(v);
+ close(fd);
+ return 0;
+}
diff --git a/tests/getclient.c b/tests/getclient.c
deleted file mode 100644
index dcb7b326820d..000000000000
--- a/tests/getclient.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright © 2007 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * Authors:
- * Eric Anholt <eric@anholt.net>
- *
- */
-
-#include <limits.h>
-#include <sys/ioctl.h>
-#include "drmtest.h"
-
-/**
- * Checks DRM_IOCTL_GET_CLIENT.
- */
-int main(int argc, char **argv)
-{
- int fd, ret;
- drm_client_t client;
-
- fd = drm_open_any();
-
- /* Look for client index 0. This should exist whether we're operating
- * on an otherwise unused drm device, or the X Server is running on
- * the device.
- */
- client.idx = 0;
- ret = ioctl(fd, DRM_IOCTL_GET_CLIENT, &client);
- igt_assert(ret == 0);
-
- /* Look for some absurd client index and make sure it's invalid.
- * The DRM drivers currently always return data, so the user has
- * no real way to detect when the list has terminated. That's bad,
- * and this test is XFAIL as a result.
- */
- client.idx = 0x7fffffff;
- ret = ioctl(fd, DRM_IOCTL_GET_CLIENT, &client);
- igt_assert(ret == -1 && errno == EINVAL);
-
- close(fd);
- return 0;
-}
diff --git a/tests/getstats.c b/tests/getstats.c
deleted file mode 100644
index 7975257d74da..000000000000
--- a/tests/getstats.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright © 2007 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * Authors:
- * Eric Anholt <eric@anholt.net>
- *
- */
-
-#include <limits.h>
-#include <sys/ioctl.h>
-#include "drmtest.h"
-
-/**
- * Checks DRM_IOCTL_GET_STATS.
- *
- * I don't care too much about the actual contents, just that the kernel
- * doesn't crash.
- */
-int main(int argc, char **argv)
-{
- int fd, ret;
- drm_stats_t stats;
-
- fd = drm_open_any();
-
- ret = ioctl(fd, DRM_IOCTL_GET_STATS, &stats);
- igt_assert(ret == 0);
-
- close(fd);
- return 0;
-}
diff --git a/tests/getversion.c b/tests/getversion.c
deleted file mode 100644
index d6da2ad6e8a8..000000000000
--- a/tests/getversion.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright © 2007 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * Authors:
- * Eric Anholt <eric@anholt.net>
- *
- */
-
-#include <string.h>
-#include <sys/ioctl.h>
-#include "drmtest.h"
-
-/**
- * Checks DRM_IOCTL_GET_VERSION and libdrm's drmGetVersion() interface to it.
- */
-int main(int argc, char **argv)
-{
- int fd;
- drmVersionPtr v;
-
- fd = drm_open_any();
- v = drmGetVersion(fd);
- igt_assert(strlen(v->name) != 0);
- igt_assert(strlen(v->date) != 0);
- igt_assert(strlen(v->desc) != 0);
- igt_assert(v->version_major >= 1);
- drmFree(v);
- close(fd);
- return 0;
-}
--
1.8.4.rc3
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 0/5] igt test naming conventions
2013-11-02 12:04 [PATCH 0/5] igt test naming conventions Daniel Vetter
` (4 preceding siblings ...)
2013-11-02 12:04 ` [PATCH 5/5] tests: establish core_ prefix Daniel Vetter
@ 2013-11-04 18:53 ` Daniel Vetter
5 siblings, 0 replies; 7+ messages in thread
From: Daniel Vetter @ 2013-11-04 18:53 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter
On Sat, Nov 02, 2013 at 01:04:31PM +0100, Daniel Vetter wrote:
> Hi all,
>
> Spurred by the ongoing discussions about improving our tests I've started to
> document some of the naming patterns a bit. I've also added a few new ones and
> renamed a bunch of tests.
>
> The idea is that developers can use this patterns to construct add-hoc test
> groups with piglit's -t/-x options. I hope this here is a good start, but we
> certainly need to refine the patterns and test names over time.
>
> To ensure that we have sufficient coherency I propose the following rules:
> - If you add a large pile of new tests please document any new tests patterns in
> tests/NAMING-CONVENTIONS.
> - Any patches that are relevant for the test naming conventions must be posted
> to intel-gfx to keep everyone in the loop.
>
> Comments and ideas both on the patches and process highly welcome.
Ok I've pushed this after a bit of irc chatting. Please have a look at the
naming convention when writing new tests (or subtests). And if you see
some room to clarify things, patches (to intel-gfx) highly welcome.
-Daniel
>
> Cheeers, Daniel
>
> Daniel Vetter (5):
> tests: Start to document naming conventions
> tests: estbalish drv_ prefix
> tests: establish pm_ prefix
> tests: Use kms_ prefix a bit more
> tests: establish core_ prefix
>
> README | 3 +
> tests/.gitignore | 16 +-
> tests/Makefile.am | 26 +-
> tests/NAMING-CONVENTION | 63 ++++
> tests/ZZ_hangman | 70 ----
> tests/ZZ_missed_irq | 72 ----
> tests/core_getclient.c | 61 ++++
> tests/core_getstats.c | 50 +++
> tests/core_getversion.c | 49 +++
> tests/debugfs_pipe_crc.c | 262 --------------
> tests/debugfs_reader | 9 -
> tests/drv_debugfs_reader | 9 +
> tests/drv_hangman | 70 ++++
> tests/drv_missed_irq_hang | 72 ++++
> tests/drv_module_reload | 50 +++
> tests/drv_suspend.c | 171 +++++++++
> tests/gem_suspend.c | 171 ---------
> tests/getclient.c | 61 ----
> tests/getstats.c | 50 ---
> tests/getversion.c | 49 ---
> tests/kms_pipe_crc_basic.c | 262 ++++++++++++++
> tests/kms_sysfs_edid_timing | 25 ++
> tests/module_reload | 50 ---
> tests/pc8.c | 822 --------------------------------------------
> tests/pm_pc8.c | 822 ++++++++++++++++++++++++++++++++++++++++++++
> tests/pm_rc6_residency.c | 121 +++++++
> tests/pm_rps.c | 194 +++++++++++
> tests/sysfs_edid_timing | 25 --
> tests/sysfs_rc6_residency.c | 121 -------
> tests/sysfs_rps.c | 194 -----------
> 30 files changed, 2043 insertions(+), 1977 deletions(-)
> create mode 100644 tests/NAMING-CONVENTION
> delete mode 100755 tests/ZZ_hangman
> delete mode 100755 tests/ZZ_missed_irq
> create mode 100644 tests/core_getclient.c
> create mode 100644 tests/core_getstats.c
> create mode 100644 tests/core_getversion.c
> delete mode 100644 tests/debugfs_pipe_crc.c
> delete mode 100755 tests/debugfs_reader
> create mode 100755 tests/drv_debugfs_reader
> create mode 100755 tests/drv_hangman
> create mode 100755 tests/drv_missed_irq_hang
> create mode 100755 tests/drv_module_reload
> create mode 100644 tests/drv_suspend.c
> delete mode 100644 tests/gem_suspend.c
> delete mode 100644 tests/getclient.c
> delete mode 100644 tests/getstats.c
> delete mode 100644 tests/getversion.c
> create mode 100644 tests/kms_pipe_crc_basic.c
> create mode 100755 tests/kms_sysfs_edid_timing
> delete mode 100755 tests/module_reload
> delete mode 100644 tests/pc8.c
> create mode 100644 tests/pm_pc8.c
> create mode 100644 tests/pm_rc6_residency.c
> create mode 100644 tests/pm_rps.c
> delete mode 100755 tests/sysfs_edid_timing
> delete mode 100644 tests/sysfs_rc6_residency.c
> delete mode 100644 tests/sysfs_rps.c
>
> --
> 1.8.4.rc3
>
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-11-04 18:52 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-02 12:04 [PATCH 0/5] igt test naming conventions Daniel Vetter
2013-11-02 12:04 ` [PATCH 1/5] tests: Start to document " Daniel Vetter
2013-11-02 12:04 ` [PATCH 2/5] tests: estbalish drv_ prefix Daniel Vetter
2013-11-02 12:04 ` [PATCH 3/5] tests: establish pm_ prefix Daniel Vetter
2013-11-02 12:04 ` [PATCH 4/5] tests: Use kms_ prefix a bit more Daniel Vetter
2013-11-02 12:04 ` [PATCH 5/5] tests: establish core_ prefix Daniel Vetter
2013-11-04 18:53 ` [PATCH 0/5] igt test naming conventions Daniel Vetter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox