drm: Add a new plane property to send damage during plane update

Selftest for drm damage helper iterator functions.

Cc [email protected]

Cc Daniel Vetter <[email protected]>

Cc Pekka Paalanen <[email protected]>

Signed-off-by Deepak Rawat <[email protected]>

---
 drivers/gpu/drm/selftests/Makefile            |   3 +-
 .../selftests/drm_damage_helper_selftests.h   |  22 +
 .../drm/selftests/test-drm_damage_helper.c    | 844 ++++++++++++++++++
 3 files changed, 868 insertions(+), 1 deletion(-)
 create mode 100644 drivers/gpu/drm/selftests/drm_damage_helper_selftests.h
 create mode 100644 drivers/gpu/drm/selftests/test-drm_damage_helper.c

drivers/gpu/drm/selftests/Makefile +0 -0

index 9fc349fa18e9..88ac216f5962 100644

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h new file +22 -0

new file mode 100644
index 000000000000..3a1cbe05bef0
@@ -0,0 +1,22 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+selftest(damage_iter_no_damage, igt_damage_iter_no_damage)
+selftest(damage_iter_no_damage_fractional_src, igt_damage_iter_no_damage_fractional_src)
+selftest(damage_iter_no_damage_src_moved, igt_damage_iter_no_damage_src_moved)
+selftest(damage_iter_no_damage_fractional_src_moved, igt_damage_iter_no_damage_fractional_src_moved)
+selftest(damage_iter_no_damage_not_visible, igt_damage_iter_no_damage_not_visible)
+selftest(damage_iter_no_damage_no_crtc, igt_damage_iter_no_damage_no_crtc)
+selftest(damage_iter_no_damage_no_fb, igt_damage_iter_no_damage_no_fb)
+selftest(damage_iter_simple_damage, igt_damage_iter_simple_damage)
+selftest(damage_iter_single_damage, igt_damage_iter_single_damage)
+selftest(damage_iter_single_damage_intersect_src, igt_damage_iter_single_damage_intersect_src)
+selftest(damage_iter_single_damage_outside_src, igt_damage_iter_single_damage_outside_src)
+selftest(damage_iter_single_damage_fractional_src, igt_damage_iter_single_damage_fractional_src)
+selftest(damage_iter_single_damage_intersect_fractional_src, igt_damage_iter_single_damage_intersect_fractional_src)
+selftest(damage_iter_single_damage_outside_fractional_src, igt_damage_iter_single_damage_outside_fractional_src)
+selftest(damage_iter_single_damage_src_moved, igt_damage_iter_single_damage_src_moved)
+selftest(damage_iter_single_damage_fractional_src_moved, igt_damage_iter_single_damage_fractional_src_moved)
+selftest(damage_iter_damage, igt_damage_iter_damage)
+selftest(damage_iter_damage_one_intersect, igt_damage_iter_damage_one_intersect)
+selftest(damage_iter_damage_one_outside, igt_damage_iter_damage_one_outside)
+selftest(damage_iter_damage_src_moved, igt_damage_iter_damage_src_moved)
+selftest(damage_iter_damage_not_visible, igt_damage_iter_damage_not_visible)

drivers/gpu/drm/selftests/test-drm_damage_helper.c new file +844 -0

