[igt-dev] [PATCH i-g-t 01/10] lib/psr: Add a macro with the maximum lenght of i915_edp_psr_status and use it

José Roberto de Souza
2019-01-12T01:46:36Z

So every function reading i915_edp_psr_status can allocate a buffer
long enough.

Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
---
lib/igt_psr.c | 2 +-
lib/igt_psr.h | 2 ++
tests/kms_fbcon_fbt.c | 6 +++---
tests/kms_frontbuffer_tracking.c | 2 +-
tests/kms_psr.c | 2 +-
5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/igt_psr.c b/lib/igt_psr.c
index 0ddfb64f..c105bb6e 100644
--- a/lib/igt_psr.c
+++ b/lib/igt_psr.c
@@ -28,7 +28,7 @@
static bool psr_active(int debugfs_fd, bool check_active)
{
bool active;
- char buf[512];
+ char buf[PSR_STATUS_MAX_LEN];

igt_debugfs_simple_read(debugfs_fd, "i915_edp_psr_status", buf,
sizeof(buf));
diff --git a/lib/igt_psr.h b/lib/igt_psr.h
index b9693822..96f7bedf 100644
--- a/lib/igt_psr.h
+++ b/lib/igt_psr.h
@@ -28,6 +28,8 @@
#include "igt_core.h"
#include "igt_aux.h"

+#define PSR_STATUS_MAX_LEN 512
+
bool psr_wait_entry(int debugfs_fd);
bool psr_wait_exit(int debugfs_fd);
bool psr_enable(int debugfs_fd);
diff --git a/tests/kms_fbcon_fbt.c b/tests/kms_fbcon_fbt.c
index 24d3ad90..0ad53266 100644
--- a/tests/kms_fbcon_fbt.c
+++ b/tests/kms_fbcon_fbt.c
@@ -170,7 +170,7 @@ static void set_mode_for_one_screen(struct drm_info *drm, struct igt_fb *fb,

static bool psr_supported_on_chipset(int debugfs_fd)
{
- char buf[256];
+ char buf[PSR_STATUS_MAX_LEN];
int ret;

ret = igt_debugfs_simple_read(debugfs_fd, "i915_edp_psr_status",
@@ -188,7 +188,7 @@ static bool connector_can_psr(drmModeConnectorPtr connector)

static void psr_print_status(int debugfs_fd)
{
- static char buf[256];
+ static char buf[PSR_STATUS_MAX_LEN];

igt_debugfs_simple_read(debugfs_fd, "i915_edp_psr_status", buf,
sizeof(buf));
@@ -197,7 +197,7 @@ static void psr_print_status(int debugfs_fd)

static bool psr_is_enabled(int debugfs_fd)
{
- char buf[256];
+ char buf[PSR_STATUS_MAX_LEN];

igt_debugfs_simple_read(debugfs_fd, "i915_edp_psr_status", buf,
sizeof(buf));
diff --git a/tests/kms_frontbuffer_tracking.c b/tests/kms_frontbuffer_tracking.c
index 5ab28319..c366fecf 100644
--- a/tests/kms_frontbuffer_tracking.c
+++ b/tests/kms_frontbuffer_tracking.c
@@ -1419,7 +1419,7 @@ static void teardown_fbc(void)

static bool psr_sink_has_support(void)
{
- char buf[256];
+ char buf[PSR_STATUS_MAX_LEN];

debugfs_read("i915_edp_psr_status", buf);
if (*buf == '\0') /* !HAS_PSR -> -ENODEV*/
diff --git a/tests/kms_psr.c b/tests/kms_psr.c
index d00e552f..20b69892 100644
--- a/tests/kms_psr.c
+++ b/tests/kms_psr.c
@@ -191,7 +191,7 @@ static void fill_render(data_t *data, uint32_t handle, unsigned char color)

static bool sink_support(data_t *data)
{
- char buf[512];
+ char buf[PSR_STATUS_MAX_LEN];

igt_debugfs_simple_read(data->debugfs_fd, "i915_edp_psr_status",
buf, sizeof(buf));
--
2.20.1