]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/i915/fb: Use i915_gtt_view_is_*()
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Tue, 7 Apr 2026 15:50:50 +0000 (18:50 +0300)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Fri, 10 Apr 2026 10:29:02 +0000 (13:29 +0300)
Replace the naked GTT view type checks with the new
i915_gtt_view_is_*() helpers. This isolates some of
the code from GTT view implementation details.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/20260407155053.32156-10-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/display/intel_fb.c

index 52a619088e8e92c4773d1d05742d7c5ee2da6457..ceed695d3ad499b8e4fdcc38f34e4314c2c21284 100644 (file)
@@ -1284,7 +1284,7 @@ bool intel_plane_uses_fence(const struct intel_plane_state *plane_state)
 
        return DISPLAY_VER(display) < 4 ||
                (plane->fbc && !plane_state->no_fbc_reason &&
-                plane_state->view.gtt.type == I915_GTT_VIEW_NORMAL);
+                i915_gtt_view_is_normal(&plane_state->view.gtt));
 }
 
 static int intel_fb_pitch(const struct intel_framebuffer *fb, int color_plane, unsigned int rotation)
@@ -1506,7 +1506,7 @@ static u32 calc_plane_remap_info(const struct intel_framebuffer *fb, int color_p
                               plane_view_height_tiles(fb, color_plane, dims, y));
        }
 
-       if (view->gtt.type == I915_GTT_VIEW_ROTATED) {
+       if (i915_gtt_view_is_rotated(&view->gtt)) {
                drm_WARN_ON(display->drm, remap_info->linear);
                check_array_bounds(display, view->gtt.rotated.plane, color_plane);
 
@@ -1531,7 +1531,7 @@ static u32 calc_plane_remap_info(const struct intel_framebuffer *fb, int color_p
                /* rotate the tile dimensions to match the GTT view */
                swap(tile_width, tile_height);
        } else {
-               drm_WARN_ON(display->drm, view->gtt.type != I915_GTT_VIEW_REMAPPED);
+               drm_WARN_ON(display->drm, !i915_gtt_view_is_remapped(&view->gtt));
 
                check_array_bounds(display, view->gtt.remapped.plane, color_plane);
 
@@ -1632,7 +1632,7 @@ static void intel_fb_view_init(struct intel_display *display,
        memset(view, 0, sizeof(*view));
        view->gtt.type = view_type;
 
-       if (view_type == I915_GTT_VIEW_REMAPPED &&
+       if (i915_gtt_view_is_remapped(&view->gtt) &&
            (display->platform.alderlake_p || DISPLAY_VER(display) >= 14))
                view->gtt.remapped.plane_alignment = SZ_2M / PAGE_SIZE;
 }