From: Tales Lelo da Aparecida <tales.aparecida@gmail.com>
To: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>,
Melissa Wen <melissa.srw@gmail.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Daniel Vetter <daniel@ffwll.ch>, David Airlie <airlied@linux.ie>,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
andrealmeid@riseup.net
Cc: Tales Lelo da Aparecida <tales.aparecida@gmail.com>
Subject: [PATCH v2 2/2] drm/vkms: return early if compose_plane fails
Date: Fri, 15 Apr 2022 08:13:00 -0300 [thread overview]
Message-ID: <20220415111300.61013-3-tales.aparecida@gmail.com> (raw)
In-Reply-To: <20220415111300.61013-1-tales.aparecida@gmail.com>
Do not exit quietly from compose_plane. If any plane has an invalid
map, propagate the error value upwards. While here, add log messages
for the invalid index.
Signed-off-by: Tales Lelo da Aparecida <tales.aparecida@gmail.com>
---
drivers/gpu/drm/vkms/vkms_composer.c | 30 ++++++++++++++++++----------
1 file changed, 20 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c
index b47ac170108c..c0a3b53cd155 100644
--- a/drivers/gpu/drm/vkms/vkms_composer.c
+++ b/drivers/gpu/drm/vkms/vkms_composer.c
@@ -149,16 +149,16 @@ static void blend(void *vaddr_dst, void *vaddr_src,
}
}
-static void compose_plane(struct vkms_composer *primary_composer,
- struct vkms_composer *plane_composer,
- void *vaddr_out)
+static int compose_plane(struct vkms_composer *primary_composer,
+ struct vkms_composer *plane_composer,
+ void *vaddr_out)
{
struct drm_framebuffer *fb = &plane_composer->fb;
void *vaddr;
void (*pixel_blend)(const u8 *p_src, u8 *p_dst);
if (WARN_ON(iosys_map_is_null(&plane_composer->map[0])))
- return;
+ return -EINVAL;
vaddr = plane_composer->map[0].vaddr;
@@ -168,6 +168,8 @@ static void compose_plane(struct vkms_composer *primary_composer,
pixel_blend = &x_blend;
blend(vaddr_out, vaddr, primary_composer, plane_composer, pixel_blend);
+
+ return 0;
}
static int compose_active_planes(void **vaddr_out,
@@ -177,7 +179,7 @@ static int compose_active_planes(void **vaddr_out,
struct drm_framebuffer *fb = &primary_composer->fb;
struct drm_gem_object *gem_obj = drm_gem_fb_get_obj(fb, 0);
const void *vaddr;
- int i;
+ int i, ret;
if (!*vaddr_out) {
*vaddr_out = kzalloc(gem_obj->size, GFP_KERNEL);
@@ -187,8 +189,10 @@ static int compose_active_planes(void **vaddr_out,
}
}
- if (WARN_ON(iosys_map_is_null(&primary_composer->map[0])))
+ if (WARN_ON(iosys_map_is_null(&primary_composer->map[0]))) {
+ DRM_DEBUG_DRIVER("Failed to compose. Invalid map in the primary plane.");
return -EINVAL;
+ }
vaddr = primary_composer->map[0].vaddr;
@@ -198,10 +202,16 @@ static int compose_active_planes(void **vaddr_out,
* planes should be in z-order and compose them associatively:
* ((primary <- overlay) <- cursor)
*/
- for (i = 1; i < crtc_state->num_active_planes; i++)
- compose_plane(primary_composer,
- crtc_state->active_planes[i]->composer,
- *vaddr_out);
+ for (i = 1; i < crtc_state->num_active_planes; i++) {
+ ret = compose_plane(primary_composer,
+ crtc_state->active_planes[i]->composer,
+ *vaddr_out);
+ if (ret) {
+ DRM_DEBUG_DRIVER("Failed to compose. Invalid map in the active_planes[%d].",
+ i);
+ return ret;
+ }
+ }
return 0;
}
--
2.35.1
next prev parent reply other threads:[~2022-04-15 14:14 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-15 11:12 [PATCH v2 0/2] drm/vkms: check plane_composer->map[0] before using it Tales Lelo da Aparecida
2022-04-15 11:12 ` [PATCH v2 1/2] " Tales Lelo da Aparecida
2022-06-13 9:33 ` Melissa Wen
2022-04-15 11:13 ` Tales Lelo da Aparecida [this message]
2022-05-12 11:36 ` [PATCH v2 2/2] drm/vkms: return early if compose_plane fails Melissa Wen
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=20220415111300.61013-3-tales.aparecida@gmail.com \
--to=tales.aparecida@gmail.com \
--cc=airlied@linux.ie \
--cc=andrealmeid@riseup.net \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=hamohammed.sa@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=melissa.srw@gmail.com \
--cc=rodrigosiqueiramelo@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 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).