* [igt-dev] [PATCH v3 1/2] drm-uapi/drm_mode: sync with latest uAPI changes for checksum_region
@ 2023-07-05 15:26 Alan Liu
2023-07-05 15:26 ` [igt-dev] [PATCH v3 2/2] tests/amdgpu/amd_checksum_region: Add test " Alan Liu
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Alan Liu @ 2023-07-05 15:26 UTC (permalink / raw)
To: igt-dev; +Cc: Alan Liu, Lili.Gong
Add struct drm_checksum_region and struct drm_checksum_crc as the
userspace data for using checksum_region feature.
Signed-off-by: Alan Liu <HaoPing.Liu@amd.com>
---
include/drm-uapi/drm_mode.h | 42 +++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/include/drm-uapi/drm_mode.h b/include/drm-uapi/drm_mode.h
index e4a2570a6..dec073921 100644
--- a/include/drm-uapi/drm_mode.h
+++ b/include/drm-uapi/drm_mode.h
@@ -1209,6 +1209,48 @@ struct drm_mode_rect {
__s32 y2;
};
+/**
+ * struct drm_checksum_region - The enablement and region of checksum_region
+ * @x_start: Horizontal starting coordinate of the region.
+ * @y_start: Vertical starting coordinate of the region.
+ * @x_end: Horizontal ending coordinate of the region.
+ * @y_end: Vertical ending coordinate of the region.
+ * @checksum_region_enable: To enable or disable checksum_region.
+ *
+ * Userspace uses this structure to configure the region and enablement for
+ * checksum_region. Userspace should not submit a region out of the displayable
+ * region because there is nothing to display and need protection.
+ */
+struct drm_checksum_region {
+ __u32 x_start;
+ __u32 y_start;
+ __u32 x_end;
+ __u32 y_end;
+ __u8 checksum_region_enable;
+ __u8 pad[7];
+};
+
+/**
+ * struct drm_checksum_crc - The CRC value of the corresponding checksum region.
+ * @crc_r: CRC value of red color.
+ * @crc_g: CRC value of green color.
+ * @crc_b: CRC value of blue color.
+ * @frame_count: a referenced frame count to indicate which frame the CRC values
+ * are generated at.
+ *
+ * Userspace uses this structure to retrieve the CRC values of the current
+ * checksum region. @frame_count will be reset once a new region is updated or
+ * it reaches a maximum value. Currently these CRC values are designed to
+ * be validated with pre-saved CRC values, so userspace doesn't need to concern
+ * about the algorithm used to compute the CRC.
+ */
+struct drm_checksum_crc {
+ __u32 crc_r;
+ __u32 crc_g;
+ __u32 crc_b;
+ __u32 frame_count;
+};
+
#if defined(__cplusplus)
}
#endif
--
2.34.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [igt-dev] [PATCH v3 2/2] tests/amdgpu/amd_checksum_region: Add test for checksum_region
2023-07-05 15:26 [igt-dev] [PATCH v3 1/2] drm-uapi/drm_mode: sync with latest uAPI changes for checksum_region Alan Liu
@ 2023-07-05 15:26 ` Alan Liu
2023-07-11 18:01 ` Kamil Konieczny
2023-07-05 16:42 ` [igt-dev] ✗ Fi.CI.BAT: failure for series starting with [v3,1/2] drm-uapi/drm_mode: sync with latest uAPI changes " Patchwork
2023-07-11 17:59 ` [igt-dev] [PATCH v3 1/2] " Kamil Konieczny
2 siblings, 1 reply; 7+ messages in thread
From: Alan Liu @ 2023-07-05 15:26 UTC (permalink / raw)
To: igt-dev; +Cc: Alan Liu, Lili.Gong
Introduce IGT of checksum_region. Checksum_region allows userspace to
set a region on display and get the CRC data accordingly via CRTC
properties: CHECKSUM_REGION and CEHCKSUM_CRC.
This IGT validates checksum region feature by testing if we can set
we can set regions successfully and check if the corresponding CRC
values are as expected.
v2
- Add test description
- Separate uAPI change to another patch
- Declare with SPDX MIT licence
- Include igt headers after system headers
- Add this igt into meson.build in alphabetical order
v3
- Replace wait_vblank() by igt_wait_for_vblank_count()
- Improve the format of print information
Signed-off-by: Alan Liu <HaoPing.Liu@amd.com>
---
lib/igt_kms.c | 2 +
lib/igt_kms.h | 2 +
tests/amdgpu/amd_checksum_region.c | 615 +++++++++++++++++++++++++++++
tests/amdgpu/meson.build | 1 +
4 files changed, 620 insertions(+)
create mode 100644 tests/amdgpu/amd_checksum_region.c
diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index f2b0eed57..804a71e9d 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -627,6 +627,8 @@ const char * const igt_crtc_prop_names[IGT_NUM_CRTC_PROPS] = {
[IGT_CRTC_OUT_FENCE_PTR] = "OUT_FENCE_PTR",
[IGT_CRTC_VRR_ENABLED] = "VRR_ENABLED",
[IGT_CRTC_SCALING_FILTER] = "SCALING_FILTER",
+ [IGT_CRTC_CHECKSUM_REGION] = "CHECKSUM_REGION",
+ [IGT_CRTC_CHECKSUM_CRC] = "CHECKSUM_CRC",
};
const char * const igt_connector_prop_names[IGT_NUM_CONNECTOR_PROPS] = {
diff --git a/lib/igt_kms.h b/lib/igt_kms.h
index 1b6988c17..80a5817e4 100644
--- a/lib/igt_kms.h
+++ b/lib/igt_kms.h
@@ -139,6 +139,8 @@ enum igt_atomic_crtc_properties {
IGT_CRTC_OUT_FENCE_PTR,
IGT_CRTC_VRR_ENABLED,
IGT_CRTC_SCALING_FILTER,
+ IGT_CRTC_CHECKSUM_REGION,
+ IGT_CRTC_CHECKSUM_CRC,
IGT_NUM_CRTC_PROPS
};
diff --git a/tests/amdgpu/amd_checksum_region.c b/tests/amdgpu/amd_checksum_region.c
new file mode 100644
index 000000000..3553363e6
--- /dev/null
+++ b/tests/amdgpu/amd_checksum_region.c
@@ -0,0 +1,615 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright 2023 Advanced Micro Devices, Inc.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+#include "igt.h"
+#include "igt_sysfs.h"
+
+IGT_TEST_DESCRIPTION("This IGT validates checksum region feature by testing if"
+ " we can set regions successfully and check if the corresponding CRC"
+ " values are as expected.");
+
+typedef uint64_t u64;
+typedef uint32_t u32;
+typedef uint8_t u8;
+
+#define CRTC_SET_NUM 2
+int crtc_set_num;
+
+enum roi_type {
+ ROI_TYPE_FIRST, // 100, 100, 130, 130
+ ROI_TYPE_BOTTOM, // 1060, 100, 1090, 130
+ ROI_TYPE_RIGHT, // 100, 130, 130, 160
+ ROI_TYPE_RIGHT_BOTTOM, // 1060, 130, 1090, 160
+ ROI_TYPE_NUM,
+};
+
+typedef struct drm_checksum_region roi_t;
+typedef struct drm_checksum_crc crc_t;
+
+struct data_basic {
+ struct {
+ igt_fb_t fb;
+ roi_t roi[ROI_TYPE_NUM];
+ } input;
+ struct {
+ roi_t *roi[ROI_TYPE_NUM];
+ crc_t *crc[ROI_TYPE_NUM];
+ crc_t *crc_hold[ROI_TYPE_NUM];
+ } output;
+};
+
+struct data_switching {
+ struct {
+ igt_fb_t fb[2];
+ roi_t roi_window;
+ roi_t roi_full_screen;
+ } input;
+ struct {
+ crc_t *crc_window[2];
+ crc_t *crc_full_screen[2];
+ } output;
+};
+
+typedef struct {
+ u8 crtc_id;
+ int connector_type;
+ igt_plane_t *primary;
+ igt_output_t *output;
+ igt_pipe_t *pipe;
+ igt_pipe_crc_t *pipe_crc;
+ enum pipe pipe_id;
+ void *data;
+} set_t;
+
+/* global data */
+typedef struct data {
+ struct igt_fb pattern_fb_info;
+ int fd;
+ igt_display_t display;
+ bool use_virtual_connector;
+ set_t set[CRTC_SET_NUM];
+} data_t;
+
+/* Use mode 1920x1080 */
+static drmModeModeInfo _mode = {
+ 148500,
+ 1920, 2008, 2052, 2200, 0,
+ 1080, 1084, 1089, 1125, 0,
+ 60, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC | DRM_MODE_FLAG_PIC_AR_16_9,
+ 0x40, "1920x1080"
+};
+
+static void draw_color_roi(igt_fb_t *fb, roi_t *roi,
+ int r, int g, int b)
+{
+ cairo_t *cr = igt_get_cairo_ctx(fb->fd, fb);
+
+ igt_paint_color(cr,
+ roi->x_start, roi->y_start, roi->x_end, roi->y_end,
+ r, g, b);
+ igt_put_cairo_ctx(cr);
+}
+
+/* color pattern for DP */
+static void draw_color_pattern_DP(igt_fb_t *fb)
+{
+ cairo_t *cr = igt_get_cairo_ctx(fb->fd, fb);
+
+ igt_paint_color(cr, 0, 0, fb->width/2, fb->height, 100, 255, 0);
+ igt_paint_color(cr, fb->width/2, 0, fb->width, fb->height, 0, 133, 204);
+ igt_put_cairo_ctx(cr);
+}
+
+/* color pattern for HDMI */
+static void draw_color_pattern_HDMI(igt_fb_t *fb)
+{
+ cairo_t *cr = igt_get_cairo_ctx(fb->fd, fb);
+
+ igt_paint_color(cr, 0, 0, fb->width/2, fb->height, 0, 200, 223);
+ igt_paint_color(cr, fb->width/2, 0, fb->width, fb->height, 223, 200, 1);
+ igt_put_cairo_ctx(cr);
+}
+
+/* prepare data and set */
+static void test_init(data_t *data)
+{
+ igt_display_t *display = &data->display;
+ set_t *set;
+ drmModeConnector *conn;
+ drmModeModeInfo *mode = &_mode;
+
+ igt_info("board has %d outputs\n", display->n_outputs);
+
+ for (int i = 0; i < display->n_outputs; i++) {
+ conn = display->outputs[i].config.connector;
+ if (conn->connection != DRM_MODE_CONNECTED)
+ continue;
+
+ if (conn->connector_type != DRM_MODE_CONNECTOR_HDMIA &&
+ conn->connector_type != DRM_MODE_CONNECTOR_DisplayPort)
+ continue;
+
+ set = &data->set[crtc_set_num];
+ set->connector_type = conn->connector_type;
+ set->crtc_id = i;
+ set->pipe_id = i;
+ set->pipe = &display->pipes[i];
+ set->primary = igt_pipe_get_plane_type(set->pipe, DRM_PLANE_TYPE_PRIMARY);
+ set->output = &display->outputs[i];
+
+ igt_output_set_pipe(set->output, set->pipe_id);
+ igt_output_override_mode(set->output, mode);
+
+ crtc_set_num += 1;
+ if (crtc_set_num == CRTC_SET_NUM)
+ break;
+ }
+
+ igt_info("crtc_set_num = %d\n", crtc_set_num);
+}
+
+static bool roi_compare(roi_t *a, roi_t *b)
+{
+ return (a->x_start == b->x_start &&
+ a->y_start == b->y_start &&
+ a->x_end == b->x_end &&
+ a->y_end == b->y_end);
+}
+
+static bool crc_compare(crc_t *a, crc_t *b)
+{
+ return (a->crc_r == b->crc_r &&
+ a->crc_g == b->crc_g &&
+ a->crc_b == b->crc_b);
+}
+
+static void
+disable_checksum_region_from_property(data_t *data)
+{
+ set_t *set;
+ roi_t roi = {0};
+
+ for (int i = 0; i < crtc_set_num; i++) {
+ set = &data->set[i];
+ igt_require(igt_pipe_obj_has_prop(set->pipe, IGT_CRTC_CHECKSUM_REGION));
+ igt_pipe_obj_replace_prop_blob(set->pipe, IGT_CRTC_CHECKSUM_REGION, &roi, sizeof(roi));
+ }
+}
+
+static void
+set_roi_from_property(igt_pipe_t *pipe, roi_t *roi)
+{
+ igt_require(igt_pipe_obj_has_prop(pipe, IGT_CRTC_CHECKSUM_REGION));
+ igt_pipe_obj_replace_prop_blob(pipe, IGT_CRTC_CHECKSUM_REGION, roi, sizeof(roi_t));
+}
+
+static void
+set_roi(data_t *data, set_t *set, roi_t *roi)
+{
+ set_roi_from_property(set->pipe, roi);
+ igt_info("Set roi, x_start:%4d, y_start:%4d, x_end:%4d, y_end:%4d",
+ roi->x_start, roi->y_start, roi->x_end, roi->y_end);
+ igt_info("\t");
+}
+
+static roi_t *
+get_roi_from_property(int fd, igt_pipe_t *pipe)
+{
+ drmModePropertyBlobPtr blob;
+ u64 blob_id = igt_pipe_obj_get_prop(pipe, IGT_CRTC_CHECKSUM_REGION);
+
+ igt_require(igt_pipe_obj_has_prop(pipe, IGT_CRTC_CHECKSUM_REGION));
+
+ blob = drmModeGetPropertyBlob(fd, blob_id);
+ if (!blob)
+ return NULL;
+
+ return (roi_t *) blob->data;
+}
+
+static void
+get_roi(data_t *data, set_t *set, roi_t **roi)
+{
+ *roi = get_roi_from_property(data->display.drm_fd, set->pipe);
+ if (*roi) {
+ igt_info("get ROI from properties: ");
+ igt_info("0x%04x 0x%04x 0x%04x 0x%04x, %4d",
+ (*roi)->x_start, (*roi)->y_start,
+ (*roi)->x_end, (*roi)->y_end,
+ (*roi)->checksum_region_enable);
+ }
+ igt_info("\t");
+}
+
+static crc_t *
+get_crc_from_property(int fd, igt_pipe_t *pipe)
+{
+ drmModePropertyBlobPtr blob;
+ u64 blob_id = igt_pipe_obj_get_prop(pipe, IGT_CRTC_CHECKSUM_CRC);
+
+ igt_require(igt_pipe_obj_has_prop(pipe, IGT_CRTC_CHECKSUM_CRC));
+
+ blob = drmModeGetPropertyBlob(fd, blob_id);
+ if (!blob)
+ return NULL;
+
+ return (crc_t *) blob->data;
+}
+
+static void
+get_crc(data_t *data, set_t *set, crc_t **crc)
+{
+ *crc = get_crc_from_property(data->display.drm_fd, set->pipe);
+ if (*crc) {
+ igt_info("get CRC from properties: ");
+ igt_info("0x%04x 0x%04x 0x%04x, %4d",
+ (*crc)->crc_r, (*crc)->crc_g, (*crc)->crc_b, (*crc)->frame_count);
+ }
+ igt_info("\t\t");
+}
+
+static void
+test_basic_init(data_t *data, struct data_basic *_basic)
+{
+ drmModeModeInfo *mode = &_mode;
+ set_t *set;
+ struct data_basic *basic;
+
+ igt_info("\n");
+
+ for (int i = 0; i < crtc_set_num; i++) {
+ set = &data->set[i];
+ basic = &_basic[i];
+
+ /* init data */
+ basic->input.roi[ROI_TYPE_FIRST].x_start = 100;
+ basic->input.roi[ROI_TYPE_FIRST].y_start = 100;
+ basic->input.roi[ROI_TYPE_FIRST].x_end = 130;
+ basic->input.roi[ROI_TYPE_FIRST].y_end = 130;
+ basic->input.roi[ROI_TYPE_FIRST].checksum_region_enable = 1;
+
+ basic->input.roi[ROI_TYPE_RIGHT].x_start = 1060;
+ basic->input.roi[ROI_TYPE_RIGHT].y_start = 100;
+ basic->input.roi[ROI_TYPE_RIGHT].x_end = 1100;
+ basic->input.roi[ROI_TYPE_RIGHT].y_end = 130;
+ basic->input.roi[ROI_TYPE_RIGHT].checksum_region_enable = 1;
+
+ basic->input.roi[ROI_TYPE_BOTTOM].x_start = 100;
+ basic->input.roi[ROI_TYPE_BOTTOM].y_start = 130;
+ basic->input.roi[ROI_TYPE_BOTTOM].x_end = 130;
+ basic->input.roi[ROI_TYPE_BOTTOM].y_end = 160;
+ basic->input.roi[ROI_TYPE_BOTTOM].checksum_region_enable = 1;
+
+ basic->input.roi[ROI_TYPE_RIGHT_BOTTOM].x_start = 1060;
+ basic->input.roi[ROI_TYPE_RIGHT_BOTTOM].y_start = 130;
+ basic->input.roi[ROI_TYPE_RIGHT_BOTTOM].x_end = 1100;
+ basic->input.roi[ROI_TYPE_RIGHT_BOTTOM].y_end = 160;
+ basic->input.roi[ROI_TYPE_RIGHT_BOTTOM].checksum_region_enable = 1;
+
+ /* paint fb */
+ igt_create_fb(data->fd, mode->hdisplay, mode->vdisplay, DRM_FORMAT_XRGB8888, 0, &basic->input.fb);
+
+ if (set->connector_type == DRM_MODE_CONNECTOR_HDMIA)
+ draw_color_pattern_HDMI(&basic->input.fb);
+ else
+ draw_color_pattern_DP(&basic->input.fb);
+
+ igt_plane_set_fb(set->primary, &basic->input.fb);
+
+ igt_info("Output: %s\t\t\t\t\t\t\t",
+ (set->connector_type == DRM_MODE_CONNECTOR_HDMIA) ? "HDMI" : "DP");
+ }
+}
+
+static void test_basic_validate(struct data_basic *_basic)
+{
+ struct data_basic *basic;
+ roi_t *roi, *roi_return;
+ crc_t **crc, **crc_hold;
+
+ igt_info("************\n");
+ for (int i = 0; i < crtc_set_num; i++) {
+ basic = &_basic[i];
+
+ for (int type = 0; type < ROI_TYPE_NUM; type++) {
+ roi = &basic->input.roi[type];
+ roi_return = basic->output.roi[type];
+ if (!roi_compare(roi, roi_return))
+ igt_assert_f(false, "ROI values are not as expected\n");
+ }
+
+ crc = basic->output.crc;
+ if (!crc_compare(crc[ROI_TYPE_FIRST], crc[ROI_TYPE_BOTTOM]) &&
+ !crc_compare(crc[ROI_TYPE_RIGHT], crc[ROI_TYPE_RIGHT_BOTTOM]))
+ igt_assert_f(false, "CRC values are not as expected\n");
+
+ if (crc[ROI_TYPE_FIRST]->frame_count != 2 ||
+ crc[ROI_TYPE_BOTTOM]->frame_count != 2 ||
+ crc[ROI_TYPE_RIGHT]->frame_count != 2 ||
+ crc[ROI_TYPE_RIGHT_BOTTOM]->frame_count != 2)
+ igt_assert_f(false, "CRC frame_count are not as expected\n");
+
+ crc_hold = basic->output.crc_hold;
+ if (!crc_compare(crc[ROI_TYPE_FIRST], crc_hold[ROI_TYPE_FIRST]) &&
+ !crc_compare(crc[ROI_TYPE_BOTTOM], crc_hold[ROI_TYPE_BOTTOM]) &&
+ !crc_compare(crc[ROI_TYPE_RIGHT], crc_hold[ROI_TYPE_RIGHT]) &&
+ !crc_compare(crc[ROI_TYPE_RIGHT_BOTTOM], crc_hold[ROI_TYPE_RIGHT_BOTTOM]))
+ igt_assert_f(false, "CRC values are not as expected after 5 seconds\n");
+
+ }
+
+ igt_info("Test checksum_region basic passed\n");
+}
+
+static void
+test_basic_case(data_t *data, enum roi_type type, struct data_basic *basic)
+{
+ set_t *set;
+ roi_t *roi;
+ roi_t **roi_return;
+ crc_t **crc;
+
+ igt_info("\n");
+
+ /* set roi for each CRTC */
+ for (int i = 0; i < crtc_set_num; i++) {
+ set = &data->set[i];
+ roi = &basic[i].input.roi[type];
+ set_roi(data, set, roi);
+ }
+ igt_display_commit_atomic(&data->display, DRM_MODE_ATOMIC_ALLOW_MODESET, NULL); // commit new ROI
+ igt_info("\n");
+
+
+ /* get the crc for check */
+ for (int i = 0; i < crtc_set_num; i++) {
+ set = &data->set[i];
+ crc = &basic[i].output.crc[type];
+ get_crc(data, set, crc);
+ }
+ igt_info("\n");
+
+
+ /* sleep and get crc for check again*/
+ sleep(3);
+ for (int i = 0; i < crtc_set_num; i++) {
+ set = &data->set[i];
+ crc = &basic[i].output.crc_hold[type];
+ get_crc(data, set, crc);
+ }
+ igt_info("\n");
+
+
+ /* get roi for check */
+ for (int i = 0; i < crtc_set_num; i++) {
+ set = &data->set[i];
+ roi_return = &basic[i].output.roi[type];
+ get_roi(data, set, roi_return);
+ }
+ igt_info("\n");
+}
+
+static void test_fini(data_t *data)
+{
+ disable_checksum_region_from_property(data);
+ igt_display_commit_atomic(&data->display, DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
+}
+
+static void
+test_checksum_region_basic(data_t *data)
+{
+ struct data_basic d_basic[CRTC_SET_NUM] = {0};
+
+ /* test basic init */
+ test_basic_init(data, d_basic);
+
+ test_basic_case(data, ROI_TYPE_FIRST, d_basic);
+ test_basic_case(data, ROI_TYPE_RIGHT, d_basic);
+ test_basic_case(data, ROI_TYPE_BOTTOM, d_basic);
+ test_basic_case(data, ROI_TYPE_RIGHT_BOTTOM, d_basic);
+
+ test_basic_validate(d_basic);
+
+ test_fini(data);
+}
+
+static void
+test_switching_validate(struct data_switching *switching)
+{
+ crc_t *crc_a, *crc_b;
+
+ igt_info("************\n");
+ for (int i = 0; i < crtc_set_num; i++) {
+ crc_a = switching[i].output.crc_window[0];
+ crc_b = switching[i].output.crc_window[1];
+
+ if (!crc_compare(crc_a, crc_b))
+ igt_assert_f(false, "Window crc values should be the same\n");
+
+
+ crc_a = switching[i].output.crc_full_screen[0];
+ crc_b = switching[i].output.crc_full_screen[1];
+
+ if (crc_compare(crc_a, crc_b))
+ igt_assert_f(false, "Full screen crc values should not be the same\n");
+ }
+
+ igt_info("Test checksum_region switching passed\n");
+}
+
+static void
+test_switching_init(data_t *data, struct data_switching *_switching)
+{
+ drmModeModeInfo *mode = &_mode;
+ roi_t *roi;
+ set_t *set;
+ struct data_switching *switching;
+ struct igt_fb *fb;
+
+ igt_info("\n");
+
+ for (int i = 0; i < crtc_set_num; i++) {
+ switching = &_switching[i];
+ set = &data->set[i];
+
+ /* crc window roi */
+ roi = &switching->input.roi_window;
+ roi->x_start = 100;
+ roi->y_start = 100;
+ roi->x_end = 130;
+ roi->y_end = 130;
+ roi->checksum_region_enable = 1;
+
+ /* full screen roi */
+ roi = &switching->input.roi_full_screen;
+ roi->x_start = 0;
+ roi->y_start = 0;
+ roi->x_end = mode->hdisplay;
+ roi->y_end = mode->vdisplay;
+ roi->checksum_region_enable = 1;
+
+ /* paint fb with blue background, red rect */
+ fb = &switching->input.fb[0];
+ igt_create_fb(data->fd, mode->hdisplay, mode->vdisplay,
+ DRM_FORMAT_XRGB8888, 0, fb);
+ draw_color_roi(fb, &switching->input.roi_full_screen, 0, 0, 255);
+ draw_color_roi(fb, &switching->input.roi_window, 255, 0, 0);
+
+
+ /* paint fb with green background, red retc */
+ fb = &switching->input.fb[1];
+ igt_create_fb(data->fd, mode->hdisplay, mode->vdisplay,
+ DRM_FORMAT_XRGB8888, 0, fb);
+ draw_color_roi(fb, &switching->input.roi_full_screen, 0, 255, 0);
+ draw_color_roi(fb, &switching->input.roi_window, 255, 0, 0);
+ igt_info("Output: %s\t\t\t\t\t\t\t",
+ (set->connector_type == DRM_MODE_CONNECTOR_HDMIA) ? "HDMI" : "DP");
+ }
+}
+
+static void
+test_switching_case(data_t *data, struct data_switching *switching, bool is_window)
+{
+ set_t *set;
+ igt_fb_t *fb;
+ roi_t *roi, *roi_return;
+ crc_t **crc;
+
+ igt_info("\n");
+
+ /* change pattern */
+ for (int i = 0; i < crtc_set_num; i++) {
+ set = &data->set[i];
+ fb = &switching[i].input.fb[0];
+ igt_plane_set_fb(set->primary, fb);
+ }
+
+ /* set crc window roi */
+ for (int i = 0; i < crtc_set_num; i++) {
+ set = &data->set[i];
+ roi = (is_window) ? &switching[i].input.roi_window
+ : &switching[i].input.roi_full_screen;
+ set_roi(data, set, roi);
+ }
+ igt_display_commit_atomic(&data->display, DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
+ igt_info("\n");
+
+
+ /* get crc window roi and print for debug */
+ for (int i = 0; i < crtc_set_num; i++) {
+ set = &data->set[i];
+ get_roi(data, set, &roi_return);
+ }
+ igt_info("\n");
+
+
+ /* get the window crc */
+ for (int i = 0; i < crtc_set_num; i++) {
+ set = &data->set[i];
+ crc = (is_window) ? &switching[i].output.crc_window[0]
+ : &switching[i].output.crc_full_screen[0];
+ get_crc(data, set, crc);
+ }
+ igt_info("\n");
+
+
+ /* change pattern */
+ for (int i = 0; i < crtc_set_num; i++) {
+ set = &data->set[i];
+ fb = &switching[i].input.fb[1];
+ igt_plane_set_fb(set->primary, fb);
+ }
+ igt_display_commit_atomic(&data->display, DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
+
+ /* wait 1 frame for new crc computed */
+ for (int i = 0; i < crtc_set_num; i++) {
+ set = &data->set[i];
+ igt_wait_for_vblank_count(data->fd, set->pipe->crtc_offset, 1);
+ }
+
+ /* get the window crc */
+ for (int i = 0; i < crtc_set_num; i++) {
+ set = &data->set[i];
+ crc = (is_window) ? &switching[i].output.crc_window[1]
+ : &switching[i].output.crc_full_screen[1];
+ get_crc(data, set, crc);
+ }
+ igt_info("\n");
+}
+
+static void
+test_checksum_region_switching(data_t *data)
+{
+ struct data_switching switching[CRTC_SET_NUM] = {0};
+
+ /* test basic init */
+ test_switching_init(data, switching);
+
+ /* crc_window */
+ test_switching_case(data, switching, true);
+
+ /* full screen */
+ test_switching_case(data, switching, false);
+
+ test_switching_validate(switching);
+
+ test_fini(data);
+}
+
+igt_main
+{
+ data_t data = {0};
+
+ igt_skip_on_simulation();
+
+ igt_fixture
+ {
+ data.fd = drm_open_driver_master(DRIVER_AMDGPU);
+ kmstest_set_vt_graphics_mode();
+ igt_display_require(&data.display, data.fd);
+ igt_require(data.display.is_atomic);
+ igt_display_require_output(&data.display);
+ test_init(&data);
+ }
+
+
+ igt_describe("Test basic region configuration and validate the CRC.");
+ igt_subtest("checksum-region-basic")
+ test_checksum_region_basic(&data);
+
+ igt_describe("Test switching between window region and fullscreen region and validate the CRC.");
+ igt_subtest("checksum-region-switching")
+ test_checksum_region_switching(&data);
+
+ igt_fixture
+ {
+ igt_display_fini(&data.display);
+ close(data.fd);
+ }
+}
diff --git a/tests/amdgpu/meson.build b/tests/amdgpu/meson.build
index 24843de73..e2f03bb49 100644
--- a/tests/amdgpu/meson.build
+++ b/tests/amdgpu/meson.build
@@ -7,6 +7,7 @@ if libdrm_amdgpu.found()
'amd_basic',
'amd_bo',
'amd_bypass',
+ 'amd_checksum_region',
'amd_color',
'amd_cp_dma_misc',
'amd_cs_nop',
--
2.34.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [igt-dev] ✗ Fi.CI.BAT: failure for series starting with [v3,1/2] drm-uapi/drm_mode: sync with latest uAPI changes for checksum_region
2023-07-05 15:26 [igt-dev] [PATCH v3 1/2] drm-uapi/drm_mode: sync with latest uAPI changes for checksum_region Alan Liu
2023-07-05 15:26 ` [igt-dev] [PATCH v3 2/2] tests/amdgpu/amd_checksum_region: Add test " Alan Liu
@ 2023-07-05 16:42 ` Patchwork
2023-07-11 17:59 ` [igt-dev] [PATCH v3 1/2] " Kamil Konieczny
2 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2023-07-05 16:42 UTC (permalink / raw)
To: Alan Liu; +Cc: igt-dev
[-- Attachment #1: Type: text/plain, Size: 13310 bytes --]
== Series Details ==
Series: series starting with [v3,1/2] drm-uapi/drm_mode: sync with latest uAPI changes for checksum_region
URL : https://patchwork.freedesktop.org/series/120231/
State : failure
== Summary ==
CI Bug Log - changes from IGT_7371 -> IGTPW_9341
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with IGTPW_9341 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in IGTPW_9341, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9341/index.html
Participating hosts (40 -> 40)
------------------------------
Additional (1): bat-atsm-1
Missing (1): fi-snb-2520m
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in IGTPW_9341:
### IGT changes ###
#### Possible regressions ####
* igt@i915_selftest@live@slpc:
- bat-dg2-11: [PASS][1] -> [DMESG-WARN][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7371/bat-dg2-11/igt@i915_selftest@live@slpc.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9341/bat-dg2-11/igt@i915_selftest@live@slpc.html
Known issues
------------
Here are the changes found in IGTPW_9341 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@core_auth@basic-auth:
- bat-adlp-11: NOTRUN -> [ABORT][3] ([i915#8011])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9341/bat-adlp-11/igt@core_auth@basic-auth.html
* igt@gem_mmap@basic:
- bat-atsm-1: NOTRUN -> [SKIP][4] ([i915#4083])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9341/bat-atsm-1/igt@gem_mmap@basic.html
* igt@gem_render_tiled_blits@basic:
- bat-atsm-1: NOTRUN -> [SKIP][5] ([i915#4079]) +1 similar issue
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9341/bat-atsm-1/igt@gem_render_tiled_blits@basic.html
* igt@gem_tiled_fence_blits@basic:
- bat-atsm-1: NOTRUN -> [SKIP][6] ([i915#4077]) +2 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9341/bat-atsm-1/igt@gem_tiled_fence_blits@basic.html
* igt@i915_pm_rpm@basic-pci-d3-state:
- bat-mtlp-8: [PASS][7] -> [ABORT][8] ([i915#7077] / [i915#7977] / [i915#8668])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7371/bat-mtlp-8/igt@i915_pm_rpm@basic-pci-d3-state.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9341/bat-mtlp-8/igt@i915_pm_rpm@basic-pci-d3-state.html
* igt@i915_pm_rps@basic-api:
- bat-atsm-1: NOTRUN -> [SKIP][9] ([i915#6621])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9341/bat-atsm-1/igt@i915_pm_rps@basic-api.html
* igt@i915_selftest@live@gt_mocs:
- bat-mtlp-6: [PASS][10] -> [DMESG-FAIL][11] ([i915#7059])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7371/bat-mtlp-6/igt@i915_selftest@live@gt_mocs.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9341/bat-mtlp-6/igt@i915_selftest@live@gt_mocs.html
* igt@i915_selftest@live@gt_pm:
- bat-rpls-2: [PASS][12] -> [DMESG-FAIL][13] ([i915#4258] / [i915#7913])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7371/bat-rpls-2/igt@i915_selftest@live@gt_pm.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9341/bat-rpls-2/igt@i915_selftest@live@gt_pm.html
* igt@i915_selftest@live@mman:
- bat-rpls-2: [PASS][14] -> [TIMEOUT][15] ([i915#6794] / [i915#7392])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7371/bat-rpls-2/igt@i915_selftest@live@mman.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9341/bat-rpls-2/igt@i915_selftest@live@mman.html
* igt@i915_selftest@live@slpc:
- bat-mtlp-6: [PASS][16] -> [DMESG-WARN][17] ([i915#6367])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7371/bat-mtlp-6/igt@i915_selftest@live@slpc.html
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9341/bat-mtlp-6/igt@i915_selftest@live@slpc.html
- bat-rpls-1: [PASS][18] -> [DMESG-WARN][19] ([i915#6367])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7371/bat-rpls-1/igt@i915_selftest@live@slpc.html
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9341/bat-rpls-1/igt@i915_selftest@live@slpc.html
* igt@i915_selftest@live@workarounds:
- bat-mtlp-6: [PASS][20] -> [DMESG-FAIL][21] ([i915#6763])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7371/bat-mtlp-6/igt@i915_selftest@live@workarounds.html
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9341/bat-mtlp-6/igt@i915_selftest@live@workarounds.html
* igt@i915_suspend@basic-s3-without-i915:
- bat-atsm-1: NOTRUN -> [SKIP][22] ([i915#6645])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9341/bat-atsm-1/igt@i915_suspend@basic-s3-without-i915.html
* igt@kms_addfb_basic@size-max:
- bat-atsm-1: NOTRUN -> [SKIP][23] ([i915#6077]) +36 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9341/bat-atsm-1/igt@kms_addfb_basic@size-max.html
* igt@kms_chamelium_hpd@common-hpd-after-suspend:
- fi-glk-j4005: NOTRUN -> [SKIP][24] ([fdo#109271])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9341/fi-glk-j4005/igt@kms_chamelium_hpd@common-hpd-after-suspend.html
- fi-bsw-n3050: NOTRUN -> [SKIP][25] ([fdo#109271])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9341/fi-bsw-n3050/igt@kms_chamelium_hpd@common-hpd-after-suspend.html
* igt@kms_cursor_legacy@basic-flip-after-cursor-atomic:
- bat-atsm-1: NOTRUN -> [SKIP][26] ([i915#6078]) +19 similar issues
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9341/bat-atsm-1/igt@kms_cursor_legacy@basic-flip-after-cursor-atomic.html
* igt@kms_flip@basic-flip-vs-wf_vblank:
- bat-atsm-1: NOTRUN -> [SKIP][27] ([i915#6166]) +3 similar issues
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9341/bat-atsm-1/igt@kms_flip@basic-flip-vs-wf_vblank.html
* igt@kms_force_connector_basic@force-load-detect:
- bat-atsm-1: NOTRUN -> [SKIP][28] ([i915#6093]) +3 similar issues
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9341/bat-atsm-1/igt@kms_force_connector_basic@force-load-detect.html
* igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence:
- bat-dg2-11: NOTRUN -> [SKIP][29] ([i915#1845] / [i915#5354]) +3 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9341/bat-dg2-11/igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence.html
* igt@kms_pipe_crc_basic@read-crc-frame-sequence:
- bat-atsm-1: NOTRUN -> [SKIP][30] ([i915#1836]) +6 similar issues
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9341/bat-atsm-1/igt@kms_pipe_crc_basic@read-crc-frame-sequence.html
* igt@kms_prop_blob@basic:
- bat-atsm-1: NOTRUN -> [SKIP][31] ([i915#7357])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9341/bat-atsm-1/igt@kms_prop_blob@basic.html
* igt@kms_psr@sprite_plane_onoff:
- bat-atsm-1: NOTRUN -> [SKIP][32] ([i915#1072]) +3 similar issues
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9341/bat-atsm-1/igt@kms_psr@sprite_plane_onoff.html
* igt@kms_setmode@basic-clone-single-crtc:
- bat-atsm-1: NOTRUN -> [SKIP][33] ([i915#6094])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9341/bat-atsm-1/igt@kms_setmode@basic-clone-single-crtc.html
* igt@prime_vgem@basic-fence-flip:
- bat-atsm-1: NOTRUN -> [SKIP][34] ([fdo#109295] / [i915#6078])
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9341/bat-atsm-1/igt@prime_vgem@basic-fence-flip.html
* igt@prime_vgem@basic-gtt:
- bat-atsm-1: NOTRUN -> [SKIP][35] ([fdo#109295] / [i915#4077]) +1 similar issue
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9341/bat-atsm-1/igt@prime_vgem@basic-gtt.html
* igt@prime_vgem@basic-write:
- bat-atsm-1: NOTRUN -> [SKIP][36] ([fdo#109295]) +2 similar issues
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9341/bat-atsm-1/igt@prime_vgem@basic-write.html
#### Possible fixes ####
* igt@dmabuf@all-tests@dma_fence:
- fi-glk-j4005: [DMESG-FAIL][37] ([i915#8189]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7371/fi-glk-j4005/igt@dmabuf@all-tests@dma_fence.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9341/fi-glk-j4005/igt@dmabuf@all-tests@dma_fence.html
* igt@dmabuf@all-tests@sanitycheck:
- fi-glk-j4005: [ABORT][39] ([i915#8143] / [i915#8144] / [i915#8218]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7371/fi-glk-j4005/igt@dmabuf@all-tests@sanitycheck.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9341/fi-glk-j4005/igt@dmabuf@all-tests@sanitycheck.html
* igt@i915_selftest@live@execlists:
- fi-bsw-n3050: [ABORT][41] ([i915#7913]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7371/fi-bsw-n3050/igt@i915_selftest@live@execlists.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9341/fi-bsw-n3050/igt@i915_selftest@live@execlists.html
* igt@i915_selftest@live@guc:
- bat-rpls-1: [DMESG-WARN][43] ([i915#7852]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7371/bat-rpls-1/igt@i915_selftest@live@guc.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9341/bat-rpls-1/igt@i915_selftest@live@guc.html
#### Warnings ####
* igt@i915_module_load@load:
- bat-adlp-11: [ABORT][45] ([i915#4423]) -> [DMESG-WARN][46] ([i915#4423])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7371/bat-adlp-11/igt@i915_module_load@load.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9341/bat-adlp-11/igt@i915_module_load@load.html
* igt@kms_psr@primary_page_flip:
- bat-rplp-1: [SKIP][47] ([i915#1072]) -> [ABORT][48] ([i915#8442] / [i915#8668])
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7371/bat-rplp-1/igt@kms_psr@primary_page_flip.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9341/bat-rplp-1/igt@kms_psr@primary_page_flip.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1836]: https://gitlab.freedesktop.org/drm/intel/issues/1836
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079
[i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083
[i915#4258]: https://gitlab.freedesktop.org/drm/intel/issues/4258
[i915#4423]: https://gitlab.freedesktop.org/drm/intel/issues/4423
[i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354
[i915#6077]: https://gitlab.freedesktop.org/drm/intel/issues/6077
[i915#6078]: https://gitlab.freedesktop.org/drm/intel/issues/6078
[i915#6093]: https://gitlab.freedesktop.org/drm/intel/issues/6093
[i915#6094]: https://gitlab.freedesktop.org/drm/intel/issues/6094
[i915#6166]: https://gitlab.freedesktop.org/drm/intel/issues/6166
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#6621]: https://gitlab.freedesktop.org/drm/intel/issues/6621
[i915#6645]: https://gitlab.freedesktop.org/drm/intel/issues/6645
[i915#6763]: https://gitlab.freedesktop.org/drm/intel/issues/6763
[i915#6794]: https://gitlab.freedesktop.org/drm/intel/issues/6794
[i915#7059]: https://gitlab.freedesktop.org/drm/intel/issues/7059
[i915#7077]: https://gitlab.freedesktop.org/drm/intel/issues/7077
[i915#7357]: https://gitlab.freedesktop.org/drm/intel/issues/7357
[i915#7392]: https://gitlab.freedesktop.org/drm/intel/issues/7392
[i915#7852]: https://gitlab.freedesktop.org/drm/intel/issues/7852
[i915#7913]: https://gitlab.freedesktop.org/drm/intel/issues/7913
[i915#7977]: https://gitlab.freedesktop.org/drm/intel/issues/7977
[i915#8011]: https://gitlab.freedesktop.org/drm/intel/issues/8011
[i915#8143]: https://gitlab.freedesktop.org/drm/intel/issues/8143
[i915#8144]: https://gitlab.freedesktop.org/drm/intel/issues/8144
[i915#8189]: https://gitlab.freedesktop.org/drm/intel/issues/8189
[i915#8218]: https://gitlab.freedesktop.org/drm/intel/issues/8218
[i915#8442]: https://gitlab.freedesktop.org/drm/intel/issues/8442
[i915#8668]: https://gitlab.freedesktop.org/drm/intel/issues/8668
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_7371 -> IGTPW_9341
CI-20190529: 20190529
CI_DRM_13346: c5442b2363bf5ad916805d105ff03ce5805070e5 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_9341: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9341/index.html
IGT_7371: f8d05fd574fad1526cbf5e20672910df87b8839b @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9341/index.html
[-- Attachment #2: Type: text/html, Size: 15431 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [igt-dev] [PATCH v3 1/2] drm-uapi/drm_mode: sync with latest uAPI changes for checksum_region
2023-07-05 15:26 [igt-dev] [PATCH v3 1/2] drm-uapi/drm_mode: sync with latest uAPI changes for checksum_region Alan Liu
2023-07-05 15:26 ` [igt-dev] [PATCH v3 2/2] tests/amdgpu/amd_checksum_region: Add test " Alan Liu
2023-07-05 16:42 ` [igt-dev] ✗ Fi.CI.BAT: failure for series starting with [v3,1/2] drm-uapi/drm_mode: sync with latest uAPI changes " Patchwork
@ 2023-07-11 17:59 ` Kamil Konieczny
2023-07-14 9:23 ` Liu, HaoPing (Alan)
2 siblings, 1 reply; 7+ messages in thread
From: Kamil Konieczny @ 2023-07-11 17:59 UTC (permalink / raw)
To: igt-dev; +Cc: Alan Liu, Lili.Gong
Hi Alan,
On 2023-07-05 at 23:26:05 +0800, Alan Liu wrote:
> Add struct drm_checksum_region and struct drm_checksum_crc as the
> userspace data for using checksum_region feature.
>
> Signed-off-by: Alan Liu <HaoPing.Liu@amd.com>
Please send this as a separate patch, write also to which repo
are you sync-ing, is it drm-tip?
Regards,
Kamil
> ---
> include/drm-uapi/drm_mode.h | 42 +++++++++++++++++++++++++++++++++++++
> 1 file changed, 42 insertions(+)
>
> diff --git a/include/drm-uapi/drm_mode.h b/include/drm-uapi/drm_mode.h
> index e4a2570a6..dec073921 100644
> --- a/include/drm-uapi/drm_mode.h
> +++ b/include/drm-uapi/drm_mode.h
> @@ -1209,6 +1209,48 @@ struct drm_mode_rect {
> __s32 y2;
> };
>
> +/**
> + * struct drm_checksum_region - The enablement and region of checksum_region
> + * @x_start: Horizontal starting coordinate of the region.
> + * @y_start: Vertical starting coordinate of the region.
> + * @x_end: Horizontal ending coordinate of the region.
> + * @y_end: Vertical ending coordinate of the region.
> + * @checksum_region_enable: To enable or disable checksum_region.
> + *
> + * Userspace uses this structure to configure the region and enablement for
> + * checksum_region. Userspace should not submit a region out of the displayable
> + * region because there is nothing to display and need protection.
> + */
> +struct drm_checksum_region {
> + __u32 x_start;
> + __u32 y_start;
> + __u32 x_end;
> + __u32 y_end;
> + __u8 checksum_region_enable;
> + __u8 pad[7];
> +};
> +
> +/**
> + * struct drm_checksum_crc - The CRC value of the corresponding checksum region.
> + * @crc_r: CRC value of red color.
> + * @crc_g: CRC value of green color.
> + * @crc_b: CRC value of blue color.
> + * @frame_count: a referenced frame count to indicate which frame the CRC values
> + * are generated at.
> + *
> + * Userspace uses this structure to retrieve the CRC values of the current
> + * checksum region. @frame_count will be reset once a new region is updated or
> + * it reaches a maximum value. Currently these CRC values are designed to
> + * be validated with pre-saved CRC values, so userspace doesn't need to concern
> + * about the algorithm used to compute the CRC.
> + */
> +struct drm_checksum_crc {
> + __u32 crc_r;
> + __u32 crc_g;
> + __u32 crc_b;
> + __u32 frame_count;
> +};
> +
> #if defined(__cplusplus)
> }
> #endif
> --
> 2.34.1
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [igt-dev] [PATCH v3 2/2] tests/amdgpu/amd_checksum_region: Add test for checksum_region
2023-07-05 15:26 ` [igt-dev] [PATCH v3 2/2] tests/amdgpu/amd_checksum_region: Add test " Alan Liu
@ 2023-07-11 18:01 ` Kamil Konieczny
0 siblings, 0 replies; 7+ messages in thread
From: Kamil Konieczny @ 2023-07-11 18:01 UTC (permalink / raw)
To: igt-dev; +Cc: Alan Liu, Lili.Gong
Hi Alan,
On 2023-07-05 at 23:26:06 +0800, Alan Liu wrote:
> Introduce IGT of checksum_region. Checksum_region allows userspace to
> set a region on display and get the CRC data accordingly via CRTC
> properties: CHECKSUM_REGION and CEHCKSUM_CRC.
>
> This IGT validates checksum region feature by testing if we can set
> we can set regions successfully and check if the corresponding CRC
> values are as expected.
>
> v2
> - Add test description
> - Separate uAPI change to another patch
> - Declare with SPDX MIT licence
> - Include igt headers after system headers
> - Add this igt into meson.build in alphabetical order
>
> v3
> - Replace wait_vblank() by igt_wait_for_vblank_count()
> - Improve the format of print information
>
> Signed-off-by: Alan Liu <HaoPing.Liu@amd.com>
> ---
> lib/igt_kms.c | 2 +
> lib/igt_kms.h | 2 +
Please split changes in lib/igt_kms.* into separate patch with
this patchseries.
Reagards,
Kamil
> tests/amdgpu/amd_checksum_region.c | 615 +++++++++++++++++++++++++++++
> tests/amdgpu/meson.build | 1 +
> 4 files changed, 620 insertions(+)
> create mode 100644 tests/amdgpu/amd_checksum_region.c
>
> diff --git a/lib/igt_kms.c b/lib/igt_kms.c
> index f2b0eed57..804a71e9d 100644
> --- a/lib/igt_kms.c
> +++ b/lib/igt_kms.c
> @@ -627,6 +627,8 @@ const char * const igt_crtc_prop_names[IGT_NUM_CRTC_PROPS] = {
> [IGT_CRTC_OUT_FENCE_PTR] = "OUT_FENCE_PTR",
> [IGT_CRTC_VRR_ENABLED] = "VRR_ENABLED",
> [IGT_CRTC_SCALING_FILTER] = "SCALING_FILTER",
> + [IGT_CRTC_CHECKSUM_REGION] = "CHECKSUM_REGION",
> + [IGT_CRTC_CHECKSUM_CRC] = "CHECKSUM_CRC",
> };
>
> const char * const igt_connector_prop_names[IGT_NUM_CONNECTOR_PROPS] = {
> diff --git a/lib/igt_kms.h b/lib/igt_kms.h
> index 1b6988c17..80a5817e4 100644
> --- a/lib/igt_kms.h
> +++ b/lib/igt_kms.h
> @@ -139,6 +139,8 @@ enum igt_atomic_crtc_properties {
> IGT_CRTC_OUT_FENCE_PTR,
> IGT_CRTC_VRR_ENABLED,
> IGT_CRTC_SCALING_FILTER,
> + IGT_CRTC_CHECKSUM_REGION,
> + IGT_CRTC_CHECKSUM_CRC,
> IGT_NUM_CRTC_PROPS
> };
>
> diff --git a/tests/amdgpu/amd_checksum_region.c b/tests/amdgpu/amd_checksum_region.c
> new file mode 100644
> index 000000000..3553363e6
> --- /dev/null
> +++ b/tests/amdgpu/amd_checksum_region.c
> @@ -0,0 +1,615 @@
> +// SPDX-License-Identifier: MIT
> +/*
> + * Copyright 2023 Advanced Micro Devices, Inc.
> + */
> +
> +#include <stdlib.h>
> +#include <string.h>
> +#include <stdio.h>
> +#include <unistd.h>
> +#include "igt.h"
> +#include "igt_sysfs.h"
> +
> +IGT_TEST_DESCRIPTION("This IGT validates checksum region feature by testing if"
> + " we can set regions successfully and check if the corresponding CRC"
> + " values are as expected.");
> +
> +typedef uint64_t u64;
> +typedef uint32_t u32;
> +typedef uint8_t u8;
> +
> +#define CRTC_SET_NUM 2
> +int crtc_set_num;
> +
> +enum roi_type {
> + ROI_TYPE_FIRST, // 100, 100, 130, 130
> + ROI_TYPE_BOTTOM, // 1060, 100, 1090, 130
> + ROI_TYPE_RIGHT, // 100, 130, 130, 160
> + ROI_TYPE_RIGHT_BOTTOM, // 1060, 130, 1090, 160
> + ROI_TYPE_NUM,
> +};
> +
> +typedef struct drm_checksum_region roi_t;
> +typedef struct drm_checksum_crc crc_t;
> +
> +struct data_basic {
> + struct {
> + igt_fb_t fb;
> + roi_t roi[ROI_TYPE_NUM];
> + } input;
> + struct {
> + roi_t *roi[ROI_TYPE_NUM];
> + crc_t *crc[ROI_TYPE_NUM];
> + crc_t *crc_hold[ROI_TYPE_NUM];
> + } output;
> +};
> +
> +struct data_switching {
> + struct {
> + igt_fb_t fb[2];
> + roi_t roi_window;
> + roi_t roi_full_screen;
> + } input;
> + struct {
> + crc_t *crc_window[2];
> + crc_t *crc_full_screen[2];
> + } output;
> +};
> +
> +typedef struct {
> + u8 crtc_id;
> + int connector_type;
> + igt_plane_t *primary;
> + igt_output_t *output;
> + igt_pipe_t *pipe;
> + igt_pipe_crc_t *pipe_crc;
> + enum pipe pipe_id;
> + void *data;
> +} set_t;
> +
> +/* global data */
> +typedef struct data {
> + struct igt_fb pattern_fb_info;
> + int fd;
> + igt_display_t display;
> + bool use_virtual_connector;
> + set_t set[CRTC_SET_NUM];
> +} data_t;
> +
> +/* Use mode 1920x1080 */
> +static drmModeModeInfo _mode = {
> + 148500,
> + 1920, 2008, 2052, 2200, 0,
> + 1080, 1084, 1089, 1125, 0,
> + 60, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC | DRM_MODE_FLAG_PIC_AR_16_9,
> + 0x40, "1920x1080"
> +};
> +
> +static void draw_color_roi(igt_fb_t *fb, roi_t *roi,
> + int r, int g, int b)
> +{
> + cairo_t *cr = igt_get_cairo_ctx(fb->fd, fb);
> +
> + igt_paint_color(cr,
> + roi->x_start, roi->y_start, roi->x_end, roi->y_end,
> + r, g, b);
> + igt_put_cairo_ctx(cr);
> +}
> +
> +/* color pattern for DP */
> +static void draw_color_pattern_DP(igt_fb_t *fb)
> +{
> + cairo_t *cr = igt_get_cairo_ctx(fb->fd, fb);
> +
> + igt_paint_color(cr, 0, 0, fb->width/2, fb->height, 100, 255, 0);
> + igt_paint_color(cr, fb->width/2, 0, fb->width, fb->height, 0, 133, 204);
> + igt_put_cairo_ctx(cr);
> +}
> +
> +/* color pattern for HDMI */
> +static void draw_color_pattern_HDMI(igt_fb_t *fb)
> +{
> + cairo_t *cr = igt_get_cairo_ctx(fb->fd, fb);
> +
> + igt_paint_color(cr, 0, 0, fb->width/2, fb->height, 0, 200, 223);
> + igt_paint_color(cr, fb->width/2, 0, fb->width, fb->height, 223, 200, 1);
> + igt_put_cairo_ctx(cr);
> +}
> +
> +/* prepare data and set */
> +static void test_init(data_t *data)
> +{
> + igt_display_t *display = &data->display;
> + set_t *set;
> + drmModeConnector *conn;
> + drmModeModeInfo *mode = &_mode;
> +
> + igt_info("board has %d outputs\n", display->n_outputs);
> +
> + for (int i = 0; i < display->n_outputs; i++) {
> + conn = display->outputs[i].config.connector;
> + if (conn->connection != DRM_MODE_CONNECTED)
> + continue;
> +
> + if (conn->connector_type != DRM_MODE_CONNECTOR_HDMIA &&
> + conn->connector_type != DRM_MODE_CONNECTOR_DisplayPort)
> + continue;
> +
> + set = &data->set[crtc_set_num];
> + set->connector_type = conn->connector_type;
> + set->crtc_id = i;
> + set->pipe_id = i;
> + set->pipe = &display->pipes[i];
> + set->primary = igt_pipe_get_plane_type(set->pipe, DRM_PLANE_TYPE_PRIMARY);
> + set->output = &display->outputs[i];
> +
> + igt_output_set_pipe(set->output, set->pipe_id);
> + igt_output_override_mode(set->output, mode);
> +
> + crtc_set_num += 1;
> + if (crtc_set_num == CRTC_SET_NUM)
> + break;
> + }
> +
> + igt_info("crtc_set_num = %d\n", crtc_set_num);
> +}
> +
> +static bool roi_compare(roi_t *a, roi_t *b)
> +{
> + return (a->x_start == b->x_start &&
> + a->y_start == b->y_start &&
> + a->x_end == b->x_end &&
> + a->y_end == b->y_end);
> +}
> +
> +static bool crc_compare(crc_t *a, crc_t *b)
> +{
> + return (a->crc_r == b->crc_r &&
> + a->crc_g == b->crc_g &&
> + a->crc_b == b->crc_b);
> +}
> +
> +static void
> +disable_checksum_region_from_property(data_t *data)
> +{
> + set_t *set;
> + roi_t roi = {0};
> +
> + for (int i = 0; i < crtc_set_num; i++) {
> + set = &data->set[i];
> + igt_require(igt_pipe_obj_has_prop(set->pipe, IGT_CRTC_CHECKSUM_REGION));
> + igt_pipe_obj_replace_prop_blob(set->pipe, IGT_CRTC_CHECKSUM_REGION, &roi, sizeof(roi));
> + }
> +}
> +
> +static void
> +set_roi_from_property(igt_pipe_t *pipe, roi_t *roi)
> +{
> + igt_require(igt_pipe_obj_has_prop(pipe, IGT_CRTC_CHECKSUM_REGION));
> + igt_pipe_obj_replace_prop_blob(pipe, IGT_CRTC_CHECKSUM_REGION, roi, sizeof(roi_t));
> +}
> +
> +static void
> +set_roi(data_t *data, set_t *set, roi_t *roi)
> +{
> + set_roi_from_property(set->pipe, roi);
> + igt_info("Set roi, x_start:%4d, y_start:%4d, x_end:%4d, y_end:%4d",
> + roi->x_start, roi->y_start, roi->x_end, roi->y_end);
> + igt_info("\t");
> +}
> +
> +static roi_t *
> +get_roi_from_property(int fd, igt_pipe_t *pipe)
> +{
> + drmModePropertyBlobPtr blob;
> + u64 blob_id = igt_pipe_obj_get_prop(pipe, IGT_CRTC_CHECKSUM_REGION);
> +
> + igt_require(igt_pipe_obj_has_prop(pipe, IGT_CRTC_CHECKSUM_REGION));
> +
> + blob = drmModeGetPropertyBlob(fd, blob_id);
> + if (!blob)
> + return NULL;
> +
> + return (roi_t *) blob->data;
> +}
> +
> +static void
> +get_roi(data_t *data, set_t *set, roi_t **roi)
> +{
> + *roi = get_roi_from_property(data->display.drm_fd, set->pipe);
> + if (*roi) {
> + igt_info("get ROI from properties: ");
> + igt_info("0x%04x 0x%04x 0x%04x 0x%04x, %4d",
> + (*roi)->x_start, (*roi)->y_start,
> + (*roi)->x_end, (*roi)->y_end,
> + (*roi)->checksum_region_enable);
> + }
> + igt_info("\t");
> +}
> +
> +static crc_t *
> +get_crc_from_property(int fd, igt_pipe_t *pipe)
> +{
> + drmModePropertyBlobPtr blob;
> + u64 blob_id = igt_pipe_obj_get_prop(pipe, IGT_CRTC_CHECKSUM_CRC);
> +
> + igt_require(igt_pipe_obj_has_prop(pipe, IGT_CRTC_CHECKSUM_CRC));
> +
> + blob = drmModeGetPropertyBlob(fd, blob_id);
> + if (!blob)
> + return NULL;
> +
> + return (crc_t *) blob->data;
> +}
> +
> +static void
> +get_crc(data_t *data, set_t *set, crc_t **crc)
> +{
> + *crc = get_crc_from_property(data->display.drm_fd, set->pipe);
> + if (*crc) {
> + igt_info("get CRC from properties: ");
> + igt_info("0x%04x 0x%04x 0x%04x, %4d",
> + (*crc)->crc_r, (*crc)->crc_g, (*crc)->crc_b, (*crc)->frame_count);
> + }
> + igt_info("\t\t");
> +}
> +
> +static void
> +test_basic_init(data_t *data, struct data_basic *_basic)
> +{
> + drmModeModeInfo *mode = &_mode;
> + set_t *set;
> + struct data_basic *basic;
> +
> + igt_info("\n");
> +
> + for (int i = 0; i < crtc_set_num; i++) {
> + set = &data->set[i];
> + basic = &_basic[i];
> +
> + /* init data */
> + basic->input.roi[ROI_TYPE_FIRST].x_start = 100;
> + basic->input.roi[ROI_TYPE_FIRST].y_start = 100;
> + basic->input.roi[ROI_TYPE_FIRST].x_end = 130;
> + basic->input.roi[ROI_TYPE_FIRST].y_end = 130;
> + basic->input.roi[ROI_TYPE_FIRST].checksum_region_enable = 1;
> +
> + basic->input.roi[ROI_TYPE_RIGHT].x_start = 1060;
> + basic->input.roi[ROI_TYPE_RIGHT].y_start = 100;
> + basic->input.roi[ROI_TYPE_RIGHT].x_end = 1100;
> + basic->input.roi[ROI_TYPE_RIGHT].y_end = 130;
> + basic->input.roi[ROI_TYPE_RIGHT].checksum_region_enable = 1;
> +
> + basic->input.roi[ROI_TYPE_BOTTOM].x_start = 100;
> + basic->input.roi[ROI_TYPE_BOTTOM].y_start = 130;
> + basic->input.roi[ROI_TYPE_BOTTOM].x_end = 130;
> + basic->input.roi[ROI_TYPE_BOTTOM].y_end = 160;
> + basic->input.roi[ROI_TYPE_BOTTOM].checksum_region_enable = 1;
> +
> + basic->input.roi[ROI_TYPE_RIGHT_BOTTOM].x_start = 1060;
> + basic->input.roi[ROI_TYPE_RIGHT_BOTTOM].y_start = 130;
> + basic->input.roi[ROI_TYPE_RIGHT_BOTTOM].x_end = 1100;
> + basic->input.roi[ROI_TYPE_RIGHT_BOTTOM].y_end = 160;
> + basic->input.roi[ROI_TYPE_RIGHT_BOTTOM].checksum_region_enable = 1;
> +
> + /* paint fb */
> + igt_create_fb(data->fd, mode->hdisplay, mode->vdisplay, DRM_FORMAT_XRGB8888, 0, &basic->input.fb);
> +
> + if (set->connector_type == DRM_MODE_CONNECTOR_HDMIA)
> + draw_color_pattern_HDMI(&basic->input.fb);
> + else
> + draw_color_pattern_DP(&basic->input.fb);
> +
> + igt_plane_set_fb(set->primary, &basic->input.fb);
> +
> + igt_info("Output: %s\t\t\t\t\t\t\t",
> + (set->connector_type == DRM_MODE_CONNECTOR_HDMIA) ? "HDMI" : "DP");
> + }
> +}
> +
> +static void test_basic_validate(struct data_basic *_basic)
> +{
> + struct data_basic *basic;
> + roi_t *roi, *roi_return;
> + crc_t **crc, **crc_hold;
> +
> + igt_info("************\n");
> + for (int i = 0; i < crtc_set_num; i++) {
> + basic = &_basic[i];
> +
> + for (int type = 0; type < ROI_TYPE_NUM; type++) {
> + roi = &basic->input.roi[type];
> + roi_return = basic->output.roi[type];
> + if (!roi_compare(roi, roi_return))
> + igt_assert_f(false, "ROI values are not as expected\n");
> + }
> +
> + crc = basic->output.crc;
> + if (!crc_compare(crc[ROI_TYPE_FIRST], crc[ROI_TYPE_BOTTOM]) &&
> + !crc_compare(crc[ROI_TYPE_RIGHT], crc[ROI_TYPE_RIGHT_BOTTOM]))
> + igt_assert_f(false, "CRC values are not as expected\n");
> +
> + if (crc[ROI_TYPE_FIRST]->frame_count != 2 ||
> + crc[ROI_TYPE_BOTTOM]->frame_count != 2 ||
> + crc[ROI_TYPE_RIGHT]->frame_count != 2 ||
> + crc[ROI_TYPE_RIGHT_BOTTOM]->frame_count != 2)
> + igt_assert_f(false, "CRC frame_count are not as expected\n");
> +
> + crc_hold = basic->output.crc_hold;
> + if (!crc_compare(crc[ROI_TYPE_FIRST], crc_hold[ROI_TYPE_FIRST]) &&
> + !crc_compare(crc[ROI_TYPE_BOTTOM], crc_hold[ROI_TYPE_BOTTOM]) &&
> + !crc_compare(crc[ROI_TYPE_RIGHT], crc_hold[ROI_TYPE_RIGHT]) &&
> + !crc_compare(crc[ROI_TYPE_RIGHT_BOTTOM], crc_hold[ROI_TYPE_RIGHT_BOTTOM]))
> + igt_assert_f(false, "CRC values are not as expected after 5 seconds\n");
> +
> + }
> +
> + igt_info("Test checksum_region basic passed\n");
> +}
> +
> +static void
> +test_basic_case(data_t *data, enum roi_type type, struct data_basic *basic)
> +{
> + set_t *set;
> + roi_t *roi;
> + roi_t **roi_return;
> + crc_t **crc;
> +
> + igt_info("\n");
> +
> + /* set roi for each CRTC */
> + for (int i = 0; i < crtc_set_num; i++) {
> + set = &data->set[i];
> + roi = &basic[i].input.roi[type];
> + set_roi(data, set, roi);
> + }
> + igt_display_commit_atomic(&data->display, DRM_MODE_ATOMIC_ALLOW_MODESET, NULL); // commit new ROI
> + igt_info("\n");
> +
> +
> + /* get the crc for check */
> + for (int i = 0; i < crtc_set_num; i++) {
> + set = &data->set[i];
> + crc = &basic[i].output.crc[type];
> + get_crc(data, set, crc);
> + }
> + igt_info("\n");
> +
> +
> + /* sleep and get crc for check again*/
> + sleep(3);
> + for (int i = 0; i < crtc_set_num; i++) {
> + set = &data->set[i];
> + crc = &basic[i].output.crc_hold[type];
> + get_crc(data, set, crc);
> + }
> + igt_info("\n");
> +
> +
> + /* get roi for check */
> + for (int i = 0; i < crtc_set_num; i++) {
> + set = &data->set[i];
> + roi_return = &basic[i].output.roi[type];
> + get_roi(data, set, roi_return);
> + }
> + igt_info("\n");
> +}
> +
> +static void test_fini(data_t *data)
> +{
> + disable_checksum_region_from_property(data);
> + igt_display_commit_atomic(&data->display, DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
> +}
> +
> +static void
> +test_checksum_region_basic(data_t *data)
> +{
> + struct data_basic d_basic[CRTC_SET_NUM] = {0};
> +
> + /* test basic init */
> + test_basic_init(data, d_basic);
> +
> + test_basic_case(data, ROI_TYPE_FIRST, d_basic);
> + test_basic_case(data, ROI_TYPE_RIGHT, d_basic);
> + test_basic_case(data, ROI_TYPE_BOTTOM, d_basic);
> + test_basic_case(data, ROI_TYPE_RIGHT_BOTTOM, d_basic);
> +
> + test_basic_validate(d_basic);
> +
> + test_fini(data);
> +}
> +
> +static void
> +test_switching_validate(struct data_switching *switching)
> +{
> + crc_t *crc_a, *crc_b;
> +
> + igt_info("************\n");
> + for (int i = 0; i < crtc_set_num; i++) {
> + crc_a = switching[i].output.crc_window[0];
> + crc_b = switching[i].output.crc_window[1];
> +
> + if (!crc_compare(crc_a, crc_b))
> + igt_assert_f(false, "Window crc values should be the same\n");
> +
> +
> + crc_a = switching[i].output.crc_full_screen[0];
> + crc_b = switching[i].output.crc_full_screen[1];
> +
> + if (crc_compare(crc_a, crc_b))
> + igt_assert_f(false, "Full screen crc values should not be the same\n");
> + }
> +
> + igt_info("Test checksum_region switching passed\n");
> +}
> +
> +static void
> +test_switching_init(data_t *data, struct data_switching *_switching)
> +{
> + drmModeModeInfo *mode = &_mode;
> + roi_t *roi;
> + set_t *set;
> + struct data_switching *switching;
> + struct igt_fb *fb;
> +
> + igt_info("\n");
> +
> + for (int i = 0; i < crtc_set_num; i++) {
> + switching = &_switching[i];
> + set = &data->set[i];
> +
> + /* crc window roi */
> + roi = &switching->input.roi_window;
> + roi->x_start = 100;
> + roi->y_start = 100;
> + roi->x_end = 130;
> + roi->y_end = 130;
> + roi->checksum_region_enable = 1;
> +
> + /* full screen roi */
> + roi = &switching->input.roi_full_screen;
> + roi->x_start = 0;
> + roi->y_start = 0;
> + roi->x_end = mode->hdisplay;
> + roi->y_end = mode->vdisplay;
> + roi->checksum_region_enable = 1;
> +
> + /* paint fb with blue background, red rect */
> + fb = &switching->input.fb[0];
> + igt_create_fb(data->fd, mode->hdisplay, mode->vdisplay,
> + DRM_FORMAT_XRGB8888, 0, fb);
> + draw_color_roi(fb, &switching->input.roi_full_screen, 0, 0, 255);
> + draw_color_roi(fb, &switching->input.roi_window, 255, 0, 0);
> +
> +
> + /* paint fb with green background, red retc */
> + fb = &switching->input.fb[1];
> + igt_create_fb(data->fd, mode->hdisplay, mode->vdisplay,
> + DRM_FORMAT_XRGB8888, 0, fb);
> + draw_color_roi(fb, &switching->input.roi_full_screen, 0, 255, 0);
> + draw_color_roi(fb, &switching->input.roi_window, 255, 0, 0);
> + igt_info("Output: %s\t\t\t\t\t\t\t",
> + (set->connector_type == DRM_MODE_CONNECTOR_HDMIA) ? "HDMI" : "DP");
> + }
> +}
> +
> +static void
> +test_switching_case(data_t *data, struct data_switching *switching, bool is_window)
> +{
> + set_t *set;
> + igt_fb_t *fb;
> + roi_t *roi, *roi_return;
> + crc_t **crc;
> +
> + igt_info("\n");
> +
> + /* change pattern */
> + for (int i = 0; i < crtc_set_num; i++) {
> + set = &data->set[i];
> + fb = &switching[i].input.fb[0];
> + igt_plane_set_fb(set->primary, fb);
> + }
> +
> + /* set crc window roi */
> + for (int i = 0; i < crtc_set_num; i++) {
> + set = &data->set[i];
> + roi = (is_window) ? &switching[i].input.roi_window
> + : &switching[i].input.roi_full_screen;
> + set_roi(data, set, roi);
> + }
> + igt_display_commit_atomic(&data->display, DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
> + igt_info("\n");
> +
> +
> + /* get crc window roi and print for debug */
> + for (int i = 0; i < crtc_set_num; i++) {
> + set = &data->set[i];
> + get_roi(data, set, &roi_return);
> + }
> + igt_info("\n");
> +
> +
> + /* get the window crc */
> + for (int i = 0; i < crtc_set_num; i++) {
> + set = &data->set[i];
> + crc = (is_window) ? &switching[i].output.crc_window[0]
> + : &switching[i].output.crc_full_screen[0];
> + get_crc(data, set, crc);
> + }
> + igt_info("\n");
> +
> +
> + /* change pattern */
> + for (int i = 0; i < crtc_set_num; i++) {
> + set = &data->set[i];
> + fb = &switching[i].input.fb[1];
> + igt_plane_set_fb(set->primary, fb);
> + }
> + igt_display_commit_atomic(&data->display, DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
> +
> + /* wait 1 frame for new crc computed */
> + for (int i = 0; i < crtc_set_num; i++) {
> + set = &data->set[i];
> + igt_wait_for_vblank_count(data->fd, set->pipe->crtc_offset, 1);
> + }
> +
> + /* get the window crc */
> + for (int i = 0; i < crtc_set_num; i++) {
> + set = &data->set[i];
> + crc = (is_window) ? &switching[i].output.crc_window[1]
> + : &switching[i].output.crc_full_screen[1];
> + get_crc(data, set, crc);
> + }
> + igt_info("\n");
> +}
> +
> +static void
> +test_checksum_region_switching(data_t *data)
> +{
> + struct data_switching switching[CRTC_SET_NUM] = {0};
> +
> + /* test basic init */
> + test_switching_init(data, switching);
> +
> + /* crc_window */
> + test_switching_case(data, switching, true);
> +
> + /* full screen */
> + test_switching_case(data, switching, false);
> +
> + test_switching_validate(switching);
> +
> + test_fini(data);
> +}
> +
> +igt_main
> +{
> + data_t data = {0};
> +
> + igt_skip_on_simulation();
> +
> + igt_fixture
> + {
> + data.fd = drm_open_driver_master(DRIVER_AMDGPU);
> + kmstest_set_vt_graphics_mode();
> + igt_display_require(&data.display, data.fd);
> + igt_require(data.display.is_atomic);
> + igt_display_require_output(&data.display);
> + test_init(&data);
> + }
> +
> +
> + igt_describe("Test basic region configuration and validate the CRC.");
> + igt_subtest("checksum-region-basic")
> + test_checksum_region_basic(&data);
> +
> + igt_describe("Test switching between window region and fullscreen region and validate the CRC.");
> + igt_subtest("checksum-region-switching")
> + test_checksum_region_switching(&data);
> +
> + igt_fixture
> + {
> + igt_display_fini(&data.display);
> + close(data.fd);
> + }
> +}
> diff --git a/tests/amdgpu/meson.build b/tests/amdgpu/meson.build
> index 24843de73..e2f03bb49 100644
> --- a/tests/amdgpu/meson.build
> +++ b/tests/amdgpu/meson.build
> @@ -7,6 +7,7 @@ if libdrm_amdgpu.found()
> 'amd_basic',
> 'amd_bo',
> 'amd_bypass',
> + 'amd_checksum_region',
> 'amd_color',
> 'amd_cp_dma_misc',
> 'amd_cs_nop',
> --
> 2.34.1
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [igt-dev] [PATCH v3 1/2] drm-uapi/drm_mode: sync with latest uAPI changes for checksum_region
2023-07-11 17:59 ` [igt-dev] [PATCH v3 1/2] " Kamil Konieczny
@ 2023-07-14 9:23 ` Liu, HaoPing (Alan)
2023-07-17 11:27 ` Zbigniew Kempczyński
0 siblings, 1 reply; 7+ messages in thread
From: Liu, HaoPing (Alan) @ 2023-07-14 9:23 UTC (permalink / raw)
To: Kamil Konieczny, igt-dev, Harry.Wentland, Lili.Gong, Wayne.Lin
Hi Kamil,
On 2023/7/12 上午 01:59, Kamil Konieczny wrote:
> Hi Alan,
>
> On 2023-07-05 at 23:26:05 +0800, Alan Liu wrote:
>> Add struct drm_checksum_region and struct drm_checksum_crc as the
>> userspace data for using checksum_region feature.
>>
>> Signed-off-by: Alan Liu <HaoPing.Liu@amd.com>
> Please send this as a separate patch, write also to which repo
> are you sync-ing, is it drm-tip?
I am trying to submit patches of checksum_region feature to dri-devel
(https://patchwork.freedesktop.org/series/119499/).
This patch series is the IGT for testing checksum_region, and this
particular patch adds the structs in drm_mode.h for IGT userspace to
test checksum_region.
I think I've already collected all the changes to drm_mode.h into this
patch. Do you want me to separate this patch into a new patch series?
Thanks,
Alan
> Regards,
> Kamil
>
>> ---
>> include/drm-uapi/drm_mode.h | 42 +++++++++++++++++++++++++++++++++++++
>> 1 file changed, 42 insertions(+)
>>
>> diff --git a/include/drm-uapi/drm_mode.h b/include/drm-uapi/drm_mode.h
>> index e4a2570a6..dec073921 100644
>> --- a/include/drm-uapi/drm_mode.h
>> +++ b/include/drm-uapi/drm_mode.h
>> @@ -1209,6 +1209,48 @@ struct drm_mode_rect {
>> __s32 y2;
>> };
>>
>> +/**
>> + * struct drm_checksum_region - The enablement and region of checksum_region
>> + * @x_start: Horizontal starting coordinate of the region.
>> + * @y_start: Vertical starting coordinate of the region.
>> + * @x_end: Horizontal ending coordinate of the region.
>> + * @y_end: Vertical ending coordinate of the region.
>> + * @checksum_region_enable: To enable or disable checksum_region.
>> + *
>> + * Userspace uses this structure to configure the region and enablement for
>> + * checksum_region. Userspace should not submit a region out of the displayable
>> + * region because there is nothing to display and need protection.
>> + */
>> +struct drm_checksum_region {
>> + __u32 x_start;
>> + __u32 y_start;
>> + __u32 x_end;
>> + __u32 y_end;
>> + __u8 checksum_region_enable;
>> + __u8 pad[7];
>> +};
>> +
>> +/**
>> + * struct drm_checksum_crc - The CRC value of the corresponding checksum region.
>> + * @crc_r: CRC value of red color.
>> + * @crc_g: CRC value of green color.
>> + * @crc_b: CRC value of blue color.
>> + * @frame_count: a referenced frame count to indicate which frame the CRC values
>> + * are generated at.
>> + *
>> + * Userspace uses this structure to retrieve the CRC values of the current
>> + * checksum region. @frame_count will be reset once a new region is updated or
>> + * it reaches a maximum value. Currently these CRC values are designed to
>> + * be validated with pre-saved CRC values, so userspace doesn't need to concern
>> + * about the algorithm used to compute the CRC.
>> + */
>> +struct drm_checksum_crc {
>> + __u32 crc_r;
>> + __u32 crc_g;
>> + __u32 crc_b;
>> + __u32 frame_count;
>> +};
>> +
>> #if defined(__cplusplus)
>> }
>> #endif
>> --
>> 2.34.1
>>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [igt-dev] [PATCH v3 1/2] drm-uapi/drm_mode: sync with latest uAPI changes for checksum_region
2023-07-14 9:23 ` Liu, HaoPing (Alan)
@ 2023-07-17 11:27 ` Zbigniew Kempczyński
0 siblings, 0 replies; 7+ messages in thread
From: Zbigniew Kempczyński @ 2023-07-17 11:27 UTC (permalink / raw)
To: Liu, HaoPing (Alan); +Cc: igt-dev, Lili.Gong
On Fri, Jul 14, 2023 at 05:23:39PM +0800, Liu, HaoPing (Alan) wrote:
> Hi Kamil,
>
>
> On 2023/7/12 上午 01:59, Kamil Konieczny wrote:
> > Hi Alan,
> >
> > On 2023-07-05 at 23:26:05 +0800, Alan Liu wrote:
> > > Add struct drm_checksum_region and struct drm_checksum_crc as the
> > > userspace data for using checksum_region feature.
> > >
> > > Signed-off-by: Alan Liu <HaoPing.Liu@amd.com>
> > Please send this as a separate patch, write also to which repo
> > are you sync-ing, is it drm-tip?
>
> I am trying to submit patches of checksum_region feature to dri-devel
> (https://patchwork.freedesktop.org/series/119499/).
>
> This patch series is the IGT for testing checksum_region, and this
> particular patch adds the structs in drm_mode.h for IGT userspace to test
> checksum_region.
>
> I think I've already collected all the changes to drm_mode.h into this
> patch. Do you want me to separate this patch into a new patch series?
I've just take a look to uapi drm_mode.h change and it is not officially
accepted. In this case we're not merging not ready uapi.
Introduce your change by localizing it in the test (for example
struct local_drm_checksum_region {
...
}
Use it in the test, and when your uapi will be accepted you may
merge drm_mode.h file, removing above local struct replacing by
drm_checksum_region.
--
Zbigniew
>
>
> Thanks,
>
> Alan
>
> > Regards,
> > Kamil
> >
> > > ---
> > > include/drm-uapi/drm_mode.h | 42 +++++++++++++++++++++++++++++++++++++
> > > 1 file changed, 42 insertions(+)
> > >
> > > diff --git a/include/drm-uapi/drm_mode.h b/include/drm-uapi/drm_mode.h
> > > index e4a2570a6..dec073921 100644
> > > --- a/include/drm-uapi/drm_mode.h
> > > +++ b/include/drm-uapi/drm_mode.h
> > > @@ -1209,6 +1209,48 @@ struct drm_mode_rect {
> > > __s32 y2;
> > > };
> > > +/**
> > > + * struct drm_checksum_region - The enablement and region of checksum_region
> > > + * @x_start: Horizontal starting coordinate of the region.
> > > + * @y_start: Vertical starting coordinate of the region.
> > > + * @x_end: Horizontal ending coordinate of the region.
> > > + * @y_end: Vertical ending coordinate of the region.
> > > + * @checksum_region_enable: To enable or disable checksum_region.
> > > + *
> > > + * Userspace uses this structure to configure the region and enablement for
> > > + * checksum_region. Userspace should not submit a region out of the displayable
> > > + * region because there is nothing to display and need protection.
> > > + */
> > > +struct drm_checksum_region {
> > > + __u32 x_start;
> > > + __u32 y_start;
> > > + __u32 x_end;
> > > + __u32 y_end;
> > > + __u8 checksum_region_enable;
> > > + __u8 pad[7];
> > > +};
> > > +
> > > +/**
> > > + * struct drm_checksum_crc - The CRC value of the corresponding checksum region.
> > > + * @crc_r: CRC value of red color.
> > > + * @crc_g: CRC value of green color.
> > > + * @crc_b: CRC value of blue color.
> > > + * @frame_count: a referenced frame count to indicate which frame the CRC values
> > > + * are generated at.
> > > + *
> > > + * Userspace uses this structure to retrieve the CRC values of the current
> > > + * checksum region. @frame_count will be reset once a new region is updated or
> > > + * it reaches a maximum value. Currently these CRC values are designed to
> > > + * be validated with pre-saved CRC values, so userspace doesn't need to concern
> > > + * about the algorithm used to compute the CRC.
> > > + */
> > > +struct drm_checksum_crc {
> > > + __u32 crc_r;
> > > + __u32 crc_g;
> > > + __u32 crc_b;
> > > + __u32 frame_count;
> > > +};
> > > +
> > > #if defined(__cplusplus)
> > > }
> > > #endif
> > > --
> > > 2.34.1
> > >
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-07-17 11:28 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-05 15:26 [igt-dev] [PATCH v3 1/2] drm-uapi/drm_mode: sync with latest uAPI changes for checksum_region Alan Liu
2023-07-05 15:26 ` [igt-dev] [PATCH v3 2/2] tests/amdgpu/amd_checksum_region: Add test " Alan Liu
2023-07-11 18:01 ` Kamil Konieczny
2023-07-05 16:42 ` [igt-dev] ✗ Fi.CI.BAT: failure for series starting with [v3,1/2] drm-uapi/drm_mode: sync with latest uAPI changes " Patchwork
2023-07-11 17:59 ` [igt-dev] [PATCH v3 1/2] " Kamil Konieczny
2023-07-14 9:23 ` Liu, HaoPing (Alan)
2023-07-17 11:27 ` Zbigniew Kempczyński
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox