lib/igt_fb: Call dumb_destroy ioctl in case of dumb buffers

1/5

---
 lib/igt_fb.c  |  5 ++++-
 lib/igt_kms.c | 22 ++++++++++++++++++++++
 lib/igt_kms.h |  1 +
 3 files changed, 27 insertions(+), 1 deletion(-)
index 35be2e88..335ece69 100644
@@ -2121,7 +2121,10 @@ void igt_remove_fb(int fd, struct igt_fb *fb)
 
 	cairo_surface_destroy(fb->cairo_surface);
 	do_or_die(drmModeRmFB(fd, fb->fb_id));
-	gem_close(fd, fb->gem_handle);
+	if (fb->is_dumb)
+		kmstest_dumb_destroy(fd, fb->gem_handle);
+	else
+		gem_close(fd, fb->gem_handle);
 	fb->fb_id = 0;
 }
 

index b2cbaa11..6e499f48 100644
@@ -641,6 +641,28 @@ void *kmstest_dumb_map_buffer(int fd, uint32_t handle, uint64_t size,
 	return ptr;
 }
 
+static int __kmstest_dumb_destroy(int fd, uint32_t handle)
+{
+	struct drm_mode_destroy_dumb arg = { handle };
+	int err = 0;
+
+	if (drmIoctl(fd, DRM_IOCTL_MODE_DESTROY_DUMB, &arg))
+		err = -errno;
+
+	errno = 0;
+	return err;
+}
+
+/**
+ * kmstest_dumb_destroy:
+ * @fd: Opened drm file descriptor
+ * @handle: Offset in the file referred to by fd
+ */
+void kmstest_dumb_destroy(int fd, uint32_t handle)
+{
+	igt_assert_eq(__kmstest_dumb_destroy(fd, handle), 0);
+}
+
 /*
  * Returns: the previous mode, or KD_GRAPHICS if no /dev/tty0 was
  * found and nothing was done.

index 38fa944e..cbfcced9 100644
@@ -222,6 +222,7 @@ uint32_t kmstest_dumb_create(int fd, int width, int height, int bpp,
 
 void *kmstest_dumb_map_buffer(int fd, uint32_t handle, uint64_t size,
 			      unsigned prot);
+void kmstest_dumb_destroy(int fd, uint32_t handle);
 void kmstest_wait_for_pageflip(int fd);
 unsigned int kmstest_get_vblank(int fd, int pipe, unsigned int flags);
 void igt_assert_plane_visible(int fd, enum pipe pipe, bool visibility);

2.17.1

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
---
 lib/igt_fb.c | 4 ++++
 1 file changed, 4 insertions(+)
index 335ece69..1bb6d324 100644
@@ -1433,6 +1433,10 @@ static void create_cairo_surface__gtt(int fd, struct igt_fb *fb)
 		cairo_image_surface_create_for_data(ptr,
 						    drm_format_to_cairo(fb->drm_format),
 						    fb->width, fb->height, fb->strides[0]);
+	igt_require_f(cairo_surface_status(fb->cairo_surface) == CAIRO_STATUS_SUCCESS,
+		      "Unable to create a cairo surface: %s\n",
+		      cairo_status_to_string(cairo_surface_status(fb->cairo_surface)));
+
 	fb->domain = I915_GEM_DOMAIN_GTT;
 
 	cairo_surface_set_user_data(fb->cairo_surface,

2.17.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
---
 lib/igt_fb.c         |  7 +++++--
 lib/ioctl_wrappers.c | 24 +++++++++++++++---------
 lib/ioctl_wrappers.h |  1 +
 3 files changed, 21 insertions(+), 11 deletions(-)
index 1bb6d324..5dca1cfa 100644
@@ -913,6 +913,7 @@ igt_create_fb_with_bo_size(int fd, int width, int height,
 	/* FIXME allow the caller to pass these in */
 	enum igt_color_encoding color_encoding = IGT_COLOR_YCBCR_BT709;
 	enum igt_color_range color_range = IGT_COLOR_YCBCR_LIMITED_RANGE;
