From: "Kahola, Mika" <mika.kahola@intel.com>
To: "Hogander, Jouni" <jouni.hogander@intel.com>,
"dri-devel@lists.freedesktop.org"
<dri-devel@lists.freedesktop.org>,
"intel-gfx@lists.freedesktop.org"
<intel-gfx@lists.freedesktop.org>
Cc: "Hogander, Jouni" <jouni.hogander@intel.com>
Subject: RE: [PATCH v2 1/4] drm: Use original src rect while initializing damage iterator
Date: Fri, 2 Sep 2022 10:58:35 +0000 [thread overview]
Message-ID: <MWHPR1101MB2157B2A014A6A9D0BAE532F8EF7A9@MWHPR1101MB2157.namprd11.prod.outlook.com> (raw)
In-Reply-To: <20220823112920.352563-2-jouni.hogander@intel.com>
> -----Original Message-----
> From: dri-devel <dri-devel-bounces@lists.freedesktop.org> On Behalf Of Jouni
> Högander
> Sent: Tuesday, August 23, 2022 2:29 PM
> To: dri-devel@lists.freedesktop.org; intel-gfx@lists.freedesktop.org
> Cc: Hogander, Jouni <jouni.hogander@intel.com>
> Subject: [PATCH v2 1/4] drm: Use original src rect while initializing damage
> iterator
>
> drm_plane_state->src might be modified by the driver. This is done e.g. in i915
> driver when there is bigger framebuffer than the plane and there is some offset
> within framebuffer. I915 driver calculates separate offset and adjusts src rect
> coords to be relative to this offset. Damage clips are still relative to original src
> coords provided by user-space.
>
> This patch ensures original coordinates provided by user-space are used when
> initiliazing damage iterator.
>
Looks ok.
Reviewed-by: Mika Kahola <mika.kahola@intel.com>
> Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
> ---
> drivers/gpu/drm/drm_damage_helper.c | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_damage_helper.c
> b/drivers/gpu/drm/drm_damage_helper.c
> index 937b699ac2a8..d8b2955e88fd 100644
> --- a/drivers/gpu/drm/drm_damage_helper.c
> +++ b/drivers/gpu/drm/drm_damage_helper.c
> @@ -224,6 +224,7 @@ drm_atomic_helper_damage_iter_init(struct
> drm_atomic_helper_damage_iter *iter,
> const struct drm_plane_state *old_state,
> const struct drm_plane_state *state) {
> + struct drm_rect src;
> memset(iter, 0, sizeof(*iter));
>
> if (!state || !state->crtc || !state->fb || !state->visible) @@ -233,10
> +234,12 @@ drm_atomic_helper_damage_iter_init(struct
> drm_atomic_helper_damage_iter *iter,
> iter->num_clips = drm_plane_get_damage_clips_count(state);
>
> /* Round down for x1/y1 and round up for x2/y2 to catch all pixels */
> - iter->plane_src.x1 = state->src.x1 >> 16;
> - iter->plane_src.y1 = state->src.y1 >> 16;
> - iter->plane_src.x2 = (state->src.x2 >> 16) + !!(state->src.x2 & 0xFFFF);
> - iter->plane_src.y2 = (state->src.y2 >> 16) + !!(state->src.y2 & 0xFFFF);
> + src = drm_plane_state_src(state);
> +
> + iter->plane_src.x1 = src.x1 >> 16;
> + iter->plane_src.y1 = src.y1 >> 16;
> + iter->plane_src.x2 = (src.x2 >> 16) + !!(src.x2 & 0xFFFF);
> + iter->plane_src.y2 = (src.y2 >> 16) + !!(src.y2 & 0xFFFF);
>
> if (!iter->clips || !drm_rect_equals(&state->src, &old_state->src)) {
> iter->clips = NULL;
> --
> 2.34.1
next prev parent reply other threads:[~2022-09-02 10:58 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-23 11:29 [PATCH v2 0/4] Fixes for damage clips handling Jouni Högander
2022-08-23 11:29 ` [PATCH v2 1/4] drm: Use original src rect while initializing damage iterator Jouni Högander
2022-09-02 10:58 ` Kahola, Mika [this message]
2022-08-23 11:29 ` [PATCH v2 2/4] drm/i915/display: Use original src in psr2 sel fetch area calculation Jouni Högander
2022-09-02 10:59 ` [Intel-gfx] " Kahola, Mika
2022-08-23 11:29 ` [PATCH v2 3/4] drm/i915/display: Use drm helper instead of own loop for damage clips Jouni Högander
2022-09-02 11:03 ` [Intel-gfx] " Kahola, Mika
2022-08-23 11:29 ` [PATCH v2 4/4] drm/tests: Set also mock plane src_x, src_y, src_w and src_h Jouni Högander
2022-09-02 11:06 ` [Intel-gfx] " Kahola, Mika
2022-09-03 14:04 ` Maíra Canal
2022-09-13 9:04 ` [PATCH v2 0/4] Fixes for damage clips handling Ville Syrjälä
2022-09-13 10:47 ` Hogander, Jouni
2022-09-13 10:54 ` Thomas Zimmermann
2022-09-13 10:56 ` Thomas Zimmermann
2022-09-13 12:16 ` Ville Syrjälä
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=MWHPR1101MB2157B2A014A6A9D0BAE532F8EF7A9@MWHPR1101MB2157.namprd11.prod.outlook.com \
--to=mika.kahola@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jouni.hogander@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).