drm/i915: Introduce scaled_planes bitmask

Add another plane bitmask, this time tracking which planes are
scaled. This is going to be useful in ILK watermark computations,
and skl+ pipe scaler assignments.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220211090629.15555-4-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
index 687fc2e3a0d8a6640b527aed802ac32c6d50ebb2..e9893e31403774d537dc7906ded19001dda87663 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
@@ -323,6 +323,7 @@ void intel_plane_set_invisible(struct intel_crtc_state *crtc_state,
        struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane);
 
        crtc_state->active_planes &= ~BIT(plane->id);
+       crtc_state->scaled_planes &= ~BIT(plane->id);
        crtc_state->nv12_planes &= ~BIT(plane->id);
        crtc_state->c8_planes &= ~BIT(plane->id);
        crtc_state->data_rate[plane->id] = 0;
@@ -536,6 +537,10 @@ int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_
        if (new_plane_state->uapi.visible)
                new_crtc_state->active_planes |= BIT(plane->id);
 
+       if (new_plane_state->uapi.visible &&
+           intel_plane_is_scaled(new_plane_state))
+               new_crtc_state->scaled_planes |= BIT(plane->id);
+
        if (new_plane_state->uapi.visible &&
            intel_format_info_is_yuv_semiplanar(fb->format, fb->modifier))
                new_crtc_state->nv12_planes |= BIT(plane->id);

diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index 1ea6cd8b44ecf4c5e808d31ec51fdfb74cf4a732..31ecf9e97fabe69ae17c2e833d8af3798d9fbe9c 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -1168,6 +1168,7 @@ struct intel_crtc_state {
 
        /* bitmask of actually visible planes (enum plane_id) */
        u8 active_planes;
+       u8 scaled_planes;
        u8 nv12_planes;
        u8 c8_planes;