+	uint32_t flags = 0;
 
 	fb_init(fb, fd, width, height, format, tiling,
 		color_encoding, color_range);

@@ -931,11 +932,13 @@ igt_create_fb_with_bo_size(int fd, int width, int height,
 	igt_debug("%s(handle=%d, pitch=%d)\n",
 		  __func__, fb->gem_handle, fb->strides[0]);
 
+	if (fb->tiling || igt_has_fb_modifiers(fd))
+		flags = LOCAL_DRM_MODE_FB_MODIFIERS;
+
 	do_or_die(__kms_addfb(fb->fd, fb->gem_handle,
 			      fb->width, fb->height,
 			      fb->drm_format, fb->tiling,
-			      fb->strides, fb->offsets, fb->num_planes,
-			      LOCAL_DRM_MODE_FB_MODIFIERS,
+			      fb->strides, fb->offsets, fb->num_planes, flags,
 			      &fb->fb_id));
 
 	return fb->fb_id;

index 0929c43f..10d32bec 100644
@@ -1646,13 +1646,7 @@ void prime_sync_end(int dma_buf_fd, bool write)
 	do_ioctl(dma_buf_fd, LOCAL_DMA_BUF_IOCTL_SYNC, &sync_end);
 }
 
-/**
- * igt_require_fb_modifiers:
- * @fd: Open DRM file descriptor.
- *
- * Requires presence of DRM_CAP_ADDFB2_MODIFIERS.
- */
-void igt_require_fb_modifiers(int fd)
+bool igt_has_fb_modifiers(int fd)
 {
 	static bool has_modifiers, cap_modifiers_tested;
 

@@ -1666,7 +1660,18 @@ void igt_require_fb_modifiers(int fd)
 		cap_modifiers_tested = true;
 	}
 
