github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-01 02:53:36 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/i915/display: update and store the plane damage clips

Browse Source 
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)

v3: - No need to empty damage in case disp ver < 12 (Ville)
    - update to the patch subject

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Vinod Govindapillai <vinod.govindapillai@intel.com>
Signed-off-by: Mika Kahola <mika.kahola@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250228093802.27091-4-vinod.govindapillai@intel.com
This commit is contained in:
Vinod Govindapillai 2025-02-28 11:37:56 +02:00 committed by Mika Kahola
parent 9a112dd8c1
commit 6f60de67d7
3 changed files with 76 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/gpu/drm/i915/display/intel_atomic_plane.c
View File

@ -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>
@ -132,6 +133,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)
@ -337,6 +339,25 @@ 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)
return;
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)
@ -706,6 +727,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);
@ -720,10 +742,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);

2
drivers/gpu/drm/i915/display/intel_display_types.h
View File

@ -693,6 +693,8 @@ struct intel_plane_state {
u64 ccval;
const char *no_fbc_reason;
struct drm_rect damage;
};
struct intel_initial_plane_config {

46
drivers/gpu/drm/i915/display/skl_universal_plane.c
View File

@ -2269,6 +2269,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)
{
@ -2294,6 +2332,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;
@ -2309,6 +2349,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;
@ -2316,8 +2358,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);