This is a note to let you know that I've just added the patch titled
drm/i915: Fix error handling for the NV12 fb dimensions check
to the 4.19-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-i915-fix-error-handling-for-the-nv12-fb-dimensions-check.patch
and it can be found in the queue-4.19 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From f42f343887016330b321dd40eebc68c7292e4f1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@xxxxxxxxxxxxxxx>
Date: Mon, 29 Oct 2018 16:00:31 +0200
Subject: drm/i915: Fix error handling for the NV12 fb dimensions check
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
commit f42f343887016330b321dd40eebc68c7292e4f1b upstream.
Let's not leak obj->framebuffer_references when we decide that
the framebuffer domensions are not suitable for NV12.
Cc: stable@xxxxxxxxxxxxxxx
Cc: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx>
Cc: Vidya Srinivas <vidya.srinivas@xxxxxxxxx>
Fixes: e44134f2673c ("drm/i915: Add NV12 support to intel_framebuffer_init")
Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Link: https://patchwork.freedesktop.org/patch/msgid/20181029140031.11765-1-ville.syrjala@xxxxxxxxxxxxxxx
Reviewed-by: Matt Roper <matthew.d.roper@xxxxxxxxx>
(cherry picked from commit 3b90946fcb6f13b65888c380461793a9dea9d1f4)
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/i915/intel_display.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -14582,7 +14582,7 @@ static int intel_framebuffer_init(struct
fb->height < SKL_MIN_YUV_420_SRC_H ||
(fb->width % 4) != 0 || (fb->height % 4) != 0)) {
DRM_DEBUG_KMS("src dimensions not correct for NV12\n");
- return -EINVAL;
+ goto err;
}
for (i = 0; i < fb->format->num_planes; i++) {
Patches currently in stable-queue which might be from ville.syrjala@xxxxxxxxxxxxxxx are
queue-4.19/drm-i915-fix-hpd-handling-for-pins-with-two-encoders.patch
queue-4.19/drm-i915-dp-restrict-link-retrain-workaround-to-external-monitors.patch
queue-4.19/drm-i915-don-t-oops-during-modeset-shutdown-after-lpe-audio-deinit.patch
queue-4.19/drm-i915-dp-link-train-fallback-on-edp-only-if-fallback-link-bw-can-fit-panel-s-native-mode.patch
queue-4.19/drm-i915-restore-vblank-interrupts-earlier.patch
queue-4.19/drm-i915-dp-fix-link-retraining-comment-in-intel_dp_long_pulse.patch
queue-4.19/drm-i915-fix-possible-race-in-intel_dp_add_mst_connector.patch
queue-4.19/drm-i915-fix-error-handling-for-the-nv12-fb-dimensions-check.patch
queue-4.19/drm-i915-fix-ilk-watermarks-when-disabling-pipes.patch
queue-4.19/drm-i915-ringbuffer-delay-after-emit_invalidate-for-gen4-gen5.patch
queue-4.19/drm-i915-use-the-correct-crtc-when-sanitizing-plane-mapping.patch
queue-4.19/drm-msm-dpu-allow-planes-to-extend-past-active-display.patch
queue-4.19/drm-i915-fix-null-deref-when-re-enabling-hpd-irqs-on-systems-with-mst.patch