-	igt_require(has_modifiers);
+	return has_modifiers;
+}
+
+/**
+ * igt_require_fb_modifiers:
+ * @fd: Open DRM file descriptor.
+ *
+ * Requires presence of DRM_CAP_ADDFB2_MODIFIERS.
+ */
+void igt_require_fb_modifiers(int fd)
+{
+	igt_require(igt_has_fb_modifiers(fd));
 }
 
 int __kms_addfb(int fd, uint32_t handle,

@@ -1678,7 +1683,8 @@ int __kms_addfb(int fd, uint32_t handle,
 	struct drm_mode_fb_cmd2 f;
 	int ret, i;
 
-	igt_require_fb_modifiers(fd);
+	if (flags & DRM_MODE_FB_MODIFIERS)
+		igt_require_fb_modifiers(fd);
 
 	memset(&f, 0, sizeof(f));
 

index c4e1956c..b22b36b0 100644
@@ -227,6 +227,7 @@ struct local_drm_mode_fb_cmd2 {
 
 #define LOCAL_DRM_CAP_ADDFB2_MODIFIERS	0x10
 
+bool igt_has_fb_modifiers(int fd);
 void igt_require_fb_modifiers(int fd);
 
 /**

2.17.1

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
---
 lib/igt_kms.c      |   1 +
 lib/igt_kms.h      |   1 +
 tests/kms_atomic.c | 260 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 262 insertions(+)
index 6e499f48..7a3ce2f6 100644
@@ -177,6 +177,7 @@ const char * const igt_plane_prop_names[IGT_NUM_PLANE_PROPS] = {
 	[IGT_PLANE_COLOR_RANGE] = "COLOR_RANGE",
 	[IGT_PLANE_PIXEL_BLEND_MODE] = "pixel blend mode",
 	[IGT_PLANE_ALPHA] = "alpha",
+	[IGT_PLANE_FB_DAMAGE_CLIPS] = "FB_DAMAGE_CLIPS",
 };
 
 const char * const igt_crtc_prop_names[IGT_NUM_CRTC_PROPS] = {

index cbfcced9..e1c9a6a5 100644
@@ -269,6 +269,7 @@ enum igt_atomic_plane_properties {
        IGT_PLANE_COLOR_RANGE,
        IGT_PLANE_PIXEL_BLEND_MODE,
        IGT_PLANE_ALPHA,
+       IGT_PLANE_FB_DAMAGE_CLIPS,
        IGT_NUM_PLANE_PROPS
 };
 

2.17.1

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
---
 tests/Makefile.sources    |  1 +
 tests/igt_command_line.sh |  2 +-
 tests/kms_selftest.c      | 10 ++++++++++
 tests/meson.build         |  1 +
 4 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 tests/kms_selftest.c
index 001f1a2b..cdf5a7e1 100644
@@ -202,6 +202,7 @@ TESTS_progs = \
 	kms_pwrite_crc \
 	kms_rmfb \
 	kms_rotation_crc \
+	kms_selftest \
 	kms_setmode \
 	kms_sysfs_edid_timing \
 	kms_tv_load_detect \

index 8285ba62..a4ec3f95 100755
@@ -90,7 +90,7 @@ check_test ()
 		# Subtest enumeration of kernel selftest launchers depends
 		# on the running kernel. If selftests are not enabled,
 		# they will output nothing and exit with 0.
-		if [ "$testname" != "drv_selftest" -a "$testname" != "drm_mm" ]; then
+		if [ "$testname" != "drv_selftest" -a "$testname" != "drm_mm" -a "$testname" != "kms_selftest" ]; then
 			fail $test
 		fi
 	fi

new file mode 100644
index 00000000..f61ddd99
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include "igt.h"
+#include "igt_kmod.h"
+
+IGT_TEST_DESCRIPTION("Basic sanity check of KMS selftests.");
+
+igt_main
+{
+	igt_kselftests("test-drm_modeset", NULL, NULL, NULL);
+}

index 697ff515..d74eb109 100644
@@ -177,6 +177,7 @@ test_progs = [
 	'kms_pwrite_crc',
 	'kms_rmfb',
 	'kms_rotation_crc',
+	'kms_selftest',
 	'kms_setmode',
 	'kms_sysfs_edid_timing',
 	'kms_tv_load_detect',

2.17.1

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
---
 tests/Makefile.sources    |  1 +
 tests/igt_command_line.sh |  2 +-
 tests/kms_selftest.c      | 10 ++++++++++
 tests/meson.build         |  1 +
 4 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 tests/kms_selftest.c
index 001f1a2b..cdf5a7e1 100644
@@ -202,6 +202,7 @@ TESTS_progs = \
      kms_pwrite_crc \
      kms_rmfb \
      kms_rotation_crc \
+     kms_selftest \
      kms_setmode \
      kms_sysfs_edid_timing \
      kms_tv_load_detect \

index 8285ba62..a4ec3f95 100755
@@ -90,7 +90,7 @@ check_test ()
              # Subtest enumeration of kernel selftest launchers depends
              # on the running kernel. If selftests are not enabled,
              # they will output nothing and exit with 0.
-             if [ "$testname" != "drv_selftest" -a "$testname" != "drm_mm" ]; then
+             if [ "$testname" != "drv_selftest" -a "$testname" != "drm_mm" -a "$testname" != "kms_selftest" ]; then
                      fail $test
              fi
      fi

new file mode 100644
index 00000000..f61ddd99
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include "igt.h"
+#include "igt_kmod.h"
+
+IGT_TEST_DESCRIPTION("Basic sanity check of KMS selftests.");
+
+igt_main
+{
+     igt_kselftests("test-drm_modeset", NULL, NULL, NULL);
+}

index 697ff515..d74eb109 100644
@@ -177,6 +177,7 @@ test_progs = [
      'kms_pwrite_crc',
      'kms_rmfb',
      'kms_rotation_crc',
+     'kms_selftest',
      'kms_setmode',
      'kms_sysfs_edid_timing',
      'kms_tv_load_detect',
--

Author:     Deepak Rawat <[email protected]>
AuthorDate: Tue Oct 16 15:23:41 2018 -0700
Commit:     Daniel Vetter <[email protected]>
CommitDate: Wed Oct 17 09:41:07 2018 +0200
Cheers,
Arek
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Author:     Deepak Rawat <[email protected]>
AuthorDate: Tue Oct 16 15:23:41 2018 -0700
Commit:     Daniel Vetter <[email protected]>
CommitDate: Wed Oct 17 09:41:07 2018 +0200
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Author:     Deepak Rawat <[email protected]>
AuthorDate: Tue Oct 16 15:23:41 2018 -0700
Commit:     Daniel Vetter <[email protected]>
CommitDate: Wed Oct 17 09:41:07 2018 +0200
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Author:     Deepak Rawat <[email protected]>
AuthorDate: Tue Oct 16 15:23:41 2018 -0700
Commit:     Daniel Vetter <[email protected]>
CommitDate: Wed Oct 17 09:41:07 2018 +0200
Author:     Deepak Rawat <[email protected]>
AuthorDate: Tue Oct 16 15:23:41 2018 -0700
Commit:     Daniel Vetter <[email protected]>
CommitDate: Wed Oct 17 09:41:07 2018 +0200
Author:     Deepak Rawat <[email protected]>
AuthorDate: Tue Oct 16 15:23:39 2018 -0700
Commit:     Daniel Vetter <[email protected]>
CommitDate: Wed Oct 17 09:41:00 2018 +0200
Author:     Deepak Rawat <[email protected]>
AuthorDate: Tue Oct 16 15:23:38 2018 -0700
Commit:     Daniel Vetter <[email protected]>
CommitDate: Wed Oct 17 09:40:55 2018 +0200
Author:     Deepak Rawat <[email protected]>
AuthorDate: Tue Oct 16 15:23:37 2018 -0700
Commit:     Daniel Vetter <[email protected]>
CommitDate: Wed Oct 17 09:40:51 2018 +0200
    ==== Issues hit ====

    igt@gem_exec_suspend@basic-s4-devices:
      fi-blb-e6850:       PASS -> INCOMPLETE (fdo#107718)

    
    ==== Possible fixes ====

    igt@drv_module_reload@basic-reload:
      fi-glk-j4005:       DMESG-WARN (fdo#106725, fdo#106248) -> PASS

    igt@drv_selftest@live_hangcheck:
      fi-icl-u2:          INCOMPLETE (fdo#108315) -> PASS

    igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
      fi-glk-j4005:       FAIL (fdo#106765) -> PASS

    igt@kms_flip@basic-flip-vs-dpms:
      fi-hsw-4770r:       DMESG-WARN (fdo#105602) -> PASS

    igt@kms_flip@basic-flip-vs-wf_vblank:
      fi-glk-j4005:       FAIL (fdo#100368) -> PASS

    igt@kms_flip@basic-plain-flip:
      fi-glk-j4005:       DMESG-WARN (fdo#106097) -> PASS

    igt@kms_frontbuffer_tracking@basic:
      fi-icl-u2:          FAIL (fdo#103167) -> PASS
      fi-byt-clapper:     FAIL (fdo#103167) -> PASS
    ==== Warnings ====

    igt@pm_rc6_residency@rc6-accuracy:
      shard-snb:          SKIP -> PASS
    ==== Issues hit ====

    igt@gem_ctx_isolation@vcs1-s3:
      shard-kbl:          PASS -> INCOMPLETE (fdo#103665)

    igt@gem_exec_schedule@pi-ringfull-render:
      shard-glk:          NOTRUN -> FAIL (fdo#103158)

    igt@kms_available_modes_crc@available_mode_test_crc:
      shard-apl:          PASS -> FAIL (fdo#106641)

    igt@kms_busy@extended-modeset-hang-newfb-render-c:
      shard-hsw:          NOTRUN -> DMESG-WARN (fdo#107956)

    igt@kms_busy@extended-pageflip-hang-newfb-render-c:
      shard-glk:          PASS -> DMESG-WARN (fdo#107956)

    igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-b:
      shard-glk:          NOTRUN -> DMESG-WARN (fdo#107956) +1
      shard-kbl:          PASS -> DMESG-WARN (fdo#107956)

    igt@kms_cursor_crc@cursor-256x85-sliding:
      shard-apl:          PASS -> FAIL (fdo#103232) +2

    igt@kms_cursor_crc@cursor-64x64-onscreen:
      shard-kbl:          PASS -> FAIL (fdo#103232)

    igt@kms_cursor_legacy@cursorb-vs-flipb-toggle:
      shard-glk:          PASS -> DMESG-WARN (fdo#106538, fdo#105763)

    igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-pwrite:
      shard-apl:          PASS -> FAIL (fdo#103167)
      shard-glk:          PASS -> FAIL (fdo#103167)

    igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-move:
      shard-kbl:          PASS -> FAIL (fdo#103167) +1

    igt@kms_plane@plane-position-covered-pipe-a-planes:
      shard-glk:          PASS -> FAIL (fdo#103166) +1
      shard-kbl:          PASS -> FAIL (fdo#103166)

    igt@kms_plane_alpha_blend@pipe-a-alpha-7efc:
      shard-apl:          PASS -> FAIL (fdo#108145)
      shard-kbl:          PASS -> FAIL (fdo#108145)

    igt@kms_plane_alpha_blend@pipe-a-alpha-transparant-fb:
      shard-glk:          NOTRUN -> FAIL (fdo#108145)

    igt@kms_plane_alpha_blend@pipe-a-constant-alpha-max:
      shard-glk:          PASS -> FAIL (fdo#108145)

    igt@kms_plane_alpha_blend@pipe-c-alpha-7efc:
      shard-glk:          NOTRUN -> FAIL (fdo#108146)

    igt@kms_plane_multiple@atomic-pipe-c-tiling-y:
      shard-glk:          NOTRUN -> FAIL (fdo#103166)

    igt@kms_plane_multiple@atomic-pipe-c-tiling-yf:
      shard-apl:          PASS -> FAIL (fdo#103166) +2

    igt@kms_setmode@basic:
      shard-glk:          NOTRUN -> FAIL (fdo#99912)
      shard-hsw:          NOTRUN -> FAIL (fdo#99912)
      shard-kbl:          PASS -> FAIL (fdo#99912)

    igt@perf_pmu@render-node-busy-rcs0:
      shard-apl:          PASS -> INCOMPLETE (fdo#103927)

    
    ==== Possible fixes ====

    igt@gem_exec_await@wide-contexts:
      shard-kbl:          FAIL (fdo#106680) -> PASS

    igt@gem_ppgtt@blt-vs-render-ctxn:
      shard-kbl:          INCOMPLETE (fdo#106023, fdo#103665) -> PASS

    igt@kms_busy@extended-modeset-hang-oldfb-with-reset-render-b:
      shard-apl:          DMESG-WARN (fdo#103558, fdo#105602) -> PASS +3

    igt@kms_cursor_crc@cursor-128x42-sliding:
      shard-apl:          FAIL (fdo#103232) -> PASS +1

    igt@kms_cursor_crc@cursor-256x256-onscreen:
      shard-kbl:          FAIL (fdo#103232) -> PASS

    igt@kms_cursor_crc@cursor-256x256-random:
      shard-glk:          FAIL (fdo#103232) -> PASS +2

    igt@kms_flip@basic-flip-vs-dpms:
      shard-apl:          DMESG-FAIL (fdo#103558, fdo#105602) -> PASS

    igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt:
      shard-apl:          FAIL (fdo#103167) -> PASS +3

    igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-onoff:
      shard-glk:          FAIL (fdo#103167) -> PASS +2
      shard-kbl:          FAIL (fdo#103167) -> PASS

    igt@kms_plane_multiple@atomic-pipe-b-tiling-yf:
      shard-kbl:          FAIL (fdo#103166) -> PASS +1
      shard-apl:          FAIL (fdo#103166) -> PASS +2

lib/igt_fb: Call dumb_destroy ioctl in case of dumb buffers

Deepak Rawat

Deepak Rawat

Deepak Rawat

Deepak Rawat

Deepak Rawat

Daniel Vetter

Arkadiusz Hiler

Daniel Vetter

Daniel Vetter

Arkadiusz Hiler

Patchwork

Patchwork