From: Javier Martinez Canillas <javierm@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Thomas Zimmermann <tzimmermann@suse.de>,
Javier Martinez Canillas <javierm@redhat.com>,
Daniel Vetter <daniel@ffwll.ch>, David Airlie <airlied@linux.ie>,
dri-devel@lists.freedesktop.org
Subject: [PATCH v2 3/4] drm/ssd130x: Do not call drm_atomic_add_affected_planes()
Date: Tue, 11 Oct 2022 18:51:35 +0200 [thread overview]
Message-ID: <20221011165136.469750-4-javierm@redhat.com> (raw)
In-Reply-To: <20221011165136.469750-1-javierm@redhat.com>
There's no need to add planes to the atomic state. Remove the call
to drm_atomic_add_affected_planes() from ssd130x.
On full modesets, the DRM helpers already add a CRTC's planes to the
atomic state; see drm_atomic_helper_check_modeset(). There's no reason
to call drm_atomic_add_affected_planes() unconditionally in the CRTC's
atomic_check() in ssd130x. It's also too late, as the atomic_check()
of the added planes will not be called before the commit.
Suggested-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
---
(no changes since v1)
drivers/gpu/drm/solomon/ssd130x.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/solomon/ssd130x.c b/drivers/gpu/drm/solomon/ssd130x.c
index 57e48355c008..0d4ab65233db 100644
--- a/drivers/gpu/drm/solomon/ssd130x.c
+++ b/drivers/gpu/drm/solomon/ssd130x.c
@@ -649,17 +649,11 @@ static int ssd130x_crtc_helper_atomic_check(struct drm_crtc *crtc,
struct drm_atomic_state *new_state)
{
struct drm_crtc_state *new_crtc_state = drm_atomic_get_new_crtc_state(new_state, crtc);
- int ret;
if (!new_crtc_state->enable)
- goto out;
-
- ret = drm_atomic_helper_check_crtc_primary_plane(new_crtc_state);
- if (ret)
- return ret;
+ return 0;
-out:
- return drm_atomic_add_affected_planes(new_state, crtc);
+ return drm_atomic_helper_check_crtc_primary_plane(new_crtc_state);
}
/*
--
2.37.3
next prev parent reply other threads:[~2022-10-11 16:52 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-11 16:51 [PATCH v2 0/4] Add a drm_crtc_helper_atomic_check() helper Javier Martinez Canillas
2022-10-11 16:51 ` [PATCH v2 1/4] drm/mgag200: Do not call drm_atomic_add_affected_planes() Javier Martinez Canillas
2022-10-12 7:28 ` Thomas Zimmermann
2022-10-11 16:51 ` [PATCH v2 2/4] drm/simpledrm: " Javier Martinez Canillas
2022-10-11 16:51 ` Javier Martinez Canillas [this message]
2022-10-11 16:51 ` [PATCH v2 4/4] drm/crtc-helper: Add a drm_crtc_helper_atomic_check() helper Javier Martinez Canillas
2022-10-13 7:34 ` [PATCH v2 0/4] " Javier Martinez Canillas
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=20221011165136.469750-4-javierm@redhat.com \
--to=javierm@redhat.com \
--cc=airlied@linux.ie \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tzimmermann@suse.de \
/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
all inboxes | Powered by JetHome®