tests/kms_cursor_legacy: Add subtest to verify cursor update state.

index d0a28b3c442c..771e501e5ce0 100644
@@ -1355,6 +1355,81 @@ static void flip_vs_cursor_busy_crc(igt_display_t *display, bool atomic)
 	igt_remove_fb(display->drm_fd, &cursor_fb);
 }
 
+static void verify_cursor_parameters(igt_display_t *display)
+{
+	struct drm_mode_cursor arg[2];
+	struct igt_fb fb_info, cursor_fb, cursor_fb2;
+	enum pipe pipe = find_connected_pipe(display, false);
+	igt_pipe_t *pipe_obj = &display->pipes[pipe];
+	igt_plane_t *cursor = igt_pipe_get_plane_type(pipe_obj, DRM_PLANE_TYPE_CURSOR);
+	drmModePlane *drm_cursor;
+
+	/* Must support universal plane API for cursor plane for this test. */
+	igt_require(cursor->drm_plane);
+	igt_require(set_fb_on_crtc(display, pipe, &fb_info));
+
+	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888, 0, 1., 1., 1., &cursor_fb);
+	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888, 0, .5, .5, .5, &cursor_fb2);
+
+	igt_plane_set_fb(cursor, &cursor_fb);
+	populate_cursor_args(display, pipe, arg, &cursor_fb);
+
+	igt_display_commit2(display, display->is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY);
+
+	/* Move Cursor with legacy cursor move. */
+	do_ioctl(display->drm_fd, DRM_IOCTL_MODE_CURSOR, arg);
+
+	drm_cursor = drmModeGetPlane(display->drm_fd, cursor->drm_plane->plane_id);
+	igt_assert(drm_cursor);
+
+	igt_assert_eq(drm_cursor->crtc_id, pipe_obj->crtc_id);
+	if (display->is_atomic) {
+		igt_assert_eq(igt_plane_get_prop(cursor, IGT_PLANE_FB_ID), cursor_fb.fb_id);
+
+		igt_assert_eq(igt_plane_get_prop(cursor, IGT_PLANE_SRC_X), 0);
+		igt_assert_eq(igt_plane_get_prop(cursor, IGT_PLANE_SRC_Y), 0);
+		igt_assert_eq(igt_plane_get_prop(cursor, IGT_PLANE_SRC_W), IGT_FIXED(cursor_fb.width, 0));
+		igt_assert_eq(igt_plane_get_prop(cursor, IGT_PLANE_SRC_H), IGT_FIXED(cursor_fb.height, 0));
+
+		/* Make sure legacy cursor move overwriting atomic pos (0,0) is picked up. */
+		igt_assert_eq(igt_plane_get_prop(cursor, IGT_PLANE_CRTC_X), arg->x);
+		igt_assert_eq(igt_plane_get_prop(cursor, IGT_PLANE_CRTC_Y), arg->y);
+		igt_assert_eq(igt_plane_get_prop(cursor, IGT_PLANE_CRTC_W), cursor_fb.width);
+		igt_assert_eq(igt_plane_get_prop(cursor, IGT_PLANE_CRTC_H), cursor_fb.height);
+
+		/* COMMIT_ATOMIC specifies the fb id, do a strict check. */
+		igt_assert_eq(drm_cursor->fb_id, cursor_fb.fb_id);
+	} else {
+		/* Legacy cursor ioctl generates a new fb id */
+		igt_assert(drm_cursor->fb_id);
+	}
+	drmModeFreePlane(drm_cursor);
+
+	/* Use setplane API. */
+	igt_plane_set_fb(cursor, &cursor_fb2);
+	igt_plane_set_position(cursor, 1, 2);
+	igt_display_commit2(display, COMMIT_UNIVERSAL);
+
+	drm_cursor = drmModeGetPlane(display->drm_fd, cursor->drm_plane->plane_id);
+	igt_assert(drm_cursor);
+
+	/* SetPlane specifies the fb id, do a strict check. */
+	igt_assert_eq(drm_cursor->fb_id, cursor_fb2.fb_id);
+
+	/* And compare atomic properties, to make sure the change sticks. */
+	if (display->is_atomic) {
+		igt_assert_eq(igt_plane_get_prop(cursor, IGT_PLANE_FB_ID), cursor_fb2.fb_id);
+
+		igt_assert_eq(igt_plane_get_prop(cursor, IGT_PLANE_CRTC_X), 1);
+		igt_assert_eq(igt_plane_get_prop(cursor, IGT_PLANE_CRTC_Y), 2);
+	}
+	drmModeFreePlane(drm_cursor);
+
+	igt_remove_fb(display->drm_fd, &cursor_fb2);
+	igt_remove_fb(display->drm_fd, &cursor_fb);
+	igt_remove_fb(display->drm_fd, &fb_info);
+}
+
 igt_main
 {
 	const int ncpus = sysconf(_SC_NPROCESSORS_ONLN);

@@ -1458,6 +1533,9 @@ igt_main
 	igt_subtest("flip-vs-cursor-busy-crc-atomic")
 		flip_vs_cursor_busy_crc(&display, true);
 
+	igt_subtest("verify-cursor-parameters")
+		verify_cursor_parameters(&display);
+
 	for (i = 0; i <= flip_test_last; i++) {
 		const char *modes[flip_test_last+1] = {
 			"legacy",

index a164839ee2cc..de0cc0812da5 100644
@@ -60,12 +60,8 @@ typedef struct {
 	int cursor_max_w, cursor_max_h;
 	igt_pipe_crc_t *pipe_crc;
 	uint32_t devid;
-	unsigned flags;
 } data_t;
 
-#define TEST_DPMS (1<<0)
-#define TEST_SUSPEND (1<<1)
-
 static void draw_cursor(cairo_t *cr, int x, int y, int cw, int ch)
 {
 	int wl, wr, ht, hb;

@@ -168,27 +164,6 @@ static void do_single_test(data_t *data, int x, int y)
 	igt_wait_for_vblank(data->drm_fd, data->pipe);
 	igt_pipe_crc_collect_crc(pipe_crc, &crc);
 
-	if (data->flags & (TEST_DPMS | TEST_SUSPEND)) {
-		igt_crc_t crc_after;
-
-		if (data->flags & TEST_DPMS) {
-			igt_debug("dpms off/on cycle\n");
-			kmstest_set_connector_dpms(data->drm_fd,
-						   data->output->config.connector,
-						   DRM_MODE_DPMS_OFF);
-			kmstest_set_connector_dpms(data->drm_fd,
-						   data->output->config.connector,
-						   DRM_MODE_DPMS_ON);
-		}
-
-		if (data->flags & TEST_SUSPEND)
-			igt_system_suspend_autoresume(SUSPEND_STATE_MEM,
-						      SUSPEND_TEST_NONE);
-
-		igt_pipe_crc_collect_crc(pipe_crc, &crc_after);
-		igt_assert_crc_equal(&crc, &crc_after);
-	}
-
 	cursor_disable(data);
 	igt_display_commit(display);
 

@@ -319,12 +294,10 @@ static void test_crc_sliding(data_t *data)
 
 static void test_crc_random(data_t *data)
 {
-	int i, max;
-
-	max = data->flags & (TEST_DPMS | TEST_SUSPEND) ? 2 : 50;
+	int i;
 
 	/* Random cursor placement */
-	for (i = 0; i < max; i++) {
+	for (i = 0; i < 50; i++) {
 		int x = rand() % (data->screenw + data->curw * 2) - data->curw;
 		int y = rand() % (data->screenh + data->curh * 2) - data->curh;
 		do_single_test(data, x, y);

@@ -585,17 +558,6 @@ static void run_test_generic(data_t *data)
 			run_test(data, test_crc_sliding, w, h);
 		igt_subtest_f("cursor-%dx%d-random", w, h)
 			run_test(data, test_crc_random, w, h);
-		igt_subtest_f("cursor-%dx%d-dpms", w, h) {
-			data->flags = TEST_DPMS;
-			run_test(data, test_crc_random, w, h);
-			data->flags = 0;
-		}
-
-		igt_subtest_f("cursor-%dx%d-suspend", w, h) {
-			data->flags = TEST_SUSPEND;
-			run_test(data, test_crc_random, w, h);
-			data->flags = 0;
-		}
 
 		igt_subtest_f("cursor-%dx%d-rapid-movement", w, h) {
 			run_test(data, test_rapid_movement, w, h);