diff options
| author | Lucas De Marchi <lucas.demarchi@intel.com> | 2021-07-10 23:12:04 -0700 |
|---|---|---|
| committer | Lucas De Marchi <lucas.demarchi@intel.com> | 2021-07-15 12:01:56 -0700 |
| commit | d491d3c7bc8ab45b4c03ed287a176d404c34c38e (patch) | |
| tree | 29dea33ea36f5e1a047fd71b212c2669ac1bcbf5 /tests/i915/i915_pm_rpm.c | |
| parent | ac539412cc51238e229337aa4febe6de93050f91 (diff) | |
Remove local copies of I915 macros
Just use the one from the kernel headers. Updated with:
git grep -l LOCAL_I915 | \
xargs sed -i -e '/^#define LOCAL_I915/d' -e 's/LOCAL_\(I915[[:alnum:]_]*\)/\1/g'
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
Diffstat (limited to 'tests/i915/i915_pm_rpm.c')
| -rw-r--r-- | tests/i915/i915_pm_rpm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/i915/i915_pm_rpm.c b/tests/i915/i915_pm_rpm.c index fb7a70aa..6b086eee 100644 --- a/tests/i915/i915_pm_rpm.c +++ b/tests/i915/i915_pm_rpm.c @@ -1592,7 +1592,7 @@ static void cursor_subtest(bool dpms) igt_create_fb(drm_fd, 64, 64, DRM_FORMAT_ARGB8888, LOCAL_DRM_FORMAT_MOD_NONE, &cursor_fb2); igt_create_fb(drm_fd, 64, 64, DRM_FORMAT_XRGB8888, - LOCAL_I915_FORMAT_MOD_X_TILED, &cursor_fb3); + I915_FORMAT_MOD_X_TILED, &cursor_fb3); fill_igt_fb(&cursor_fb1, 0xFF00FFFF); fill_igt_fb(&cursor_fb2, 0xFF00FF00); @@ -1710,13 +1710,13 @@ static void test_one_plane(bool dpms, uint32_t plane_id, plane_format = DRM_FORMAT_XRGB8888; plane_w = 64; plane_h = 64; - tiling = LOCAL_I915_FORMAT_MOD_X_TILED; + tiling = I915_FORMAT_MOD_X_TILED; break; case PLANE_PRIMARY: plane_format = DRM_FORMAT_XRGB8888; plane_w = default_mode_params->mode->hdisplay; plane_h = default_mode_params->mode->vdisplay; - tiling = LOCAL_I915_FORMAT_MOD_X_TILED; + tiling = I915_FORMAT_MOD_X_TILED; break; case PLANE_CURSOR: plane_format = DRM_FORMAT_ARGB8888; @@ -1935,7 +1935,7 @@ static void fences_subtest(bool dpms) params.connector_id = default_mode_params->connector_id; params.mode = default_mode_params->mode; igt_create_fb(drm_fd, params.mode->hdisplay, params.mode->vdisplay, - DRM_FORMAT_XRGB8888, LOCAL_I915_FORMAT_MOD_X_TILED, + DRM_FORMAT_XRGB8888, I915_FORMAT_MOD_X_TILED, ¶ms.fb); /* Even though we passed "true" as the tiling argument, double-check |