dri-devel.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Zimmermann <tzimmermann@suse.de>
To: daniel@ffwll.ch, airlied@linux.ie, sam@ravnborg.org,
	mripard@kernel.org, maarten.lankhorst@linux.intel.com,
	christian.koenig@amd.com, ville.syrjala@linux.intel.com
Cc: Thomas Zimmermann <tzimmermann@suse.de>, dri-devel@lists.freedesktop.org
Subject: [PATCH v2 05/10] drm/fb-helper: Return early in dirty worker
Date: Fri, 20 Nov 2020 11:25:40 +0100	[thread overview]
Message-ID: <20201120102545.4047-6-tzimmermann@suse.de> (raw)
In-Reply-To: <20201120102545.4047-1-tzimmermann@suse.de>

Returning early in the dirty worker if no update is required makes the
code more readable. No functional changes are made.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
 drivers/gpu/drm/drm_fb_helper.c | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 87d4759de04a..c9018ffff5f9 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -407,24 +407,23 @@ static void drm_fb_helper_damage_work(struct work_struct *work)
 	clip->x2 = clip->y2 = 0;
 	spin_unlock_irqrestore(&helper->damage_lock, flags);
 
-	/* call dirty callback only when it has been really touched */
-	if (clip_copy.x1 < clip_copy.x2 && clip_copy.y1 < clip_copy.y2) {
-
-		/* Generic fbdev uses a shadow buffer */
-		if (helper->buffer) {
-			ret = drm_client_buffer_vmap(helper->buffer, &map);
-			if (ret)
-				return;
-			drm_fb_helper_damage_blit_real(helper, &clip_copy, &map);
-		}
-
-		if (helper->fb->funcs->dirty)
-			helper->fb->funcs->dirty(helper->fb, NULL, 0, 0,
-						 &clip_copy, 1);
+	/* Call damage handlers only if necessary */
+	if (!(clip_copy.x1 < clip_copy.x2 && clip_copy.y1 < clip_copy.y2))
+		return;
 
-		if (helper->buffer)
-			drm_client_buffer_vunmap(helper->buffer);
+	/* Generic fbdev uses a shadow buffer */
+	if (helper->buffer) {
+		ret = drm_client_buffer_vmap(helper->buffer, &map);
+		if (ret)
+			return;
+		drm_fb_helper_damage_blit_real(helper, &clip_copy, &map);
 	}
+
+	if (helper->fb->funcs->dirty)
+		helper->fb->funcs->dirty(helper->fb, NULL, 0, 0, &clip_copy, 1);
+
+	if (helper->buffer)
+		drm_client_buffer_vunmap(helper->buffer);
 }
 
 /**
-- 
2.29.2

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  parent reply	other threads:[~2020-11-20 10:26 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-20 10:25 [PATCH v2 00/10] drm/fb-helper: Various fixes and cleanups Thomas Zimmermann
2020-11-20 10:25 ` [PATCH v2 01/10] drm/fb-helper: Call dirty helper after writing to fbdev Thomas Zimmermann
2020-11-23 19:20   ` Sam Ravnborg
2020-11-20 10:25 ` [PATCH v2 02/10] drm/fb-helper: Unmap client buffer during shutdown Thomas Zimmermann
2020-11-23 19:20   ` Sam Ravnborg
2020-11-20 10:25 ` [PATCH v2 03/10] drm/client: Depend on GEM object kmap ref-counting Thomas Zimmermann
2020-11-20 10:25 ` [PATCH v2 04/10] drm/fb-helper: Rename dirty worker to damage worker Thomas Zimmermann
2020-11-23 19:22   ` Sam Ravnborg
2020-11-20 10:25 ` Thomas Zimmermann [this message]
2020-11-23 19:23   ` [PATCH v2 05/10] drm/fb-helper: Return early in dirty worker Sam Ravnborg
2020-11-24  9:54     ` Thomas Zimmermann
2020-11-20 10:25 ` [PATCH v2 06/10] drm/fb-helper: Separate shadow-buffer flushing and calling dirty callback Thomas Zimmermann
2020-11-23 19:24   ` Sam Ravnborg
2020-11-20 10:25 ` [PATCH v2 07/10] drm/fb-helper: Move damage blit code and its setup into separate routine Thomas Zimmermann
2020-11-22 14:18   ` [drm/fb] 6a1b34c0a3: WARNING:at_drivers/gpu/drm/drm_fb_helper.c:#drm_fb_helper_damage_work kernel test robot
2020-11-23  8:04     ` Thomas Zimmermann
2020-11-24  1:58       ` Xing Zhengjun
2020-11-24  7:44         ` Thomas Zimmermann
2020-11-24  9:56         ` Thomas Zimmermann
2020-11-23 19:25   ` [PATCH v2 07/10] drm/fb-helper: Move damage blit code and its setup into separate routine Sam Ravnborg
2020-11-20 10:25 ` [PATCH v2 08/10] drm/fb-helper: Restore damage area upon errors Thomas Zimmermann
2020-11-23 19:26   ` Sam Ravnborg
2020-11-20 10:25 ` [PATCH v2 09/10] drm/fb-helper: Copy dma-buf map before flushing shadow fb Thomas Zimmermann
2020-11-23 19:27   ` Sam Ravnborg
2020-11-20 10:25 ` [PATCH v2 10/10] drm/fb-helper: Acquire modeset lock around shadow-buffer flushing Thomas Zimmermann
2020-11-23 19:27   ` Sam Ravnborg
2020-11-23  9:18 ` [PATCH v2 00/10] drm/fb-helper: Various fixes and cleanups Maxime Ripard

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=20201120102545.4047-6-tzimmermann@suse.de \
    --to=tzimmermann@suse.de \
    --cc=airlied@linux.ie \
    --cc=christian.koenig@amd.com \
    --cc=daniel@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=maarten.lankhorst@linux.intel.com \
    --cc=mripard@kernel.org \
    --cc=sam@ravnborg.org \
    --cc=ville.syrjala@linux.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).