new file mode 100644
index 000000000000..17754734c47a
@@ -0,0 +1,844 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Test case for drm_damage_helper functions
+ */
+
+#define pr_fmt(fmt) "drm_damage_helper: " fmt
+
+#include <linux/module.h>
+#include <drm/drm_damage_helper.h>
+
+#define TESTS "drm_damage_helper_selftests.h"
+#include "drm_selftest.h"
+
+#define FAIL(test, msg, ...) \
+	do { \
+		if (test) { \
+			pr_err("%s/%u: " msg, __FUNCTION__, __LINE__, ##__VA_ARGS__); \
+			return -EINVAL; \
+		} \
+	} while (0)
+
+#define FAIL_ON(x) FAIL((x), "%s", "FAIL_ON(" __stringify(x) ")\n")
+
+static void set_plane_src(struct drm_plane_state *state, int x1, int y1, int x2,
+			  int y2)
+{
+	state->src.x1 = x1;
+	state->src.y1 = y1;
+	state->src.x2 = x2;
+	state->src.y2 = y2;
+}
+
+static void set_damage_clip(struct drm_mode_rect *r, int x1, int y1, int x2,
+			    int y2)
+{
+	r->x1 = x1;
+	r->y1 = y1;
+	r->x2 = x2;
+	r->y2 = y2;
+}
+
+static void set_damage_blob(struct drm_property_blob *damage_blob,
+			    struct drm_mode_rect *r, uint32_t size)
+{
+	damage_blob->length = size;
+	damage_blob->data = r;
+}
+
+static void set_plane_damage(struct drm_plane_state *state,
+			     struct drm_property_blob *damage_blob)
+{
+	state->fb_damage_clips = damage_blob;
+}
+
+static bool check_damage_clip(struct drm_plane_state *state, struct drm_rect *r,
+			      int x1, int y1, int x2, int y2)
+{
+	/*
+	 * Round down x1/y1 and round up x2/y2. This is because damage is not in
+	 * 16.16 fixed point so to catch all pixels.
+	 */
+	int src_x1 = state->src.x1 >> 16;
+	int src_y1 = state->src.y1 >> 16;
+	int src_x2 = (state->src.x2 >> 16) + !!(state->src.x2 & 0xFFFF);
+	int src_y2 = (state->src.y2 >> 16) + !!(state->src.y2 & 0xFFFF);
+
+	if (x1 >= x2 || y1 >= y2) {
+		pr_err("Cannot have damage clip with no dimention.\n");
+		return false;
+	}
+
+	if (x1 < src_x1 || y1 < src_y1 || x2 > src_x2 || y2 > src_y2) {
+		pr_err("Damage cannot be outside rounded plane src.\n");
+		return false;
+	}
+
+	if (r->x1 != x1 || r->y1 != y1 || r->x2 != x2 || r->y2 != y2) {
+		pr_err("Damage = %d %d %d %d\n", r->x1, r->y1, r->x2, r->y2);
+		return false;
+	}
+
+	return true;
+}
+
+static int igt_damage_iter_no_damage(void *ignored)
+{
+	struct drm_atomic_helper_damage_iter iter;
+	struct drm_plane_state old_state;
+	struct drm_rect clip;
+	uint32_t num_hits = 0;
+
+	struct drm_framebuffer fb = {
+		.width = 2048,
+		.height = 2048
+	};
+
+	struct drm_plane_state state = {
+		.crtc = ZERO_SIZE_PTR,
+		.fb = &fb,
+		.visible = true,
+	};
+
+	/* Plane src same as fb size. */
+	set_plane_src(&old_state, 0, 0, fb.width << 16, fb.height << 16);
+	set_plane_src(&state, 0, 0, fb.width << 16, fb.height << 16);
+	drm_atomic_helper_damage_iter_init(&iter, &old_state, &state);
+	drm_atomic_for_each_plane_damage(&iter, &clip)
+		num_hits++;
+
+	FAIL(num_hits != 1, "Should return plane src as damage.");
+	FAIL_ON(!check_damage_clip(&state, &clip, 0, 0, 2048, 2048));
+
+	return 0;
+}
+
+static int igt_damage_iter_no_damage_fractional_src(void *ignored)
+{
+	struct drm_atomic_helper_damage_iter iter;
+	struct drm_plane_state old_state;
+	struct drm_rect clip;
+	uint32_t num_hits = 0;
+
+	struct drm_framebuffer fb = {
+		.width = 2048,
+		.height = 2048
+	};
+
+	struct drm_plane_state state = {
+		.crtc = ZERO_SIZE_PTR,
+		.fb = &fb,
+		.visible = true,
+	};
+
+	/* Plane src has fractional part. */
+	set_plane_src(&old_state, 0x3fffe, 0x3fffe,
+		      0x3fffe + (1024 << 16), 0x3fffe + (768 << 16));
+	set_plane_src(&state, 0x3fffe, 0x3fffe,
+		      0x3fffe + (1024 << 16), 0x3fffe + (768 << 16));
+	drm_atomic_helper_damage_iter_init(&iter, &old_state, &state);
+	drm_atomic_for_each_plane_damage(&iter, &clip)
+		num_hits++;
+
+	FAIL(num_hits != 1, "Should return rounded off plane src as damage.");
+	FAIL_ON(!check_damage_clip(&state, &clip, 3, 3, 1028, 772));
+
+	return 0;
+}
+
+static int igt_damage_iter_no_damage_src_moved(void *ignored)
+{
+	struct drm_atomic_helper_damage_iter iter;
+	struct drm_plane_state old_state;
+	struct drm_rect clip;
+	uint32_t num_hits = 0;
+
+	struct drm_framebuffer fb = {
+		.width = 2048,
+		.height = 2048
+	};
+
+	struct drm_plane_state state = {
+		.crtc = ZERO_SIZE_PTR,
+		.fb = &fb,
+		.visible = true,
+	};
+
+	/* Plane src moved since old plane state. */
+	set_plane_src(&old_state, 0, 0, 1024 << 16, 768 << 16);
+	set_plane_src(&state, 10 << 16, 10 << 16,
+		      (10 + 1024) << 16, (10 + 768) << 16);
+	drm_atomic_helper_damage_iter_init(&iter, &old_state, &state);
+	drm_atomic_for_each_plane_damage(&iter, &clip)
+		num_hits++;
+
+	FAIL(num_hits != 1, "Should return plane src as damage.");
+	FAIL_ON(!check_damage_clip(&state, &clip, 10, 10, 1034, 778));
+
+	return 0;
+}
+
+static int igt_damage_iter_no_damage_fractional_src_moved(void *ignored)
+{
+	struct drm_atomic_helper_damage_iter iter;
+	struct drm_plane_state old_state;
+	struct drm_rect clip;
+	uint32_t num_hits = 0;
+
+	struct drm_framebuffer fb = {
+		.width = 2048,
+		.height = 2048
+	};
+
+	struct drm_plane_state state = {
+		.crtc = ZERO_SIZE_PTR,
+		.fb = &fb,
+		.visible = true,
+	};
+
+	/* Plane src has fractional part and it moved since old plane state. */
+	set_plane_src(&old_state, 0x3fffe, 0x3fffe,
+		      0x3fffe + (1024 << 16), 0x3fffe + (768 << 16));
+	set_plane_src(&state, 0x40002, 0x40002,
+		      0x40002 + (1024 << 16), 0x40002 + (768 << 16));
+	drm_atomic_helper_damage_iter_init(&iter, &old_state, &state);
+	drm_atomic_for_each_plane_damage(&iter, &clip)
+		num_hits++;
+
+	FAIL(num_hits != 1, "Should return plane src as damage.");
+	FAIL_ON(!check_damage_clip(&state, &clip, 4, 4, 1029, 773));
+
+	return 0;
+}
+
+static int igt_damage_iter_no_damage_not_visible(void *ignored)
+{
+	struct drm_atomic_helper_damage_iter iter;
+	struct drm_plane_state old_state;
+	struct drm_rect clip;
+	uint32_t num_hits = 0;
+
+	struct drm_framebuffer fb = {
+		.width = 2048,
+		.height = 2048
+	};
+
+	struct drm_plane_state state = {
+		.crtc = ZERO_SIZE_PTR,
+		.fb = &fb,
+		.visible = false,
+	};
+
+	set_plane_src(&old_state, 0, 0, 1024 << 16, 768 << 16);
+	set_plane_src(&state, 0, 0, 1024 << 16, 768 << 16);
+	drm_atomic_helper_damage_iter_init(&iter, &old_state, &state);
+	drm_atomic_for_each_plane_damage(&iter, &clip)
+		num_hits++;
+
+	FAIL(num_hits != 0, "Should have no damage.");
+
+	return 0;
+}
+
+static int igt_damage_iter_no_damage_no_crtc(void *ignored)
+{
+	struct drm_atomic_helper_damage_iter iter;
+	struct drm_plane_state old_state;
+	struct drm_rect clip;
+	uint32_t num_hits = 0;
+
+	struct drm_framebuffer fb = {
+		.width = 2048,
+		.height = 2048
+	};
+
+	struct drm_plane_state state = {
+		.crtc = 0,
+		.fb = &fb,
+	};
+
+	set_plane_src(&old_state, 0, 0, 1024 << 16, 768 << 16);
+	set_plane_src(&state, 0, 0, 1024 << 16, 768 << 16);
+	drm_atomic_helper_damage_iter_init(&iter, &old_state, &state);
+	drm_atomic_for_each_plane_damage(&iter, &clip)
+		num_hits++;
+
+	FAIL(num_hits != 0, "Should have no damage.");
+
+	return 0;
+}
+
+static int igt_damage_iter_no_damage_no_fb(void *ignored)
+{
+	struct drm_atomic_helper_damage_iter iter;
+	struct drm_plane_state old_state;
+	struct drm_rect clip;
+	uint32_t num_hits = 0;
+
+	struct drm_plane_state state = {
+		.crtc = ZERO_SIZE_PTR,
+		.fb = 0,
+	};
+
+	set_plane_src(&old_state, 0, 0, 1024 << 16, 768 << 16);
+	set_plane_src(&state, 0, 0, 1024 << 16, 768 << 16);
+	drm_atomic_helper_damage_iter_init(&iter, &old_state, &state);
+	drm_atomic_for_each_plane_damage(&iter, &clip)
+		num_hits++;
+
+	FAIL(num_hits != 0, "Should have no damage.");
+
+	return 0;
+}
+
+static int igt_damage_iter_simple_damage(void *ignored)
+{
+	struct drm_atomic_helper_damage_iter iter;
+	struct drm_plane_state old_state;
+	struct drm_property_blob damage_blob;
+	struct drm_mode_rect damage;
+	struct drm_rect clip;
+	uint32_t num_hits = 0;
+
+	struct drm_framebuffer fb = {
+		.width = 2048,
+		.height = 2048
+	};
+
+	struct drm_plane_state state = {
+		.crtc = ZERO_SIZE_PTR,
+		.fb = &fb,
+		.visible = true,
+	};
+
+	set_plane_src(&old_state, 0, 0, 1024 << 16, 768 << 16);
+	set_plane_src(&state, 0, 0, 1024 << 16, 768 << 16);
+	/* Damage set to plane src */
+	set_damage_clip(&damage, 0, 0, 1024, 768);
+	set_damage_blob(&damage_blob, &damage, sizeof(damage));
+	set_plane_damage(&state, &damage_blob);
+	drm_atomic_helper_damage_iter_init(&iter, &old_state, &state);
+	drm_atomic_for_each_plane_damage(&iter, &clip)
+		num_hits++;
+
+	FAIL(num_hits != 1, "Should return damage when set.");
+	FAIL_ON(!check_damage_clip(&state, &clip, 0, 0, 1024, 768));
+
+	return 0;
+}
+
+static int igt_damage_iter_single_damage(void *ignored)
+{
+	struct drm_atomic_helper_damage_iter iter;
+	struct drm_plane_state old_state;
+	struct drm_property_blob damage_blob;
+	struct drm_mode_rect damage;
+	struct drm_rect clip;
+	uint32_t num_hits = 0;
+
+	struct drm_framebuffer fb = {
+		.width = 2048,
+		.height = 2048
+	};
+
+	struct drm_plane_state state = {
+		.crtc = ZERO_SIZE_PTR,
+		.fb = &fb,
+		.visible = true,
+	};
+
+	set_plane_src(&old_state, 0, 0, 1024 << 16, 768 << 16);
+	set_plane_src(&state, 0, 0, 1024 << 16, 768 << 16);
+	set_damage_clip(&damage, 256, 192, 768, 576);
+	set_damage_blob(&damage_blob, &damage, sizeof(damage));
+	set_plane_damage(&state, &damage_blob);
+	drm_atomic_helper_damage_iter_init(&iter, &old_state, &state);
+	drm_atomic_for_each_plane_damage(&iter, &clip)
+		num_hits++;
+
+	FAIL(num_hits != 1, "Should return damage when set.");
+	FAIL_ON(!check_damage_clip(&state, &clip, 256, 192, 768, 576));
+
+	return 0;
+}
+
+static int igt_damage_iter_single_damage_intersect_src(void *ignored)
+{
+	struct drm_atomic_helper_damage_iter iter;
+	struct drm_plane_state old_state;
+	struct drm_property_blob damage_blob;
+	struct drm_mode_rect damage;
+	struct drm_rect clip;
+	uint32_t num_hits = 0;
+
+	struct drm_framebuffer fb = {
+		.width = 2048,
+		.height = 2048
+	};
+
+	struct drm_plane_state state = {
+		.crtc = ZERO_SIZE_PTR,
+		.fb = &fb,
+		.visible = true,
+	};
+
+	set_plane_src(&old_state, 0, 0, 1024 << 16, 768 << 16);
+	set_plane_src(&state, 0, 0, 1024 << 16, 768 << 16);
+	/* Damage intersect with plane src. */
+	set_damage_clip(&damage, 256, 192, 1360, 768);
+	set_damage_blob(&damage_blob, &damage, sizeof(damage));
+	set_plane_damage(&state, &damage_blob);
+	drm_atomic_helper_damage_iter_init(&iter, &old_state, &state);
+	drm_atomic_for_each_plane_damage(&iter, &clip)
+		num_hits++;
+
+	FAIL(num_hits != 1, "Should return damage clipped to src.");
+	FAIL_ON(!check_damage_clip(&state, &clip, 256, 192, 1024, 768));
+
+	return 0;
+}
+
+static int igt_damage_iter_single_damage_outside_src(void *ignored)
+{
+	struct drm_atomic_helper_damage_iter iter;
+	struct drm_plane_state old_state;
+	struct drm_property_blob damage_blob;
+	struct drm_mode_rect damage;
+	struct drm_rect clip;
+	uint32_t num_hits = 0;
+
+	struct drm_framebuffer fb = {
+		.width = 2048,
+		.height = 2048
+	};
+
+	struct drm_plane_state state = {
+		.crtc = ZERO_SIZE_PTR,
+		.fb = &fb,
+		.visible = true,
+	};
+
+	set_plane_src(&old_state, 0, 0, 1024 << 16, 768 << 16);
+	set_plane_src(&state, 0, 0, 1024 << 16, 768 << 16);
+	/* Damage clip outside plane src */
+	set_damage_clip(&damage, 1360, 1360, 1380, 1380);
+	set_damage_blob(&damage_blob, &damage, sizeof(damage));
+	set_plane_damage(&state, &damage_blob);
+	drm_atomic_helper_damage_iter_init(&iter, &old_state, &state);
+	drm_atomic_for_each_plane_damage(&iter, &clip)
+		num_hits++;
+
+	FAIL(num_hits != 0, "Should have no damage.");
+
+	return 0;
+}
+
+static int igt_damage_iter_single_damage_fractional_src(void *ignored)
+{
+	struct drm_atomic_helper_damage_iter iter;
+	struct drm_plane_state old_state;
+	struct drm_property_blob damage_blob;
+	struct drm_mode_rect damage;
+	struct drm_rect clip;
+	uint32_t num_hits = 0;
+
+	struct drm_framebuffer fb = {
+		.width = 2048,
+		.height = 2048
+	};
+
+	struct drm_plane_state state = {
+		.crtc = ZERO_SIZE_PTR,
+		.fb = &fb,
+		.visible = true,
+	};
+
+	/* Plane src has fractional part. */
+	set_plane_src(&old_state, 0x40002, 0x40002,
+		      0x40002 + (1024 << 16), 0x40002 + (768 << 16));
+	set_plane_src(&state, 0x40002, 0x40002,
+		      0x40002 + (1024 << 16), 0x40002 + (768 << 16));
+	set_damage_clip(&damage, 10, 10, 256, 330);
+	set_damage_blob(&damage_blob, &damage, sizeof(damage));
+	set_plane_damage(&state, &damage_blob);
+	drm_atomic_helper_damage_iter_init(&iter, &old_state, &state);
+	drm_atomic_for_each_plane_damage(&iter, &clip)
+		num_hits++;
+
+	FAIL(num_hits != 1, "Should return damage when set.");
+	FAIL_ON(!check_damage_clip(&state, &clip, 10, 10, 256, 330));
+
+	return 0;
+}
+
+static int igt_damage_iter_single_damage_intersect_fractional_src(void *ignored)
+{
+	struct drm_atomic_helper_damage_iter iter;
+	struct drm_plane_state old_state;
+	struct drm_property_blob damage_blob;
+	struct drm_mode_rect damage;
+	struct drm_rect clip;
+	uint32_t num_hits = 0;
+
+	struct drm_framebuffer fb = {
+		.width = 2048,
+		.height = 2048
+	};
+
+	struct drm_plane_state state = {
+		.crtc = ZERO_SIZE_PTR,
+		.fb = &fb,
+		.visible = true,
+	};
+
+	/* Plane src has fractional part. */
+	set_plane_src(&old_state, 0x40002, 0x40002,
+		      0x40002 + (1024 << 16), 0x40002 + (768 << 16));
+	set_plane_src(&state, 0x40002, 0x40002,
+		      0x40002 + (1024 << 16), 0x40002 + (768 << 16));
+	/* Damage intersect with plane src. */
+	set_damage_clip(&damage, 10, 1, 1360, 330);
+	set_damage_blob(&damage_blob, &damage, sizeof(damage));
+	set_plane_damage(&state, &damage_blob);
+	drm_atomic_helper_damage_iter_init(&iter, &old_state, &state);
+	drm_atomic_for_each_plane_damage(&iter, &clip)
+		num_hits++;
+
+	FAIL(num_hits != 1, "Should return damage clipped to rounded off src.");
+	FAIL_ON(!check_damage_clip(&state, &clip, 10, 4, 1029, 330));
+
+	return 0;
+}
+
+static int igt_damage_iter_single_damage_outside_fractional_src(void *ignored)
+{
+	struct drm_atomic_helper_damage_iter iter;
+	struct drm_plane_state old_state;
+	struct drm_property_blob damage_blob;
+	struct drm_mode_rect damage;
+	struct drm_rect clip;
+	uint32_t num_hits = 0;
+
+	struct drm_framebuffer fb = {
+		.width = 2048,
+		.height = 2048
+	};
+
+	struct drm_plane_state state = {
+		.crtc = ZERO_SIZE_PTR,
+		.fb = &fb,
+		.visible = true,
+	};
+
+	/* Plane src has fractional part. */
+	set_plane_src(&old_state, 0x40002, 0x40002,
+		      0x40002 + (1024 << 16), 0x40002 + (768 << 16));
+	set_plane_src(&state, 0x40002, 0x40002,
+		      0x40002 + (1024 << 16), 0x40002 + (768 << 16));
+	/* Damage clip outside plane src */
+	set_damage_clip(&damage, 1360, 1360, 1380, 1380);
+	set_damage_blob(&damage_blob, &damage, sizeof(damage));
+	set_plane_damage(&state, &damage_blob);
+	drm_atomic_helper_damage_iter_init(&iter, &old_state, &state);
+	drm_atomic_for_each_plane_damage(&iter, &clip)
+		num_hits++;
+
+	FAIL(num_hits != 0, "Should have no damage.");
+
+	return 0;
+}
+
+static int igt_damage_iter_single_damage_src_moved(void *ignored)
+{
+	struct drm_atomic_helper_damage_iter iter;
+	struct drm_plane_state old_state;
+	struct drm_property_blob damage_blob;
+	struct drm_mode_rect damage;
+	struct drm_rect clip;
+	uint32_t num_hits = 0;
+
+	struct drm_framebuffer fb = {
+		.width = 2048,
+		.height = 2048
+	};
+
+	struct drm_plane_state state = {
+		.crtc = ZERO_SIZE_PTR,
+		.fb = &fb,
+		.visible = true,
+	};
+
+	/* Plane src moved since old plane state. */
+	set_plane_src(&old_state, 0, 0, 1024 << 16, 768 << 16);
+	set_plane_src(&state, 10 << 16, 10 << 16,
+		      (10 + 1024) << 16, (10 + 768) << 16);
+	set_damage_clip(&damage, 20, 30, 256, 256);
+	set_damage_blob(&damage_blob, &damage, sizeof(damage));
+	set_plane_damage(&state, &damage_blob);
+	drm_atomic_helper_damage_iter_init(&iter, &old_state, &state);
+	drm_atomic_for_each_plane_damage(&iter, &clip)
+		num_hits++;
+
+	FAIL(num_hits != 1, "Should return plane src as damage.");
+	FAIL_ON(!check_damage_clip(&state, &clip, 10, 10, 1034, 778));
+
+	return 0;
+}
+
+static int igt_damage_iter_single_damage_fractional_src_moved(void *ignored)
+{
+	struct drm_atomic_helper_damage_iter iter;
+	struct drm_plane_state old_state;
+	struct drm_property_blob damage_blob;
+	struct drm_mode_rect damage;
+	struct drm_rect clip;
+	uint32_t num_hits = 0;
+
+	struct drm_framebuffer fb = {
+		.width = 2048,
+		.height = 2048
+	};
+
+	struct drm_plane_state state = {
+		.crtc = ZERO_SIZE_PTR,
+		.fb = &fb,
+		.visible = true,
+	};
+
+	/* Plane src with fractional part moved since old plane state. */
+	set_plane_src(&old_state, 0x3fffe, 0x3fffe,
+		      0x3fffe + (1024 << 16), 0x3fffe + (768 << 16));
+	set_plane_src(&state, 0x40002, 0x40002,
+		      0x40002 + (1024 << 16), 0x40002 + (768 << 16));
+	/* Damage intersect with plane src. */
+	set_damage_clip(&damage, 20, 30, 1360, 256);
+	set_damage_blob(&damage_blob, &damage, sizeof(damage));
+	set_plane_damage(&state, &damage_blob);
+	drm_atomic_helper_damage_iter_init(&iter, &old_state, &state);
+	drm_atomic_for_each_plane_damage(&iter, &clip)
+		num_hits++;
+
+	FAIL(num_hits != 1, "Should return rounded off plane src as damage.");
+	FAIL_ON(!check_damage_clip(&state, &clip, 4, 4, 1029, 773));
+
+	return 0;
+}
+
+static int igt_damage_iter_damage(void *ignored)
+{
+	struct drm_atomic_helper_damage_iter iter;
+	struct drm_plane_state old_state;
+	struct drm_property_blob damage_blob;
+	struct drm_mode_rect damage[2];
+	struct drm_rect clip;
+	uint32_t num_hits = 0;
+
+	struct drm_framebuffer fb = {
+		.width = 2048,
+		.height = 2048
+	};
+
+	struct drm_plane_state state = {
+		.crtc = ZERO_SIZE_PTR,
+		.fb = &fb,
+		.visible = true,
+	};
+
+	set_plane_src(&old_state, 0, 0, 1024 << 16, 768 << 16);
+	set_plane_src(&state, 0, 0, 1024 << 16, 768 << 16);
+	/* 2 damage clips. */
+	set_damage_clip(&damage[0], 20, 30, 200, 180);
+	set_damage_clip(&damage[1], 240, 200, 280, 250);
+	set_damage_blob(&damage_blob, &damage[0], sizeof(damage));
+	set_plane_damage(&state, &damage_blob);
+	drm_atomic_helper_damage_iter_init(&iter, &old_state, &state);
+	drm_atomic_for_each_plane_damage(&iter, &clip) {
+		if (num_hits == 0)
+			FAIL_ON(!check_damage_clip(&state, &clip, 20, 30, 200, 180));
+		if (num_hits == 1)
+			FAIL_ON(!check_damage_clip(&state, &clip, 240, 200, 280, 250));
+		num_hits++;
+	}
+
+	FAIL(num_hits != 2, "Should return damage when set.");
+
+	return 0;
+}
+
+static int igt_damage_iter_damage_one_intersect(void *ignored)
+{
+	struct drm_atomic_helper_damage_iter iter;
+	struct drm_plane_state old_state;
+	struct drm_property_blob damage_blob;
+	struct drm_mode_rect damage[2];
+	struct drm_rect clip;
+	uint32_t num_hits = 0;
+
+	struct drm_framebuffer fb = {
+		.width = 2048,
+		.height = 2048
+	};
+
+	struct drm_plane_state state = {
+		.crtc = ZERO_SIZE_PTR,
+		.fb = &fb,
+		.visible = true,
+	};
+
+	set_plane_src(&old_state, 0x40002, 0x40002,
+		      0x40002 + (1024 << 16), 0x40002 + (768 << 16));
+	set_plane_src(&state, 0x40002, 0x40002,
+		      0x40002 + (1024 << 16), 0x40002 + (768 << 16));
+	/* 2 damage clips, one intersect plane src. */
+	set_damage_clip(&damage[0], 20, 30, 200, 180);
+	set_damage_clip(&damage[1], 2, 2, 1360, 1360);
+	set_damage_blob(&damage_blob, &damage[0], sizeof(damage));
+	set_plane_damage(&state, &damage_blob);
+	drm_atomic_helper_damage_iter_init(&iter, &old_state, &state);
+	drm_atomic_for_each_plane_damage(&iter, &clip) {
+		if (num_hits == 0)
+			FAIL_ON(!check_damage_clip(&state, &clip, 20, 30, 200, 180));
+		if (num_hits == 1)
+			FAIL_ON(!check_damage_clip(&state, &clip, 4, 4, 1029, 773));
+		num_hits++;
+	}
+
+	FAIL(num_hits != 2, "Should return damage when set.");
+
+	return 0;
+}
+
+static int igt_damage_iter_damage_one_outside(void *ignored)
+{
+	struct drm_atomic_helper_damage_iter iter;
+	struct drm_plane_state old_state;
+	struct drm_property_blob damage_blob;
+	struct drm_mode_rect damage[2];
+	struct drm_rect clip;
+	uint32_t num_hits = 0;
+
+	struct drm_framebuffer fb = {
+		.width = 2048,
+		.height = 2048
+	};
+
+	struct drm_plane_state state = {
+		.crtc = ZERO_SIZE_PTR,
+		.fb = &fb,
+		.visible = true,
+	};
+
+	set_plane_src(&old_state, 0, 0, 1024 << 16, 768 << 16);
+	set_plane_src(&state, 0, 0, 1024 << 16, 768 << 16);
+	/* 2 damage clips, one outside plane src. */
+	set_damage_clip(&damage[0], 1360, 1360, 1380, 1380);
+	set_damage_clip(&damage[1], 240, 200, 280, 250);
+	set_damage_blob(&damage_blob, &damage[0], sizeof(damage));
+	set_plane_damage(&state, &damage_blob);
+	drm_atomic_helper_damage_iter_init(&iter, &old_state, &state);
+	drm_atomic_for_each_plane_damage(&iter, &clip)
+		num_hits++;
+
+	FAIL(num_hits != 1, "Should return damage when set.");
+	FAIL_ON(!check_damage_clip(&state, &clip, 240, 200, 280, 250));
+
+	return 0;
+}
+
+static int igt_damage_iter_damage_src_moved(void *ignored)
+{
+	struct drm_atomic_helper_damage_iter iter;
+	struct drm_plane_state old_state;
+	struct drm_property_blob damage_blob;
+	struct drm_mode_rect damage[2];
+	struct drm_rect clip;
+	uint32_t num_hits = 0;
+
+	struct drm_framebuffer fb = {
+		.width = 2048,
+		.height = 2048
+	};
+
+	struct drm_plane_state state = {
+		.crtc = ZERO_SIZE_PTR,
+		.fb = &fb,
+		.visible = true,
+	};
+
+	set_plane_src(&old_state, 0x40002, 0x40002,
+		      0x40002 + (1024 << 16), 0x40002 + (768 << 16));
+	set_plane_src(&state, 0x3fffe, 0x3fffe,
+		      0x3fffe + (1024 << 16), 0x3fffe + (768 << 16));
+	/* 2 damage clips, one outside plane src. */
+	set_damage_clip(&damage[0], 1360, 1360, 1380, 1380);
+	set_damage_clip(&damage[1], 240, 200, 280, 250);
+	set_damage_blob(&damage_blob, &damage[0], sizeof(damage));
+	set_plane_damage(&state, &damage_blob);
+	drm_atomic_helper_damage_iter_init(&iter, &old_state, &state);
+	drm_atomic_for_each_plane_damage(&iter, &clip)
+		num_hits++;
+
+	FAIL(num_hits != 1, "Should return round off plane src as damage.");
+	FAIL_ON(!check_damage_clip(&state, &clip, 3, 3, 1028, 772));
+
+	return 0;
+}
+
+static int igt_damage_iter_damage_not_visible(void *ignored)
+{
+	struct drm_atomic_helper_damage_iter iter;
+	struct drm_plane_state old_state;
+	struct drm_property_blob damage_blob;
+	struct drm_mode_rect damage[2];
+	struct drm_rect clip;
+	uint32_t num_hits = 0;
+
+	struct drm_framebuffer fb = {
+		.width = 2048,
+		.height = 2048
+	};
+
+	struct drm_plane_state state = {
+		.crtc = ZERO_SIZE_PTR,
+		.fb = &fb,
+		.visible = false,
+	};
+
+	set_plane_src(&old_state, 0x40002, 0x40002,
+		      0x40002 + (1024 << 16), 0x40002 + (768 << 16));
+	set_plane_src(&state, 0x3fffe, 0x3fffe,
+		      0x3fffe + (1024 << 16), 0x3fffe + (768 << 16));
+	/* 2 damage clips, one outside plane src. */
+	set_damage_clip(&damage[0], 1360, 1360, 1380, 1380);
+	set_damage_clip(&damage[1], 240, 200, 280, 250);
+	set_damage_blob(&damage_blob, &damage[0], sizeof(damage));
+	set_plane_damage(&state, &damage_blob);
+	drm_atomic_helper_damage_iter_init(&iter, &old_state, &state);
+	drm_atomic_for_each_plane_damage(&iter, &clip)
+		num_hits++;
+
+	FAIL(num_hits != 0, "Should not return any damage.");
+
+	return 0;
+}
+
+#include "drm_selftest.c"
+
+static int __init test_drm_damage_helper_init(void)
+{
+	int err;
+
+	err = run_selftests(selftests, ARRAY_SIZE(selftests), NULL);
+
+	return err > 0 ? 0 : err;
+}
+
+static void __exit test_drm_damage_helper_exit(void)
+{
+}
+
+module_init(test_drm_damage_helper_init);
+module_exit(test_drm_damage_helper_exit);
+
+MODULE_AUTHOR("VMware Inc.");
+MODULE_LICENSE("GPL");

Signature · 1 line

2.17.1

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h

Quoted 1 line

 create mode 100644 drivers/gpu/drm/selftests/test-

drm_damage_helper.c

Review

Quoted 2 lines

(quoted diff) +0 -0

b/drivers/gpu/drm/selftests/Makefile

drivers/gpu/drm/selftests/Makefile line 1

Quoted 5 lines

index 9fc349fa18e9..88ac216f5962 100644

drivers/gpu/drm/selftests/Makefile +0 -1

@@ -1 +1,2 @@
-obj-$(CONFIG_DRM_DEBUG_SELFTEST) += test-drm_mm.o test-drm-

helper.o

drivers/gpu/drm/selftests/Makefile line 1

Quoted 1 line

drivers/gpu/drm/selftests/Makefile +1 -0

+obj-$(CONFIG_DRM_DEBUG_SELFTEST) += test-drm_mm.o test-drm-

helper.o \

drivers/gpu/drm/selftests/Makefile line 2

Quoted 1 line

drivers/gpu/drm/selftests/Makefile +1 -0

+				    test-drm_damage_helper.o

I think it'd be better to add the damage tests to the existing drm-helper selftest (but as a separate file ofc), using the

test-drm-helper-$(CONFIG_DRM_DEBUG_SELFTEST) +=

syntax. That avoids having to write yet another igt wrapper test for this. Also, if you cc [email protected] with this our CI will run the new tests for you automatically.

Cheers, Daniel

Review

Quoted 3 lines

(quoted diff) +0 -0

b/drivers/gpu/drm/selftests/drm_damage_helper_selftests.h

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h line 3

Quoted 8 lines

new file mode 100644
index 000000000000..3a1cbe05bef0

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h new file +3 -0

@@ -0,0 +1,22 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+selftest(damage_iter_no_damage, igt_damage_iter_no_damage)
+selftest(damage_iter_no_damage_fractional_src,

igt_damage_iter_no_damage_fractional_src)

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h line 4

Quoted 1 line

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h new file +1 -0

+selftest(damage_iter_no_damage_src_moved,

igt_damage_iter_no_damage_src_moved)

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h line 5

Quoted 1 line

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h new file +1 -0

+selftest(damage_iter_no_damage_fractional_src_moved,

igt_damage_iter_no_damage_fractional_src_moved)

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h line 6

Quoted 1 line

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h new file +1 -0

+selftest(damage_iter_no_damage_not_visible,

igt_damage_iter_no_damage_not_visible)

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h line 7

Quoted 1 line

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h new file +1 -0

+selftest(damage_iter_no_damage_no_crtc,

igt_damage_iter_no_damage_no_crtc)

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h line 8

Quoted 1 line

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h new file +1 -0

+selftest(damage_iter_no_damage_no_fb,

igt_damage_iter_no_damage_no_fb)

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h line 9

Quoted 1 line

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h new file +1 -0

+selftest(damage_iter_simple_damage,

igt_damage_iter_simple_damage)

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h line 11

Quoted 2 lines

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h new file +2 -0

+selftest(damage_iter_single_damage, igt_damage_iter_single_damage)
+selftest(damage_iter_single_damage_intersect_src,

igt_damage_iter_single_damage_intersect_src)

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h line 12

Quoted 1 line

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h new file +1 -0

+selftest(damage_iter_single_damage_outside_src,

igt_damage_iter_single_damage_outside_src)

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h line 13

Quoted 1 line

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h new file +1 -0

+selftest(damage_iter_single_damage_fractional_src,

igt_damage_iter_single_damage_fractional_src)

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h line 14

Quoted 1 line

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h new file +1 -0

+selftest(damage_iter_single_damage_intersect_fractional_src,

igt_damage_iter_single_damage_intersect_fractional_src)

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h line 15

Quoted 1 line

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h new file +1 -0

+selftest(damage_iter_single_damage_outside_fractional_src,

igt_damage_iter_single_damage_outside_fractional_src)

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h line 16

Quoted 1 line

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h new file +1 -0

+selftest(damage_iter_single_damage_src_moved,

igt_damage_iter_single_damage_src_moved)

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h line 17

Quoted 1 line

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h new file +1 -0

+selftest(damage_iter_single_damage_fractional_src_moved,

igt_damage_iter_single_damage_fractional_src_moved)

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h line 19

Quoted 2 lines

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h new file +2 -0

+selftest(damage_iter_damage, igt_damage_iter_damage)
+selftest(damage_iter_damage_one_intersect,

igt_damage_iter_damage_one_intersect)

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h line 20

Quoted 1 line

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h new file +1 -0

+selftest(damage_iter_damage_one_outside,

igt_damage_iter_damage_one_outside)

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h line 21

Quoted 1 line

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h new file +1 -0

+selftest(damage_iter_damage_src_moved,

igt_damage_iter_damage_src_moved)

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h line 22

Quoted 1 line

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h new file +1 -0

+selftest(damage_iter_damage_not_visible,

igt_damage_iter_damage_not_visible)

Quoted 19 lines

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h

Quoted 1 line

 create mode 100644 drivers/gpu/drm/selftests/test-

drm_damage_helper.c

Review

Quoted 2 lines

(quoted diff) +0 -0

b/drivers/gpu/drm/selftests/Makefile

drivers/gpu/drm/selftests/Makefile line 1

Quoted 5 lines

index 9fc349fa18e9..88ac216f5962 100644

drivers/gpu/drm/selftests/Makefile +0 -1

@@ -1 +1,2 @@
-obj-$(CONFIG_DRM_DEBUG_SELFTEST) += test-drm_mm.o test-drm-

helper.o

drivers/gpu/drm/selftests/Makefile line 1

Quoted 1 line

drivers/gpu/drm/selftests/Makefile +1 -0

+obj-$(CONFIG_DRM_DEBUG_SELFTEST) += test-drm_mm.o test-drm-

helper.o \

drivers/gpu/drm/selftests/Makefile line 2

Quoted 1 line

drivers/gpu/drm/selftests/Makefile +1 -0

+				    test-drm_damage_helper.o

I think it'd be better to add the damage tests to the existing drm-helper selftest (but as a separate file ofc), using the

Quoted 7 lines

test-drm-helper-$(CONFIG_DRM_DEBUG_SELFTEST) +=

syntax. That avoids having to write yet another igt wrapper test for this. Also, if you cc [email protected] with this our CI will run the new tests for you automatically.

Cheers, Daniel

Hi Daniel, thanks for the review.

It looks like adding the damage tests to existing drm-helper-selftest need either renaming the module name (test-drm-helper.ko) or change the filename of test-drm-helper.c. This is because now test-drm-helper.c and test-drm-damage-helper.c have to link together and kernel module is of same name which is causing circular dependency. Both of which looks overkill to me.

If it is alright with you can we have separate test module. I already had a patch to integrate the damage test module with igt.

Thanks,
Deepak

Quoted 49 lines

Review

Quoted 3 lines

(quoted diff) +0 -0

b/drivers/gpu/drm/selftests/drm_damage_helper_selftests.h

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h line 3

Quoted 8 lines

new file mode 100644
index 000000000000..3a1cbe05bef0

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h new file +3 -0

@@ -0,0 +1,22 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+selftest(damage_iter_no_damage, igt_damage_iter_no_damage)
+selftest(damage_iter_no_damage_fractional_src,

igt_damage_iter_no_damage_fractional_src)

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h line 4

Quoted 1 line

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h new file +1 -0

+selftest(damage_iter_no_damage_src_moved,

igt_damage_iter_no_damage_src_moved)

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h line 5

Quoted 1 line

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h new file +1 -0

+selftest(damage_iter_no_damage_fractional_src_moved,

igt_damage_iter_no_damage_fractional_src_moved)

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h line 6

Quoted 1 line

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h new file +1 -0

+selftest(damage_iter_no_damage_not_visible,

igt_damage_iter_no_damage_not_visible)

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h line 7

Quoted 1 line

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h new file +1 -0

+selftest(damage_iter_no_damage_no_crtc,

igt_damage_iter_no_damage_no_crtc)

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h line 8

Quoted 1 line

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h new file +1 -0

+selftest(damage_iter_no_damage_no_fb,

igt_damage_iter_no_damage_no_fb)

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h line 9

Quoted 1 line

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h new file +1 -0

+selftest(damage_iter_simple_damage,

igt_damage_iter_simple_damage)

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h line 11

Quoted 2 lines

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h new file +2 -0

+selftest(damage_iter_single_damage, igt_damage_iter_single_damage)
+selftest(damage_iter_single_damage_intersect_src,

igt_damage_iter_single_damage_intersect_src)

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h line 12

Quoted 1 line

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h new file +1 -0

+selftest(damage_iter_single_damage_outside_src,

igt_damage_iter_single_damage_outside_src)

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h line 13

Quoted 1 line

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h new file +1 -0

+selftest(damage_iter_single_damage_fractional_src,

igt_damage_iter_single_damage_fractional_src)

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h line 14

Quoted 1 line

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h new file +1 -0

+selftest(damage_iter_single_damage_intersect_fractional_src,

igt_damage_iter_single_damage_intersect_fractional_src)

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h line 15

Quoted 1 line

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h new file +1 -0

+selftest(damage_iter_single_damage_outside_fractional_src,

igt_damage_iter_single_damage_outside_fractional_src)

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h line 16

Quoted 1 line

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h new file +1 -0

+selftest(damage_iter_single_damage_src_moved,

igt_damage_iter_single_damage_src_moved)

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h line 17

Quoted 1 line

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h new file +1 -0

+selftest(damage_iter_single_damage_fractional_src_moved,

igt_damage_iter_single_damage_fractional_src_moved)

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h line 19

Quoted 2 lines

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h new file +2 -0

+selftest(damage_iter_damage, igt_damage_iter_damage)
+selftest(damage_iter_damage_one_intersect,

igt_damage_iter_damage_one_intersect)

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h line 20

Quoted 1 line

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h new file +1 -0

+selftest(damage_iter_damage_one_outside,

igt_damage_iter_damage_one_outside)

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h line 21

Quoted 1 line

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h new file +1 -0

+selftest(damage_iter_damage_src_moved,

igt_damage_iter_damage_src_moved)

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h line 22

Quoted 1 line

drivers/gpu/drm/selftests/drm_damage_helper_selftests.h new file +1 -0

+selftest(damage_iter_damage_not_visible,

igt_damage_iter_damage_not_visible)

From: Rob Clark <[email protected]>

Add an atomic helper to implement dirtyfb support. This is needed to support DSI command-mode panels with x11 userspace (ie. when we can't rely on pageflips to trigger a flush to the panel).

v2: Modified the helper to use plane fb_damage_clips property and removed plane_state::dirty flag.

v3:
- Use uapi drm_mode_rect.
- Support annotate flags.

Cc [email protected]

Cc Daniel Vetter <[email protected]>

Cc Pekka Paalanen <[email protected]>

Signed-off-by Rob Clark <[email protected]>

Signed-off-by Deepak Rawat <[email protected]>

---
 drivers/gpu/drm/drm_damage_helper.c | 121 ++++++++++++++++++++++++++++
 include/drm/drm_damage_helper.h     |   4 +
 2 files changed, 125 insertions(+)

drivers/gpu/drm/drm_damage_helper.c +18 -0

index bc734ddaf180..ecf26275543f 100644
@@ -26,6 +26,7 @@
  *
  * Authors:
  * Deepak Rawat <[email protected]>
+ * Rob Clark <[email protected]>
  *
  **************************************************************************/
 

@@ -70,6 +71,21 @@
  * rectangles clipped to &drm_plane_state.src.
  */
 
+static void convert_clip_rect_to_rect(const struct drm_clip_rect *src,
+				      struct drm_mode_rect *dest,
+				      uint32_t num_clips, uint32_t src_inc)
+{
+	while (num_clips > 0) {
+		dest->x1 = src->x1;
+		dest->y1 = src->y1;
+		dest->x2 = src->x2;
+		dest->y2 = src->y2;
+		src += src_inc;
+		dest++;
+		num_clips--;
+	}
+}
+
 /**
  * drm_plane_enable_fb_damage_clips - Enables plane fb damage clips property.
  * @plane: Plane on which to enable damage clips property.

@@ -123,6 +139,111 @@ void drm_atomic_helper_check_plane_damage(struct drm_atomic_state *state,
 }
 EXPORT_SYMBOL(drm_atomic_helper_check_plane_damage);
 
+/**
+ * drm_atomic_helper_dirtyfb - Helper for dirtyfb.

drivers/gpu/drm/drm_damage_helper.c +62 -0

+ *
+ * Returns: Zero on success, negative errno on failure.
+ */
+int drm_atomic_helper_dirtyfb(struct drm_framebuffer *fb,
+			      struct drm_file *file_priv, unsigned flags,
+			      unsigned color, struct drm_clip_rect *clips,
+			      unsigned num_clips)
+{
+	struct drm_modeset_acquire_ctx ctx;
+	struct drm_property_blob *damage = NULL;
+	struct drm_mode_rect *rects = NULL;
+	struct drm_atomic_state *state;
+	struct drm_plane *plane;
+	int ret = 0;
+
+	/*
+	 * When called from ioctl, we are interruptable, but not when called
+	 * internally (ie. defio worker)
+	 */
+	drm_modeset_acquire_init(&ctx,
+		file_priv ? DRM_MODESET_ACQUIRE_INTERRUPTIBLE : 0);
+
+	state = drm_atomic_state_alloc(fb->dev);
+	if (!state) {
+		ret = -ENOMEM;
+		goto out;
+	}
+	state->acquire_ctx = &ctx;
+
+	if (clips) {
+		uint32_t inc = 1;
+
+		if (flags & DRM_MODE_FB_DIRTY_ANNOTATE_COPY) {
+			inc = 2;
+			num_clips /= 2;
+		}
+
+		rects = kcalloc(num_clips, sizeof(*rects), GFP_KERNEL);
+		if (!rects) {
+			ret = -ENOMEM;
+			goto out;
+		}
+
+		convert_clip_rect_to_rect(clips, rects, num_clips, inc);
+		damage = drm_property_create_blob(fb->dev,
+						  num_clips * sizeof(*rects),
+						  rects);
+		if (IS_ERR(damage)) {
+			ret = PTR_ERR(damage);
+			damage = NULL;
+			goto out;
+		}
+	}
+
+retry:
+	drm_for_each_plane(plane, fb->dev) {
+		struct drm_plane_state *plane_state;
+
+		if (plane->state->fb != fb)
+			continue;
+
+		plane_state = drm_atomic_get_plane_state(state, plane);

drivers/gpu/drm/drm_damage_helper.c +21 -0

+
+out:
+	if (ret == -EDEADLK) {
+		drm_atomic_state_clear(state);
+		ret = drm_modeset_backoff(&ctx);
+		if (!ret)
+			goto retry;
+	}
+
+	drm_property_blob_put(damage);
+	kfree(rects);
+	drm_atomic_state_put(state);
+
+	drm_modeset_drop_locks(&ctx);
+	drm_modeset_acquire_fini(&ctx);
+
+	return ret;
+
+}
+EXPORT_SYMBOL(drm_atomic_helper_dirtyfb);
+
 /**
  * drm_atomic_helper_damage_iter_init - Initialize the damage iterator.
  * @iter: The iterator to initialize.

include/drm/drm_damage_helper.h +4 -0

index af188799820f..e4fe7036cab2 100644
@@ -67,6 +67,10 @@ struct drm_atomic_helper_damage_iter {
 void drm_plane_enable_fb_damage_clips(struct drm_plane *plane);
 void drm_atomic_helper_check_plane_damage(struct drm_atomic_state *state,
 					  struct drm_plane_state *plane_state);
+int drm_atomic_helper_dirtyfb(struct drm_framebuffer *fb,
+			      struct drm_file *file_priv, unsigned flags,
+			      unsigned color, struct drm_clip_rect *clips,
+			      unsigned num_clips);
 void
 drm_atomic_helper_damage_iter_init(struct drm_atomic_helper_damage_iter *iter,
 				   const struct drm_plane_state *old_state,

Signature · 1 line

2.17.1

Quoted 13 lines

From: Rob Clark <[email protected]>

Add an atomic helper to implement dirtyfb support. This is needed to support DSI command-mode panels with x11 userspace (ie. when we can't rely on pageflips to trigger a flush to the panel).

v2: Modified the helper to use plane fb_damage_clips property and removed plane_state::dirty flag.

v3:
- Use uapi drm_mode_rect.
- Support annotate flags.

Quoted 7 lines

Cc [email protected]

Cc Daniel Vetter <[email protected]>

Cc Pekka Paalanen <[email protected]>

Signed-off-by Rob Clark <[email protected]>

Signed-off-by Deepak Rawat <[email protected]>

---
 drivers/gpu/drm/drm_damage_helper.c | 121

++++++++++++++++++++++++++++

Review

Quoted 4 lines

 include/drm/drm_damage_helper.h     |   4 +
 2 files changed, 125 insertions(+)

(quoted diff) +0 -0

b/drivers/gpu/drm/drm_damage_helper.c

drivers/gpu/drm/drm_damage_helper.c line 31

Quoted 10 lines

index bc734ddaf180..ecf26275543f 100644

drivers/gpu/drm/drm_damage_helper.c +1 -0

@@ -26,6 +26,7 @@
  *
  * Authors:
  * Deepak Rawat <[email protected]>
+ * Rob Clark <[email protected]>
  *
 

**********************************************************
****************/

Quoted 12 lines

drivers/gpu/drm/drm_damage_helper.c +7 -0

@@ -70,6 +71,21 @@
  * rectangles clipped to &drm_plane_state.src.
  */
 
+static void convert_clip_rect_to_rect(const struct drm_clip_rect *src,
+				      struct drm_mode_rect *dest,
+				      uint32_t num_clips, uint32_t src_inc)
+{
+	while (num_clips > 0) {
+		dest->x1 = src->x1;
+		dest->y1 = src->y1;

drivers/gpu/drm/drm_damage_helper.c line 90

Quoted 10 lines

drivers/gpu/drm/drm_damage_helper.c +8 -0

+		dest->x2 = src->x2;
+		dest->y2 = src->y2;
+		src += src_inc;
+		dest++;
+		num_clips--;
+	}
+}
+
 /**
  * drm_plane_enable_fb_damage_clips - Enables plane fb damage clips

property.

drivers/gpu/drm/drm_damage_helper.c void

Quoted 2 lines

drivers/gpu/drm/drm_damage_helper.c +0 -0

  * @plane: Plane on which to enable damage clips property.

@@ -123,6 +139,111 @@ void

drm_atomic_helper_check_plane_damage(struct drm_atomic_state *state,

drivers/gpu/drm/drm_damage_helper.c void drm_atomic_helper_check_plane_damage(struct drm_atomic_state *state,

Quoted 13 lines

drivers/gpu/drm/drm_damage_helper.c +10 -0

 }
 EXPORT_SYMBOL(drm_atomic_helper_check_plane_damage);
 
+/**
+ * drm_atomic_helper_dirtyfb - Helper for dirtyfb.
+ * @fb: DRM framebuffer.
+ * @file_priv: Drm file for the ioctl call.
+ * @flags: Dirty fb annotate flags.
+ * @color: Color for annotate fill.
+ * @clips: Dirty region.
+ * @num_clips: Count of clip in clips.
+ *
+ * A helper to implement &drm_framebuffer_funcs::dirty using damage

interface

drivers/gpu/drm/drm_damage_helper.c void drm_atomic_helper_check_plane_damage(struct drm_atomic_state *state, · line 153

Quoted 2 lines

drivers/gpu/drm/drm_damage_helper.c +2 -0

+ * during plane update. Similar to ioctl, this helper do a full plane update
+ * when no clips are provided.

The above kerneldoc doesn't make sense to me ... we do have clips provided here, it's just a different layout.

Quoted 64 lines

drivers/gpu/drm/drm_damage_helper.c +63 -0

+ *
+ * Returns: Zero on success, negative errno on failure.
+ */
+int drm_atomic_helper_dirtyfb(struct drm_framebuffer *fb,
+			      struct drm_file *file_priv, unsigned flags,
+			      unsigned color, struct drm_clip_rect *clips,
+			      unsigned num_clips)
+{
+	struct drm_modeset_acquire_ctx ctx;
+	struct drm_property_blob *damage = NULL;
+	struct drm_mode_rect *rects = NULL;
+	struct drm_atomic_state *state;
+	struct drm_plane *plane;
+	int ret = 0;
+
+	/*
+	 * When called from ioctl, we are interruptable, but not when called
+	 * internally (ie. defio worker)
+	 */
+	drm_modeset_acquire_init(&ctx,
+		file_priv ? DRM_MODESET_ACQUIRE_INTERRUPTIBLE : 0);
+
+	state = drm_atomic_state_alloc(fb->dev);
+	if (!state) {
+		ret = -ENOMEM;
+		goto out;
+	}
+	state->acquire_ctx = &ctx;
+
+	if (clips) {
+		uint32_t inc = 1;
+
+		if (flags & DRM_MODE_FB_DIRTY_ANNOTATE_COPY) {
+			inc = 2;
+			num_clips /= 2;
+		}
+
+		rects = kcalloc(num_clips, sizeof(*rects), GFP_KERNEL);
+		if (!rects) {
+			ret = -ENOMEM;
+			goto out;
+		}
+
+		convert_clip_rect_to_rect(clips, rects, num_clips, inc);
+		damage = drm_property_create_blob(fb->dev,
+						  num_clips * sizeof(*rects),
+						  rects);
+		if (IS_ERR(damage)) {
+			ret = PTR_ERR(damage);
+			damage = NULL;
+			goto out;
+		}
+	}
+
+retry:
+	drm_for_each_plane(plane, fb->dev) {
+		struct drm_plane_state *plane_state;
+
+		if (plane->state->fb != fb)
+			continue;
+
+		plane_state = drm_atomic_get_plane_state(state, plane);
+		if (IS_ERR(plane_state)) {

drivers/gpu/drm/drm_damage_helper.c void drm_atomic_helper_check_plane_damage(struct drm_atomic_state *state, · line 225

Quoted 10 lines

drivers/gpu/drm/drm_damage_helper.c +9 -0

+			ret = PTR_ERR(plane_state);
+			goto out;
+		}
+
+		drm_property_replace_blob(&plane_state-
 fb_damage_clips,
+					  damage);
+	}
+
+	ret = drm_atomic_commit(state);

This blocks, which matches what udl does (one of the very first implementations of the fb->dirty callback). I got lost a bit in the vmwgfx dirty implementation, so no idea whether that one blocked or not.

If the blocking here is a problem, then we need a separate worker similarly to what the fbdev worker does (since using the atomic nonblocking stuff has uapi side-effects).

Either way, probably something we need to document in the kernel-doc. -Daniel

Quoted 25 lines

drivers/gpu/drm/drm_damage_helper.c +21 -0

+
+out:
+	if (ret == -EDEADLK) {
+		drm_atomic_state_clear(state);
+		ret = drm_modeset_backoff(&ctx);
+		if (!ret)
+			goto retry;
+	}
+
+	drm_property_blob_put(damage);
+	kfree(rects);
+	drm_atomic_state_put(state);
+
+	drm_modeset_drop_locks(&ctx);
+	drm_modeset_acquire_fini(&ctx);
+
+	return ret;
+
+}
+EXPORT_SYMBOL(drm_atomic_helper_dirtyfb);
+
 /**
  * drm_atomic_helper_damage_iter_init - Initialize the damage iterator.

* @iter: The iterator to initialize.

Review

Quoted 1 line

(quoted diff) +0 -0

b/include/drm/drm_damage_helper.h

include/drm/drm_damage_helper.h struct drm_atomic_helper_damage_iter { · line 68

Quoted 6 lines

index af188799820f..e4fe7036cab2 100644

include/drm/drm_damage_helper.h +0 -0

@@ -67,6 +67,10 @@ struct drm_atomic_helper_damage_iter {
 void drm_plane_enable_fb_damage_clips(struct drm_plane *plane);
 void drm_atomic_helper_check_plane_damage(struct drm_atomic_state

*state,

include/drm/drm_damage_helper.h struct drm_atomic_helper_damage_iter { · line 69

Quoted 1 line

include/drm/drm_damage_helper.h +0 -0

 					  struct drm_plane_state

*plane_state);

include/drm/drm_damage_helper.h struct drm_atomic_helper_damage_iter {

Quoted 6 lines

include/drm/drm_damage_helper.h +4 -0

+int drm_atomic_helper_dirtyfb(struct drm_framebuffer *fb,
+			      struct drm_file *file_priv, unsigned flags,
+			      unsigned color, struct drm_clip_rect *clips,
+			      unsigned num_clips);
 void
 drm_atomic_helper_damage_iter_init(struct

drm_atomic_helper_damage_iter *iter,

Quoted 4 lines

include/drm/drm_damage_helper.h +0 -1

 				   const struct drm_plane_state *old_state,
--

2.17.1

--
Daniel Vetter
Software Engineer, Intel Corporation
https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fblog.ff
wll.ch&amp;data=02%7C01%7Cdrawat%40vmware.com%7C0835e0509d8849 89c6c208d6277513ae%7Cb39138ca3cee4b4aa4d6cd83d9dd62f0%7C1%7C0%7 C636739781135270102&amp;sdata=6%2Fr%2FS%2B3k7nJDZKNd9tRnmofCGf CG2TKqDy4tG6lojsA%3D&amp;reserved=0

Quoted 78 lines · Deepak Rawat

Quoted 13 lines

From: Rob Clark <[email protected]>

Add an atomic helper to implement dirtyfb support. This is needed to support DSI command-mode panels with x11 userspace (ie. when we can't rely on pageflips to trigger a flush to the panel).

v2: Modified the helper to use plane fb_damage_clips property and removed plane_state::dirty flag.

v3:
- Use uapi drm_mode_rect.
- Support annotate flags.

Quoted 7 lines

Cc [email protected]

Cc Daniel Vetter <[email protected]>

Cc Pekka Paalanen <[email protected]>

Signed-off-by Rob Clark <[email protected]>

Signed-off-by Deepak Rawat <[email protected]>

---
 drivers/gpu/drm/drm_damage_helper.c | 121

++++++++++++++++++++++++++++

Review

Quoted 4 lines

 include/drm/drm_damage_helper.h     |   4 +
 2 files changed, 125 insertions(+)

(quoted diff) +0 -0

b/drivers/gpu/drm/drm_damage_helper.c

drivers/gpu/drm/drm_damage_helper.c line 31

Quoted 10 lines

index bc734ddaf180..ecf26275543f 100644

drivers/gpu/drm/drm_damage_helper.c +1 -0

@@ -26,6 +26,7 @@
  *
  * Authors:
  * Deepak Rawat <[email protected]>
+ * Rob Clark <[email protected]>
  *
 

**********************************************************
****************/

Quoted 12 lines

drivers/gpu/drm/drm_damage_helper.c +7 -0

@@ -70,6 +71,21 @@
  * rectangles clipped to &drm_plane_state.src.
  */
 
+static void convert_clip_rect_to_rect(const struct drm_clip_rect *src,
+				      struct drm_mode_rect *dest,
+				      uint32_t num_clips, uint32_t src_inc)
+{
+	while (num_clips > 0) {
+		dest->x1 = src->x1;
+		dest->y1 = src->y1;

drivers/gpu/drm/drm_damage_helper.c line 90

Quoted 10 lines

drivers/gpu/drm/drm_damage_helper.c +8 -0

+		dest->x2 = src->x2;
+		dest->y2 = src->y2;
+		src += src_inc;
+		dest++;
+		num_clips--;
+	}
+}
+
 /**
  * drm_plane_enable_fb_damage_clips - Enables plane fb damage clips

property.

drivers/gpu/drm/drm_damage_helper.c void

Quoted 2 lines

drivers/gpu/drm/drm_damage_helper.c +0 -0

  * @plane: Plane on which to enable damage clips property.

@@ -123,6 +139,111 @@ void

drm_atomic_helper_check_plane_damage(struct drm_atomic_state *state,

Quoted 13 lines

drivers/gpu/drm/drm_damage_helper.c +10 -0

 }
 EXPORT_SYMBOL(drm_atomic_helper_check_plane_damage);
 
+/**
+ * drm_atomic_helper_dirtyfb - Helper for dirtyfb.
+ * @fb: DRM framebuffer.
+ * @file_priv: Drm file for the ioctl call.
+ * @flags: Dirty fb annotate flags.
+ * @color: Color for annotate fill.
+ * @clips: Dirty region.
+ * @num_clips: Count of clip in clips.
+ *
+ * A helper to implement &drm_framebuffer_funcs::dirty using damage

Quoted 6 lines

interface

drivers/gpu/drm/drm_damage_helper.c void drm_atomic_helper_check_plane_damage(struct drm_atomic_state *state, · line 153

Quoted 2 lines

drivers/gpu/drm/drm_damage_helper.c +2 -0

+ * during plane update. Similar to ioctl, this helper do a full plane update
+ * when no clips are provided.

The above kerneldoc doesn't make sense to me ... we do have clips provided here, it's just a different layout.

Thanks Daniel for the review. I meant if clips are NULL, which is possible.

Quoted 78 lines

Quoted 63 lines

drivers/gpu/drm/drm_damage_helper.c +63 -0

+ *
+ * Returns: Zero on success, negative errno on failure.
+ */
+int drm_atomic_helper_dirtyfb(struct drm_framebuffer *fb,
+			      struct drm_file *file_priv, unsigned flags,
+			      unsigned color, struct drm_clip_rect *clips,
+			      unsigned num_clips)
+{
+	struct drm_modeset_acquire_ctx ctx;
+	struct drm_property_blob *damage = NULL;
+	struct drm_mode_rect *rects = NULL;
+	struct drm_atomic_state *state;
+	struct drm_plane *plane;
+	int ret = 0;
+
+	/*
+	 * When called from ioctl, we are interruptable, but not when called
+	 * internally (ie. defio worker)
+	 */
+	drm_modeset_acquire_init(&ctx,
+		file_priv ? DRM_MODESET_ACQUIRE_INTERRUPTIBLE : 0);
+
+	state = drm_atomic_state_alloc(fb->dev);
+	if (!state) {
+		ret = -ENOMEM;
+		goto out;
+	}
+	state->acquire_ctx = &ctx;
+
+	if (clips) {
+		uint32_t inc = 1;
+
+		if (flags & DRM_MODE_FB_DIRTY_ANNOTATE_COPY) {
+			inc = 2;
+			num_clips /= 2;
+		}
+
+		rects = kcalloc(num_clips, sizeof(*rects), GFP_KERNEL);
+		if (!rects) {
+			ret = -ENOMEM;
+			goto out;
+		}
+
+		convert_clip_rect_to_rect(clips, rects, num_clips, inc);
+		damage = drm_property_create_blob(fb->dev,
+						  num_clips * sizeof(*rects),
+						  rects);
+		if (IS_ERR(damage)) {
+			ret = PTR_ERR(damage);
+			damage = NULL;
+			goto out;
+		}
+	}
+
+retry:
+	drm_for_each_plane(plane, fb->dev) {
+		struct drm_plane_state *plane_state;
+
+		if (plane->state->fb != fb)
+			continue;
+
+		plane_state = drm_atomic_get_plane_state(state, plane);
+		if (IS_ERR(plane_state)) {

drivers/gpu/drm/drm_damage_helper.c void drm_atomic_helper_check_plane_damage(struct drm_atomic_state *state, · line 225

Quoted 10 lines

drivers/gpu/drm/drm_damage_helper.c +9 -0

+			ret = PTR_ERR(plane_state);
+			goto out;
+		}
+
+		drm_property_replace_blob(&plane_state-
 fb_damage_clips,
+					  damage);
+	}
+
+	ret = drm_atomic_commit(state);

This blocks, which matches what udl does (one of the very first implementations of the fb->dirty callback). I got lost a bit in the vmwgfx dirty implementation, so no idea whether that one blocked or not.

Quoted 6 lines

If the blocking here is a problem, then we need a separate worker similarly to what the fbdev worker does (since using the atomic nonblocking stuff has uapi side-effects).

Either way, probably something we need to document in the kernel-doc. -Daniel

IIUC vmwgfx dirty implementation also block. vmwgfx dirty implementation will make sure that commands are flushed to virtual device and all the mutex lock are held until then.

With my testing on vmwgfx software only VM I see that non-blocking will cause rendering issues with so many dirty_fb ioctl()'s and kernel returns EBUSY(?).

Yes I agree I can update the kernel-doc to specify blocking and if someone need non-blocking version in future that can be easily done.

Thanks,
Deepak

Quoted 56 lines

Quoted 25 lines

drivers/gpu/drm/drm_damage_helper.c +21 -0

+
+out:
+	if (ret == -EDEADLK) {
+		drm_atomic_state_clear(state);
+		ret = drm_modeset_backoff(&ctx);
+		if (!ret)
+			goto retry;
+	}
+
+	drm_property_blob_put(damage);
+	kfree(rects);
+	drm_atomic_state_put(state);
+
+	drm_modeset_drop_locks(&ctx);
+	drm_modeset_acquire_fini(&ctx);
+
+	return ret;
+
+}
+EXPORT_SYMBOL(drm_atomic_helper_dirtyfb);
+
 /**
  * drm_atomic_helper_damage_iter_init - Initialize the damage iterator.

* @iter: The iterator to initialize.

Review

Quoted 1 line

(quoted diff) +0 -0

b/include/drm/drm_damage_helper.h

include/drm/drm_damage_helper.h struct drm_atomic_helper_damage_iter { · line 68

Quoted 6 lines

index af188799820f..e4fe7036cab2 100644

include/drm/drm_damage_helper.h +0 -0

@@ -67,6 +67,10 @@ struct drm_atomic_helper_damage_iter {
 void drm_plane_enable_fb_damage_clips(struct drm_plane *plane);
 void drm_atomic_helper_check_plane_damage(struct drm_atomic_state

*state,

include/drm/drm_damage_helper.h struct drm_atomic_helper_damage_iter { · line 69

Quoted 1 line

include/drm/drm_damage_helper.h +0 -0

 					  struct drm_plane_state

*plane_state);

include/drm/drm_damage_helper.h struct drm_atomic_helper_damage_iter {

Quoted 6 lines

include/drm/drm_damage_helper.h +4 -0

+int drm_atomic_helper_dirtyfb(struct drm_framebuffer *fb,
+			      struct drm_file *file_priv, unsigned flags,
+			      unsigned color, struct drm_clip_rect *clips,
+			      unsigned num_clips);
 void
 drm_atomic_helper_damage_iter_init(struct

drm_atomic_helper_damage_iter *iter,

Quoted 4 lines

include/drm/drm_damage_helper.h +0 -1

 				   const struct drm_plane_state *old_state,
--

2.17.1

--
Daniel Vetter
Software Engineer, Intel Corporation
https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fblog.ff
wll.ch&amp;data=02%7C01%7Cdrawat%40vmware.com%7C0835e0509d8849 89c6c208d6277513ae%7Cb39138ca3cee4b4aa4d6cd83d9dd62f0%7C1%7C0%7 C636739781135270102&amp;sdata=6%2Fr%2FS%2B3k7nJDZKNd9tRnmofCGf CG2TKqDy4tG6lojsA%3D&amp;reserved=0