diff options
author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2019-03-04 17:47:40 -0800 |
---|---|---|
committer | Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com> | 2019-03-11 15:07:22 -0700 |
commit | 0e9695fd9b280286be027e700a0d3796f5cf9aa9 (patch) | |
tree | 2faf6859eff4f78b9ae2bb90c2a5f04a05136433 /lib/igt_fb.h | |
parent | 00ccf66b54bb58dcc08356ff1c9ae206b496be4e (diff) |
lib/igt_fb: s/tiling/modifier/ where appropriate
Rename the igt_fb.tiling to igt_fb.modifier to better reflect
what information it carries. Now it's clear whether we're talking
about a modifier or a i915 tiling thing.
Cc: Clinton Taylor <clinton.a.taylor@intel.com>
>From DK:
Rebased on vc4 changes
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Diffstat (limited to 'lib/igt_fb.h')
-rw-r--r-- | lib/igt_fb.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/igt_fb.h b/lib/igt_fb.h index e1d885e2..24d40b18 100644 --- a/lib/igt_fb.h +++ b/lib/igt_fb.h @@ -53,7 +53,7 @@ * @drm_format: DRM FOURCC code * @width: width in pixels * @height: height in pixels - * @tiling: tiling mode as a DRM framebuffer modifier + * @modifier: tiling mode as a DRM framebuffer modifier * @size: size in bytes of the underlying backing storage * @cairo_surface: optionally attached cairo drawing surface * @domain: current domain for cache flushing tracking on i915.ko @@ -76,7 +76,7 @@ typedef struct igt_fb { int height; enum igt_color_encoding color_encoding; enum igt_color_range color_range; - uint64_t tiling; + uint64_t modifier; uint64_t size; cairo_surface_t *cairo_surface; unsigned int domain; @@ -108,34 +108,34 @@ enum igt_text_align { align_hcenter = 0x08, }; -void igt_get_fb_tile_size(int fd, uint64_t tiling, int fb_bpp, +void igt_get_fb_tile_size(int fd, uint64_t modifier, int fb_bpp, unsigned *width_ret, unsigned *height_ret); -void igt_calc_fb_size(int fd, int width, int height, uint32_t format, uint64_t tiling, +void igt_calc_fb_size(int fd, int width, int height, uint32_t format, uint64_t modifier, uint64_t *size_ret, unsigned *stride_ret); unsigned int igt_create_fb_with_bo_size(int fd, int width, int height, - uint32_t format, uint64_t tiling, + uint32_t format, uint64_t modifier, struct igt_fb *fb, uint64_t bo_size, unsigned bo_stride); unsigned int igt_create_fb(int fd, int width, int height, uint32_t format, - uint64_t tiling, struct igt_fb *fb); + uint64_t modifier, struct igt_fb *fb); unsigned int igt_create_color_fb(int fd, int width, int height, - uint32_t format, uint64_t tiling, + uint32_t format, uint64_t modifier, double r, double g, double b, struct igt_fb *fb /* out */); unsigned int igt_create_pattern_fb(int fd, int width, int height, - uint32_t format, uint64_t tiling, + uint32_t format, uint64_t modifier, struct igt_fb *fb /* out */); unsigned int igt_create_color_pattern_fb(int fd, int width, int height, - uint32_t format, uint64_t tiling, + uint32_t format, uint64_t modifier, double r, double g, double b, struct igt_fb *fb /* out */); unsigned int igt_create_image_fb(int drm_fd, int width, int height, - uint32_t format, uint64_t tiling, + uint32_t format, uint64_t modifier, const char *filename, struct igt_fb *fb /* out */); unsigned int igt_create_stereo_fb(int drm_fd, drmModeModeInfo *mode, - uint32_t format, uint64_t tiling); + uint32_t format, uint64_t modifier); unsigned int igt_fb_convert_with_stride(struct igt_fb *dst, struct igt_fb *src, uint32_t dst_fourcc, uint64_t dst_modifier, |