From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Sun, 26 May 2019 22:19:51 -0300 From: Rodrigo Siqueira Message-ID: <20190527011951.h2adglmq2g24exov@smtp.gmail.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH V3 i-g-t] lib: Drop __kms_addfb() wrapper List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============0463284921==" Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: Petri Latvala , Arkadiusz Hiler , Chris Wilson , Simon Ser Cc: igt-dev@lists.freedesktop.org, intel-gfx@lists.freedesktop.org List-ID: --===============0463284921== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="p4gbez2radtfs4jp" Content-Disposition: inline --p4gbez2radtfs4jp Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable The function __kms_addfb() and drmModeAddFB2WithModifiers() have a similar code. Due to this similarity, this commit replaces all the occurrences of __kms_addfb() by drmModeAddFB2WithModifiers() and adds the required adaptations. V2: Simon Sir - Fix array data copy V1: Arkadiusz Hiler - Fix array initialization - Drop __kms_addfb() Signed-off-by: Rodrigo Siqueira --- lib/igt_aux.h | 3 +++ lib/igt_fb.c | 14 +++++++++----- lib/ioctl_wrappers.c | 33 --------------------------------- lib/ioctl_wrappers.h | 11 ----------- tests/kms_available_modes_crc.c | 14 +++++++++----- tests/kms_draw_crc.c | 10 ++++++---- tests/prime_vgem.c | 14 ++++++++------ 7 files changed, 35 insertions(+), 64 deletions(-) diff --git a/lib/igt_aux.h b/lib/igt_aux.h index 04d22904..2b08a0d4 100644 --- a/lib/igt_aux.h +++ b/lib/igt_aux.h @@ -309,4 +309,7 @@ void igt_lsof(const char *dpath); =20 uint64_t vfs_file_max(void); =20 +#define fill_memory(src, value, limit) \ + for (int _i =3D 0; _i < limit; src[_i] =3D value, _i++) + #endif /* IGT_AUX_H */ diff --git a/lib/igt_fb.c b/lib/igt_fb.c index d4929019..5f55906b 100644 --- a/lib/igt_fb.c +++ b/lib/igt_fb.c @@ -1235,6 +1235,9 @@ igt_create_fb_with_bo_size(int fd, int width, int hei= ght, struct igt_fb *fb, uint64_t bo_size, unsigned bo_stride) { + uint32_t handles[4] =3D {}; + uint64_t modifiers[4] =3D {}; + /* FIXME allow the caller to pass these in */ enum igt_color_encoding color_encoding =3D IGT_COLOR_YCBCR_BT709; enum igt_color_range color_range =3D IGT_COLOR_YCBCR_LIMITED_RANGE; @@ -1262,11 +1265,12 @@ igt_create_fb_with_bo_size(int fd, int width, int h= eight, if (fb->modifier || igt_has_fb_modifiers(fd)) flags =3D LOCAL_DRM_MODE_FB_MODIFIERS; =20 - do_or_die(__kms_addfb(fb->fd, fb->gem_handle, - fb->width, fb->height, - fb->drm_format, fb->modifier, - fb->strides, fb->offsets, fb->num_planes, flags, - &fb->fb_id)); + fill_memory(handles, fb->gem_handle, fb->num_planes); + fill_memory(modifiers, modifier, fb->num_planes); + do_or_die(drmModeAddFB2WithModifiers(fb->fd, fb->width, fb->height, + fb->drm_format, handles, + fb->strides, fb->offsets, + modifiers, &fb->fb_id, flags)); =20 return fb->fb_id; } diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c index 280fdd62..0f00971d 100644 --- a/lib/ioctl_wrappers.c +++ b/lib/ioctl_wrappers.c @@ -1453,36 +1453,3 @@ void igt_require_fb_modifiers(int fd) { igt_require(igt_has_fb_modifiers(fd)); } - -int __kms_addfb(int fd, uint32_t handle, - uint32_t width, uint32_t height, - uint32_t pixel_format, uint64_t modifier, - uint32_t strides[4], uint32_t offsets[4], - int num_planes, uint32_t flags, uint32_t *buf_id) -{ - struct drm_mode_fb_cmd2 f; - int ret, i; - - if (flags & DRM_MODE_FB_MODIFIERS) - igt_require_fb_modifiers(fd); - - memset(&f, 0, sizeof(f)); - - f.width =3D width; - f.height =3D height; - f.pixel_format =3D pixel_format; - f.flags =3D flags; - - for (i =3D 0; i < num_planes; i++) { - f.handles[i] =3D handle; - f.modifier[i] =3D modifier; - f.pitches[i] =3D strides[i]; - f.offsets[i] =3D offsets[i]; - } - - ret =3D igt_ioctl(fd, DRM_IOCTL_MODE_ADDFB2, &f); - - *buf_id =3D f.fb_id; - - return ret < 0 ? -errno : ret; -} diff --git a/lib/ioctl_wrappers.h b/lib/ioctl_wrappers.h index 03211c97..4afc3e09 100644 --- a/lib/ioctl_wrappers.h +++ b/lib/ioctl_wrappers.h @@ -209,17 +209,6 @@ struct local_drm_mode_fb_cmd2 { bool igt_has_fb_modifiers(int fd); void igt_require_fb_modifiers(int fd); =20 -/** - * __kms_addfb: - * - * Creates a framebuffer object. - */ -int __kms_addfb(int fd, uint32_t handle, - uint32_t width, uint32_t height, - uint32_t pixel_format, uint64_t modifier, - uint32_t strides[4], uint32_t offsets[4], - int num_planes, uint32_t flags, uint32_t *buf_id); - /** * to_user_pointer: * diff --git a/tests/kms_available_modes_crc.c b/tests/kms_available_modes_cr= c.c index 50b5522a..275b4b6f 100644 --- a/tests/kms_available_modes_crc.c +++ b/tests/kms_available_modes_crc.c @@ -172,9 +172,10 @@ static bool setup_fb(data_t *data, igt_output_t *outpu= t, igt_plane_t *plane, { drmModeModeInfo *mode; uint64_t w, h; + uint32_t handles[4] =3D {}; + uint64_t modifiers[4] =3D {}; signed ret, gemsize =3D 0; unsigned tile_width, tile_height; - int num_planes =3D 1; uint64_t tiling; int bpp =3D 0; int i; @@ -225,10 +226,13 @@ static bool setup_fb(data_t *data, igt_output_t *outp= ut, igt_plane_t *plane, =20 igt_assert_eq(ret, 0); =20 - ret =3D __kms_addfb(data->gfx_fd, data->gem_handle, w, h, - format, tiling, data->fb.strides, data->fb.offsets, - num_planes, LOCAL_DRM_MODE_FB_MODIFIERS, - &data->fb.fb_id); + fill_memory(handles, data->gem_handle, 1); + fill_memory(modifiers, tiling, 1); + ret =3D drmModeAddFB2WithModifiers(data->gfx_fd, w, h, format, + handles, data->fb.strides, + data->fb.offsets, modifiers, + &data->fb.fb_id, + LOCAL_DRM_MODE_FB_MODIFIERS); =20 if(ret < 0) { igt_info("Creating fb for format %s failed, return code %d\n", diff --git a/tests/kms_draw_crc.c b/tests/kms_draw_crc.c index ea14db9a..38f92ab9 100644 --- a/tests/kms_draw_crc.c +++ b/tests/kms_draw_crc.c @@ -155,17 +155,19 @@ static void get_method_crc(enum igt_draw_method metho= d, uint32_t drm_format, =20 static bool format_is_supported(uint32_t format, uint64_t modifier) { - uint32_t gem_handle, fb_id; + uint32_t gem_handle, fb_id, handles[4] =3D {}; unsigned int offsets[4] =3D {}; unsigned int strides[4] =3D {}; + uint64_t modifiers[4] =3D {}; int ret; =20 gem_handle =3D igt_create_bo_with_dimensions(drm_fd, 64, 64, format, modifier, 0, NULL, &strides[0], NULL); - ret =3D __kms_addfb(drm_fd, gem_handle, 64, 64, - format, modifier, strides, offsets, 1, - LOCAL_DRM_MODE_FB_MODIFIERS, &fb_id); + fill_memory(handles, gem_handle, 1); + ret =3D drmModeAddFB2WithModifiers(drm_fd, 64, 64, format, handles, + strides, offsets, modifiers, &fb_id, + LOCAL_DRM_MODE_FB_MODIFIERS); drmModeRmFB(drm_fd, fb_id); gem_close(drm_fd, gem_handle); =20 diff --git a/tests/prime_vgem.c b/tests/prime_vgem.c index 09e3373b..da15fd14 100644 --- a/tests/prime_vgem.c +++ b/tests/prime_vgem.c @@ -761,6 +761,7 @@ static void test_flip(int i915, int vgem, unsigned hang) for (int i =3D 0; i < 2; i++) { uint32_t strides[4] =3D {}; uint32_t offsets[4] =3D {}; + uint32_t handles[4] =3D {}; int fd; =20 bo[i].width =3D mode->hdisplay; @@ -776,12 +777,13 @@ static void test_flip(int i915, int vgem, unsigned ha= ng) strides[0] =3D bo[i].pitch; =20 /* May skip if i915 has no displays */ - igt_require(__kms_addfb(i915, handle[i], - bo[i].width, bo[i].height, - DRM_FORMAT_XRGB8888, I915_TILING_NONE, - strides, offsets, 1, - LOCAL_DRM_MODE_FB_MODIFIERS, - &fb_id[i]) =3D=3D 0); + fill_memory(handles, handle[i],1); + igt_require(drmModeAddFB2WithModifiers(i915, bo[i].width, bo[i].height, + DRM_FORMAT_XRGB8888, + handles, strides, offsets, + I915_TILING_NONE, &fb_id[i], + LOCAL_DRM_MODE_FB_MODIFIERS) =3D=3D 0); + igt_assert(fb_id[i]); } =20 --=20 2.21.0 --p4gbez2radtfs4jp Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEE4tZ+ii1mjMCMQbfkWJzP/comvP8FAlzrOzcACgkQWJzP/com vP9eMA/+JWworTc7Loj42TxpSpjmmaShtby/RQcqf+j6w2LcS8ZtdWfM1ZWnAXOT Pccwr6iWNsVvKDn/95li+7C11myX5NAmH309asuYDMunwMqbxaNfmHBFtNx69lbB 4kycIGfVdU6vCRx7PXLA7vHYcCR8M/Eo+YrO9bL6gMMcC/YBOaSNwqUOsNBn76hX ZQuXRNV1nypZwoyOFZDlP1X/JkvFBWExoArc/w+nfVu4s/SAazHo0HBbFRdH/UY9 g0ifENIx3oAMI4RkgxrKFLXerV2YaYLvfpcUwdGgizV1bp+8PRui3n0QxmMut8gv 6WQCeU+YyZzy3O4KwDmMPNA40VP7hthhuyg4tO2I9ErICX79pHHIdL6JFTI0RejH XluTdmHPanaSaSSpWf7ySMSRW5g0HTsVTN7TEzyK8NFEBMURtsSteqbiSRxBpmp0 qmJrdOTsMxQHMm/tCDOH6M2ABbxf7t10XQez2gKp9t8yfHuS2eQGvrTOVWEkHKEx iLcNqcFSuLLQ0gKHYpB4TfPlrZrO7BNZzcez/SUZH80Du+S53zYXTQRZnv7+szt+ vcYdC+IOUdcTs1odsO+cIucZws5aafCMA8Z+mJPWTZ+5uPL2639BLxDKBR/2qHz4 6ExE3YzRXN0k9xBkrqnwe9GpkmhuPJGrS90JSWL4CIaWIkdj8io= =Vuz8 -----END PGP SIGNATURE----- --p4gbez2radtfs4jp-- --===============0463284921== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KaWd0LWRldiBt YWlsaW5nIGxpc3QKaWd0LWRldkBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pZ3QtZGV2 --===============0463284921==--