On Wed, 2025-02-12 at 20:35 +0200, Ville Syrjälä wrote:
> On Wed, Feb 12, 2025 at 03:14:15PM +0200, Vinod Govindapillai wrote:
> > Userspace can pass damage area clips per plane to track
> > changes in a plane and some display components can utilze
> > these damage clips for efficiently handling use cases like
> > FBC, PSR etc. A merged damage area is generated and its
> > coordinates are updated relative to viewport and HW and
> > stored in the plane_state. This merged damage areas will be
> > used for FBC dirty rect support in xe3 in the follow-up
> > patch.
> >
> > Big thanks to Ville Syrjala for his contribuitions in shaping
> > up of this series.
> >
> > v1: - Move damage_merged helper to cover bigjoiner case and use
> > the correct plane state for damage find helper (Ville)
> > - Damage handling code under HAS_FBC_DIRTY_RECT() so the
> > the related part will be executed only for xe3+
> > - Changed dev_priv to i915 in one of the functions
> >
> > v2: - damage reported is stored in the plane state after coords
> > adjustmentments irrespective of fbc dirty rect support.
> > - Damage to be empty in case of plane not visible (Ville)
> > - Handle fb could be NULL and plane not visible cases (Ville)
> >
> > Signed-off-by: Vinod Govindapillai <vinod.govindapillai@xxxxxxxxx>
> > ---
> > .../gpu/drm/i915/display/intel_atomic_plane.c | 31 +++++++++++++
> > .../drm/i915/display/intel_display_types.h | 2 +
> > .../drm/i915/display/skl_universal_plane.c | 46 ++++++++++++++++++-
> > 3 files changed, 78 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c
> > b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
> > index 8a49d87d9bd9..b4e94dd01173 100644
> > --- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c
> > +++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
> > @@ -36,6 +36,7 @@
> >
> > #include <drm/drm_atomic_helper.h>
> > #include <drm/drm_blend.h>
> > +#include <drm/drm_damage_helper.h>
> > #include <drm/drm_fourcc.h>
> > #include <drm/drm_gem.h>
> > #include <drm/drm_gem_atomic_helper.h>
> > @@ -117,6 +118,7 @@ intel_plane_duplicate_state(struct drm_plane *plane)
> > intel_state->ggtt_vma = NULL;
> > intel_state->dpt_vma = NULL;
> > intel_state->flags = 0;
> > + intel_state->damage = DRM_RECT_INIT(0, 0, 0, 0);
> >
> > /* add reference to fb */
> > if (intel_state->hw.fb)
> > @@ -322,6 +324,27 @@ static void intel_plane_clear_hw_state(struct intel_plane_state
> > *plane_state)
> > memset(&plane_state->hw, 0, sizeof(plane_state->hw));
> > }
> >
> > +static void
> > +intel_plane_copy_uapi_plane_damage(struct intel_plane_state *new_plane_state,
> > + const struct intel_plane_state *old_uapi_plane_state,
> > + const struct intel_plane_state *new_uapi_plane_state)
> > +{
> > + struct intel_display *display = to_intel_display(new_plane_state);
> > + struct drm_rect *damage = &new_plane_state->damage;
> > +
> > + /* damage property tracking enabled from display version 12 onwards */
> > + if (DISPLAY_VER(display) < 12) {
> > + *damage = DRM_RECT_INIT(0, 0, 0, 0);
> > + return;
> > + }
>
> I don't think that is needed. If we have no damage prop then the helper
> will give us full damage.
We do this drm_plane_enable_fb_damage_clips from from display version 12 onwards.
if (DISPLAY_VER(display) >= 12)
drm_plane_enable_fb_damage_clips(&plane->base);
There will be a dmesg warn if we call that damage helper without the enable_fb_damage_clips
"4> [44.199485] i915 0000:00:02.0: [drm] drm_plane_enable_fb_damage_clips() not called"
For example,
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_141527v6/bat-jsl-1/igt@i915_module_load@xxxxxxxxx#dmesg-warnings329
BR
Vinod
>
> > +
> > + if (!drm_atomic_helper_damage_merged(&old_uapi_plane_state->uapi,
> > + &new_uapi_plane_state->uapi,
> > + damage))
> > + /* Incase helper fails, mark whole plane region as damage */
> > + *damage = drm_plane_state_src(&new_uapi_plane_state->uapi);
> > +}
> > +
> > void intel_plane_copy_uapi_to_hw_state(struct intel_plane_state *plane_state,
> > const struct intel_plane_state *from_plane_state,
> > struct intel_crtc *crtc)
> > @@ -691,6 +714,7 @@ int intel_plane_atomic_check(struct intel_atomic_state *state,
> > const struct intel_plane_state *old_plane_state =
> > intel_atomic_get_old_plane_state(state, plane);
> > const struct intel_plane_state *new_primary_crtc_plane_state;
> > + const struct intel_plane_state *old_primary_crtc_plane_state;
> > struct intel_crtc *crtc = intel_crtc_for_pipe(display, plane->pipe);
> > const struct intel_crtc_state *old_crtc_state =
> > intel_atomic_get_old_crtc_state(state, crtc);
> > @@ -705,10 +729,17 @@ int intel_plane_atomic_check(struct intel_atomic_state *state,
> >
> > new_primary_crtc_plane_state =
> > intel_atomic_get_new_plane_state(state, primary_crtc_plane);
> > + old_primary_crtc_plane_state =
> > + intel_atomic_get_old_plane_state(state, primary_crtc_plane);
> > } else {
> > new_primary_crtc_plane_state = new_plane_state;
> > + old_primary_crtc_plane_state = old_plane_state;
> > }
> >
> > + intel_plane_copy_uapi_plane_damage(new_plane_state,
> > + old_primary_crtc_plane_state,
> > + new_primary_crtc_plane_state);
> > +
> > intel_plane_copy_uapi_to_hw_state(new_plane_state,
> > new_primary_crtc_plane_state,
> > crtc);
> > diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h
> > b/drivers/gpu/drm/i915/display/intel_display_types.h
> > index 6a82c6ade549..844f92ea4f45 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display_types.h
> > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h
> > @@ -697,6 +697,8 @@ struct intel_plane_state {
> > u64 ccval;
> >
> > const char *no_fbc_reason;
> > +
> > + struct drm_rect damage;
> > };
> >
> > struct intel_initial_plane_config {
> > diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> > b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> > index eb85d3d6cdc3..3e3c22a26357 100644
> > --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> > +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> > @@ -2260,6 +2260,44 @@ static void check_protection(struct intel_plane_state *plane_state)
> > !plane_state->decrypt;
> > }
> >
> > +static void
> > +make_damage_viewport_relative(struct intel_plane_state *plane_state)
> > +{
> > + const struct drm_framebuffer *fb = plane_state->hw.fb;
> > + const struct drm_rect *src = &plane_state->uapi.src;
> > + unsigned int rotation = plane_state->hw.rotation;
> > + struct drm_rect *damage = &plane_state->damage;
> > +
> > + if (!drm_rect_visible(damage))
> > + return;
> > +
> > + if (!fb || !plane_state->uapi.visible) {
> > + plane_state->damage = DRM_RECT_INIT(0, 0, 0, 0);
> > + return;
> > + }
> > +
> > + if (drm_rotation_90_or_270(rotation)) {
> > + drm_rect_rotate(damage, fb->width, fb->height,
> > + DRM_MODE_ROTATE_270);
> > + drm_rect_translate(damage, -(src->y1 >> 16), -(src->x1 >> 16));
> > + } else {
> > + drm_rect_translate(damage, -(src->x1 >> 16), -(src->y1 >> 16));
> > + }
> > +}
> > +
> > +static void clip_damage(struct intel_plane_state *plane_state)
> > +{
> > + struct drm_rect *damage = &plane_state->damage;
> > + struct drm_rect src;
> > +
> > + if (!drm_rect_visible(damage))
> > + return;
> > +
> > + drm_rect_fp_to_int(&src, &plane_state->uapi.src);
> > + drm_rect_translate(damage, src.x1, src.y1);
> > + drm_rect_intersect(damage, &src);
> > +}
> > +
> > static int skl_plane_check(struct intel_crtc_state *crtc_state,
> > struct intel_plane_state *plane_state)
> > {
> > @@ -2285,6 +2323,8 @@ static int skl_plane_check(struct intel_crtc_state *crtc_state,
> > if (ret)
> > return ret;
> >
> > + make_damage_viewport_relative(plane_state);
> > +
> > ret = skl_check_plane_surface(plane_state);
> > if (ret)
> > return ret;
> > @@ -2300,6 +2340,8 @@ static int skl_plane_check(struct intel_crtc_state *crtc_state,
> > if (ret)
> > return ret;
> >
> > + clip_damage(plane_state);
> > +
> > ret = skl_plane_check_nv12_rotation(plane_state);
> > if (ret)
> > return ret;
> > @@ -2307,8 +2349,10 @@ static int skl_plane_check(struct intel_crtc_state *crtc_state,
> > check_protection(plane_state);
> >
> > /* HW only has 8 bits pixel precision, disable plane if invisible */
> > - if (!(plane_state->hw.alpha >> 8))
> > + if (!(plane_state->hw.alpha >> 8)) {
> > plane_state->uapi.visible = false;
> > + plane_state->damage = DRM_RECT_INIT(0, 0, 0, 0);
> > + }
> >
> > plane_state->ctl = skl_plane_ctl(crtc_state, plane_state);
> >
> > --
> > 2.43.0
>
