From: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
To: igt-dev@lists.freedesktop.org, swati2.sharma@intel.com
Cc: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
Subject: [i-g-t V3 2/4] lib/drrs: Add support to force drrs to default on exit
Date: Mon, 18 Nov 2024 15:29:46 +0530 [thread overview]
Message-ID: <20241118095948.2017893-3-bhanuprakash.modem@intel.com> (raw)
In-Reply-To: <20241118095948.2017893-1-bhanuprakash.modem@intel.com>
Use existing exit handler helpers to reset the drrs status
to default on exit.
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
---
lib/i915/intel_drrs.c | 41 ++++++++++++++++++++++-------------------
1 file changed, 22 insertions(+), 19 deletions(-)
diff --git a/lib/i915/intel_drrs.c b/lib/i915/intel_drrs.c
index ac8dd5e61..0d1f9cbad 100644
--- a/lib/i915/intel_drrs.c
+++ b/lib/i915/intel_drrs.c
@@ -56,26 +56,18 @@ bool intel_output_has_drrs(int device, igt_output_t *output)
return strstr(buf, "seamless");
}
-static void drrs_set(int device, enum pipe pipe, unsigned int val)
+static void reset_crtc_drrs_at_exit(int sig)
{
- char buf[2];
- int dir, ret;
-
- igt_debug("Manually %sabling DRRS. %u\n", val ? "en" : "dis", val);
- snprintf(buf, sizeof(buf), "%d", val);
+ igt_reset_crtcs();
+}
- dir = igt_debugfs_pipe_dir(device, pipe, O_DIRECTORY);
- igt_require_fd(dir);
- ret = igt_sysfs_write(dir, "i915_drrs_ctl", buf, sizeof(buf) - 1);
- close(dir);
+static bool drrs_set(int device, enum pipe pipe, const char *val)
+{
+ igt_debug("Manually %sabling DRRS.\n", !strcmp(val, "1") ? "en" : "dis");
- /*
- * drrs_enable() is called on DRRS capable platform only,
- * whereas drrs_disable() is called on all platforms.
- * So handle the failure of debugfs_write only for drrs_enable().
- */
- if (val)
- igt_assert_f(ret == (sizeof(buf) - 1), "debugfs_write failed");
+ return igt_set_crtc_attrs(device, pipe,
+ "i915_drrs_ctl",
+ val, "0");
}
/**
@@ -90,7 +82,17 @@ static void drrs_set(int device, enum pipe pipe, unsigned int val)
*/
void intel_drrs_enable(int device, enum pipe pipe)
{
- drrs_set(device, pipe, 1);
+ bool ret = drrs_set(device, pipe, "1");
+
+ /*
+ * drrs_enable() is called on DRRS capable platform only,
+ * whereas drrs_disable() is called on all platforms.
+ * So handle the failure of debugfs_write only for drrs_enable().
+ */
+ igt_assert_f(ret == 1, "debugfs_write failed");
+
+ dump_crtc_attrs();
+ igt_install_exit_handler(reset_crtc_drrs_at_exit);
}
/**
@@ -105,7 +107,8 @@ void intel_drrs_enable(int device, enum pipe pipe)
*/
void intel_drrs_disable(int device, enum pipe pipe)
{
- drrs_set(device, pipe, 0);
+ drrs_set(device, pipe, "0");
+ dump_crtc_attrs();
}
/**
--
2.43.0
next prev parent reply other threads:[~2024-11-18 10:10 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-18 9:59 [i-g-t V3 0/4] Force connector/crtc attrs to default Bhanuprakash Modem
2024-11-18 9:59 ` [i-g-t V3 1/4] lib/igt_kms: Add infra to handle crtc arbitrary attributes Bhanuprakash Modem
2024-11-18 9:59 ` Bhanuprakash Modem [this message]
2024-11-18 9:59 ` [i-g-t V3 3/4] lib/dsc: Reset DSC bpc to default on exit Bhanuprakash Modem
2024-11-18 9:59 ` [i-g-t V3 4/4] lib/igt_kms: Reset spurious hpd " Bhanuprakash Modem
2024-11-18 23:15 ` ✗ Fi.CI.BAT: failure for Force connector/crtc attrs to default (rev4) Patchwork
2024-11-18 23:15 ` ✓ CI.xeBAT: success " Patchwork
2024-11-19 9:42 ` ✗ CI.xeFULL: failure " Patchwork
2024-11-19 21:07 ` ✓ CI.xeBAT: success for Force connector/crtc attrs to default (rev5) Patchwork
2024-11-19 21:26 ` ✗ GitLab.Pipeline: warning " Patchwork
2024-11-19 21:39 ` ✓ Fi.CI.BAT: success " Patchwork
2024-11-20 9:04 ` ✗ CI.xeFULL: failure " Patchwork
2024-11-21 18:57 ` ✗ i915.CI.Full: " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241118095948.2017893-3-bhanuprakash.modem@intel.com \
--to=bhanuprakash.modem@intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=swati2.sharma@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox