pm_rps: Use igt exit handler for restore

Signed-off-by: Jeff McGee <jeff.mcgee@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Jeff McGee 2014-01-10 15:12:33 -06:00 committed by Daniel Vetter
parent d0b5fd2bff
commit 2a7dbe5f01

View File

@ -36,14 +36,6 @@
static bool verbose = false; static bool verbose = false;
static int origmin, origmax; 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"; static const char sysfs_base_path[] = "/sys/class/drm/card%d/gt_%s_freq_mhz";
enum { enum {
CUR, CUR,
@ -112,15 +104,15 @@ static void setfreq(int val)
static void checkit(void) static void checkit(void)
{ {
restore_assert(fmin <= fmax); igt_assert(fmin <= fmax);
restore_assert(fcur <= fmax); igt_assert(fcur <= fmax);
restore_assert(fmin <= fcur); igt_assert(fmin <= fcur);
restore_assert(frpn <= fmin); igt_assert(frpn <= fmin);
restore_assert(fmax <= frp0); igt_assert(fmax <= frp0);
restore_assert(frp1 <= frp0); igt_assert(frp1 <= frp0);
restore_assert(frpn <= frp1); igt_assert(frpn <= frp1);
restore_assert(frp0 != 0); igt_assert(frp0 != 0);
restore_assert(frp1 != 0); igt_assert(frp1 != 0);
} }
static void dumpit(void) static void dumpit(void)
@ -134,6 +126,16 @@ static void dumpit(void)
printf("\n"); printf("\n");
} }
static void pm_rps_exit_handler(int sig)
{
if (origmin > fmax) {
writeval(stuff[MAX].filp, origmax);
writeval(stuff[MIN].filp, origmin);
} else {
writeval(stuff[MIN].filp, origmin);
writeval(stuff[MAX].filp, origmax);
}
}
igt_simple_main igt_simple_main
{ {
@ -164,6 +166,8 @@ igt_simple_main
origmin = fmin; origmin = fmin;
origmax = fmax; origmax = fmax;
igt_install_exit_handler(pm_rps_exit_handler);
if (verbose) if (verbose)
printf("Original min = %d\nOriginal max = %d\n", origmin, origmax); printf("Original min = %d\nOriginal max = %d\n", origmin, origmax);
@ -174,11 +178,11 @@ igt_simple_main
setfreq(origmin); setfreq(origmin);
if (verbose) if (verbose)
dumpit(); dumpit();
restore_assert(fcur == fmin); igt_assert(fcur == fmin);
setfreq(origmax); setfreq(origmax);
if (verbose) if (verbose)
dumpit(); dumpit();
restore_assert(fcur == fmax); igt_assert(fcur == fmax);
checkit(); checkit();
/* And some errors */ /* And some errors */