diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2018-07-17 18:50:13 +0300 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2018-09-25 16:27:00 +0300 |
| commit | 42359edda12e5ebf715f2a978944a18baaba6490 (patch) | |
| tree | ce77e77c37ef48be4baa77e9e27b5779724695ea /lib | |
| parent | b7298a71744fa5a07acdcdd804f4876153d3c977 (diff) | |
lib/kms: Pass strides[] to __kms_addfb
Make __kms_addfb() usable with planar formats by passing in the
stride for each plane.
v2: Handle strides[1] for planar formats in kms_available_modes_crc
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/igt_fb.c | 7 | ||||
| -rw-r--r-- | lib/ioctl_wrappers.c | 12 | ||||
| -rw-r--r-- | lib/ioctl_wrappers.h | 8 |
3 files changed, 18 insertions, 9 deletions
diff --git a/lib/igt_fb.c b/lib/igt_fb.c index ab223865..13fce9f0 100644 --- a/lib/igt_fb.c +++ b/lib/igt_fb.c @@ -869,8 +869,13 @@ igt_create_fb_with_bo_size(int fd, int width, int height, if (tiling != LOCAL_DRM_FORMAT_MOD_NONE && tiling != LOCAL_I915_FORMAT_MOD_X_TILED) { + uint32_t pitches[4]; + + for (i = 0; i < fb_num_planes(f); i++) + pitches[i] = fb->stride; + do_or_die(__kms_addfb(fd, fb->gem_handle, width, height, - fb->stride, format, tiling, fb->offsets, + format, tiling, pitches, fb->offsets, LOCAL_DRM_MODE_FB_MODIFIERS, &fb_id)); } else { uint32_t handles[4]; diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c index d5d2a4e4..a3485726 100644 --- a/lib/ioctl_wrappers.c +++ b/lib/ioctl_wrappers.c @@ -1670,9 +1670,11 @@ void igt_require_fb_modifiers(int fd) igt_require(has_modifiers); } -int __kms_addfb(int fd, uint32_t handle, uint32_t width, uint32_t height, - uint32_t stride, uint32_t pixel_format, uint64_t modifier, - uint32_t *offsets, uint32_t flags, uint32_t *buf_id) +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], + uint32_t flags, uint32_t *buf_id) { struct drm_mode_fb_cmd2 f; int ret, i; @@ -1686,12 +1688,12 @@ int __kms_addfb(int fd, uint32_t handle, uint32_t width, uint32_t height, f.pixel_format = pixel_format; f.flags = flags; f.handles[0] = handle; - f.pitches[0] = stride; + f.pitches[0] = strides[0]; f.modifier[0] = modifier; for (i = 1; i < 4 && offsets && offsets[i]; i++) { f.handles[i] = handle; - f.pitches[i] = stride; + f.pitches[i] = strides[i]; f.modifier[i] = modifier; f.offsets[i] = offsets[i]; } diff --git a/lib/ioctl_wrappers.h b/lib/ioctl_wrappers.h index 8e2cd380..67bf5056 100644 --- a/lib/ioctl_wrappers.h +++ b/lib/ioctl_wrappers.h @@ -235,9 +235,11 @@ void igt_require_fb_modifiers(int fd); * * Creates a framebuffer object. */ -int __kms_addfb(int fd, uint32_t handle, uint32_t width, uint32_t height, - uint32_t stride, uint32_t pixel_format, uint64_t modifier, - uint32_t *offsets, uint32_t flags, uint32_t *buf_id); +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], + uint32_t flags, uint32_t *buf_id); /** * to_user_pointer: |