All of lore.kernel.org
 help / color / mirror / Atom feed
From: "José Roberto de Souza" <jose.souza@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: "Daniel Vetter" <daniel.vetter@intel.com>,
	"Rob Clark" <robdclark@gmail.com>,
	"Deepak Rawat" <drawat@vmware.com>,
	"Gwan-gyeong Mun" <gwan-gyeong.mun@intel.com>,
	"José Roberto de Souza" <jose.souza@intel.com>
Subject: [Intel-gfx] [PATCH 1/8] drm/damage_helper: Fix handling of cursor dirty buffers
Date: Tue, 17 Aug 2021 17:42:09 -0700	[thread overview]
Message-ID: <20210818004216.220279-2-jose.souza@intel.com> (raw)
In-Reply-To: <20210818004216.220279-1-jose.souza@intel.com>

Cursors don't have a framebuffer so the fb comparisson was always
failing and atomic state was being committed without any plane state.

So here checking if objects match when checking cursors.

Fixes: b9fc5e01d1ce ("drm: Add helper to implement legacy dirtyfb")
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Deepak Rawat <drawat@vmware.com>
Cc: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
---
 drivers/gpu/drm/drm_damage_helper.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/drm_damage_helper.c b/drivers/gpu/drm/drm_damage_helper.c
index 8eeff0c7bdd47..595187d97c131 100644
--- a/drivers/gpu/drm/drm_damage_helper.c
+++ b/drivers/gpu/drm/drm_damage_helper.c
@@ -157,12 +157,18 @@ int drm_atomic_helper_dirtyfb(struct drm_framebuffer *fb,
 retry:
 	drm_for_each_plane(plane, fb->dev) {
 		struct drm_plane_state *plane_state;
+		bool match;
 
 		ret = drm_modeset_lock(&plane->mutex, state->acquire_ctx);
 		if (ret)
 			goto out;
 
-		if (plane->state->fb != fb) {
+		match = plane->state->fb == fb;
+		/* Check if objs match to handle dirty buffers of cursors */
+		if (plane->type == DRM_PLANE_TYPE_CURSOR && plane->state->fb)
+			match |= fb->obj[0] == plane->state->fb->obj[0];
+
+		if (!match) {
 			drm_modeset_unlock(&plane->mutex);
 			continue;
 		}
-- 
2.32.0


  reply	other threads:[~2021-08-18  0:37 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-18  0:42 [Intel-gfx] [PATCH 0/8] Drop frontbuffer rendering support from Skylake and newer José Roberto de Souza
2021-08-18  0:42 ` José Roberto de Souza [this message]
2021-08-18  0:42 ` [Intel-gfx] [PATCH 2/8] drm/i915/display: Drop PSR support from HSW and BDW José Roberto de Souza
2021-08-18  0:42 ` [Intel-gfx] [PATCH 3/8] drm/i915/display: Move DRRS code its own file José Roberto de Souza
2021-08-18  7:24   ` Jani Nikula
2021-08-19  0:44     ` Souza, Jose
2021-08-18  0:42 ` [Intel-gfx] [PATCH 4/8] drm/i915/display: Some code improvements and code style fixes for DRRS José Roberto de Souza
2021-08-18  0:42 ` [Intel-gfx] [PATCH 5/8] drm/i915/display: Share code between intel_edp_drrs_flush and invalidate José Roberto de Souza
2021-08-18  0:42 ` [Intel-gfx] [PATCH 6/8] drm/i915/display: Prepare DRRS for frontbuffer rendering drop José Roberto de Souza
2021-08-18  0:42 ` [Intel-gfx] [PATCH 7/8] drm/i915/display/skl+: Drop frontbuffer rendering support José Roberto de Souza
2021-08-18 14:55   ` Ville Syrjälä
2021-08-18 19:48     ` Souza, Jose
2021-08-19 16:07       ` Ville Syrjälä
2021-08-25  0:49         ` Souza, Jose
2021-08-25 12:47           ` Ville Syrjälä
2021-08-25 13:43             ` Ville Syrjälä
2021-08-26  1:23               ` Souza, Jose
2021-08-24  7:21   ` Daniel Vetter
2021-08-18  0:42 ` [Intel-gfx] [PATCH 8/8] drm/i915/display: Drop PSR " José Roberto de Souza
2021-08-18  1:12 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Drop frontbuffer rendering support from Skylake and newer Patchwork
2021-08-18  1:14 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2021-08-18  1:45 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork

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=20210818004216.220279-2-jose.souza@intel.com \
    --to=jose.souza@intel.com \
    --cc=daniel.vetter@intel.com \
    --cc=drawat@vmware.com \
    --cc=gwan-gyeong.mun@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=robdclark@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.