From: Brian Starkey <brian.starkey@arm.com>
To: dri-devel@lists.freedesktop.org
Cc: liviu.dudau@arm.com, linux-kernel@vger.kernel.org
Subject: [PATCH 4/8] drm: mali-dp: Add pitch alignment check for planes
Date: Tue, 11 Oct 2016 15:26:05 +0100 [thread overview]
Message-ID: <1476195969-23655-4-git-send-email-brian.starkey@arm.com> (raw)
In-Reply-To: <1476195969-23655-1-git-send-email-brian.starkey@arm.com>
Check that the framebuffer pitches are appropriately aligned when
checking planes.
Signed-off-by: Brian Starkey <brian.starkey@arm.com>
---
drivers/gpu/drm/arm/malidp_planes.c | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/arm/malidp_planes.c b/drivers/gpu/drm/arm/malidp_planes.c
index 82c193e..f95e02d 100644
--- a/drivers/gpu/drm/arm/malidp_planes.c
+++ b/drivers/gpu/drm/arm/malidp_planes.c
@@ -86,17 +86,30 @@ static int malidp_de_plane_check(struct drm_plane *plane,
{
struct malidp_plane *mp = to_malidp_plane(plane);
struct malidp_plane_state *ms = to_malidp_plane_state(state);
+ struct drm_framebuffer *fb;
+ int n_planes, i;
u8 format_id;
u32 src_w, src_h;
if (!state->crtc || !state->fb)
return 0;
+ fb = state->fb;
+
format_id = malidp_hw_get_format_id(&mp->hwdev->map, mp->layer->id,
- state->fb->pixel_format);
+ fb->pixel_format);
if (format_id == MALIDP_INVALID_FORMAT_ID)
return -EINVAL;
+ n_planes = drm_format_num_planes(fb->pixel_format);
+ for (i = 0; i < n_planes; i++) {
+ if (!malidp_hw_pitch_valid(mp->hwdev, fb->pitches[i])) {
+ DRM_DEBUG_KMS("Invalid pitch %u for plane %d\n",
+ fb->pitches[i], i);
+ return -EINVAL;
+ }
+ }
+
src_w = state->src_w >> 16;
src_h = state->src_h >> 16;
--
1.7.9.5
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2016-10-11 14:26 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-11 14:26 [PATCH 1/8] drm: mali-dp: Set the drm->irq_enabled flag to match driver's state Brian Starkey
2016-10-11 14:26 ` [PATCH 2/8] drm: mali-dp: Clear the config_valid flag before using it in wait_event Brian Starkey
2016-10-11 14:26 ` [PATCH 3/8] drm: mali-dp: Add pitch alignment check function Brian Starkey
2016-10-11 14:26 ` Brian Starkey [this message]
2016-10-11 14:26 ` [PATCH 5/8] arm: mali-dp: Extract mode_config cleanup into malidp_fini Brian Starkey
2016-10-11 14:26 ` [PATCH 6/8] drm: mali-dp: Refactor plane initialisation Brian Starkey
2016-10-11 14:26 ` [PATCH 7/8] drm: mali-dp: Enable alpha blending Brian Starkey
2016-10-11 14:26 ` [PATCH 8/8] drm: mali-dp: Store internal format and n_planes in plane state Brian Starkey
2016-10-11 15:03 ` [PATCH 1/8] drm: mali-dp: Set the drm->irq_enabled flag to match driver's state liviu.dudau
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=1476195969-23655-4-git-send-email-brian.starkey@arm.com \
--to=brian.starkey@arm.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=liviu.dudau@arm.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).