diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2021-10-08 17:26:16 +0300 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2021-10-11 15:37:24 +0300 |
| commit | 6b5b8991a8f173a5ec675963e4f23416484e6655 (patch) | |
| tree | 22854cef899774172ecddce52b25621d13845697 /tests/kms_rotation_crc.c | |
| parent | 426723f979380f18f9c07d36ebac3a52f760ba7e (diff) | |
igt: s/DRM_FORMAT_MOD_NONE/DRM_FORMAT_MOD_LINEAR/
DRM_FORMAT_MOD_LINEAR is the more sensible name for
DRM_FORMAT_MOD_NONE. Use the better name.
Reviewed-by: Petri Latvala <petri.latvala@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Diffstat (limited to 'tests/kms_rotation_crc.c')
| -rw-r--r-- | tests/kms_rotation_crc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/kms_rotation_crc.c b/tests/kms_rotation_crc.c index a7f4d22f..742e5107 100644 --- a/tests/kms_rotation_crc.c +++ b/tests/kms_rotation_crc.c @@ -225,7 +225,7 @@ static void prepare_fbs(data_t *data, igt_output_t *output, drmModeModeInfo *mode; igt_display_t *display = &data->display; unsigned int w, h, ref_w, ref_h, min_w, min_h; - uint64_t tiling = data->override_tiling ?: DRM_FORMAT_MOD_NONE; + uint64_t tiling = data->override_tiling ?: DRM_FORMAT_MOD_LINEAR; uint32_t pixel_format = data->override_fmt ?: DRM_FORMAT_XRGB8888; const float flip_opacity = 0.75; @@ -315,7 +315,7 @@ static void prepare_fbs(data_t *data, igt_output_t *output, * Create a reference CRC for a software-rotated fb. */ igt_create_fb(data->gfx_fd, ref_w, ref_h, pixel_format, - data->override_tiling ?: DRM_FORMAT_MOD_NONE, &data->fb_reference); + data->override_tiling ?: DRM_FORMAT_MOD_LINEAR, &data->fb_reference); paint_squares(data, data->rotation, &data->fb_reference, 1.0); igt_plane_set_fb(plane, &data->fb_reference); @@ -682,13 +682,13 @@ static void test_multi_plane_rotation(data_t *data, enum pipe pipe) uint64_t tiling; struct igt_fb fbs[ARRAY_SIZE(formatlist)][2]; } planeconfigs[] = { - {IGT_ROTATION_0, .2f, .4f, DRM_FORMAT_MOD_NONE }, + {IGT_ROTATION_0, .2f, .4f, DRM_FORMAT_MOD_LINEAR }, {IGT_ROTATION_0, .2f, .4f, I915_FORMAT_MOD_X_TILED }, {IGT_ROTATION_0, .2f, .4f, I915_FORMAT_MOD_Y_TILED }, {IGT_ROTATION_0, .2f, .4f, I915_FORMAT_MOD_Yf_TILED }, {IGT_ROTATION_90, .2f, .4f, I915_FORMAT_MOD_Y_TILED }, {IGT_ROTATION_90, .2f, .4f, I915_FORMAT_MOD_Yf_TILED }, - {IGT_ROTATION_180, .2f, .4f, DRM_FORMAT_MOD_NONE }, + {IGT_ROTATION_180, .2f, .4f, DRM_FORMAT_MOD_LINEAR }, {IGT_ROTATION_180, .2f, .4f, I915_FORMAT_MOD_X_TILED }, {IGT_ROTATION_180, .2f, .4f, I915_FORMAT_MOD_Y_TILED }, {IGT_ROTATION_180, .2f, .4f, I915_FORMAT_MOD_Yf_TILED }, @@ -1064,7 +1064,7 @@ igt_main_args("", long_opts, help_str, opt_handler, &data) AMD_FMT_MOD_SET(TILE, AMD_FMT_MOD_TILE_GFX9_64K_S) | AMD_FMT_MOD_SET(TILE_VERSION, AMD_FMT_MOD_TILE_VER_GFX9); else - data.override_tiling = DRM_FORMAT_MOD_NONE; + data.override_tiling = DRM_FORMAT_MOD_LINEAR; } data.rotation = subtest->rot; test_plane_rotation(&data, subtest->plane, false); |