Home Home > GIT Browse > openSUSE-15.1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-05-13 14:59:58 +0200
committerTakashi Iwai <tiwai@suse.de>2019-05-15 11:46:06 +0200
commit8248e263d2998e7372ba3926fa4627ba2ccf1010 (patch)
treea12d926f0c156f3ac39834d99edcff7bc9553afb
parent419c4a2d8560b856c64e2a2b035e5596050d402a (diff)
drm/rockchip: fix for mailbox read validation (bsc#1111666).
-rw-r--r--patches.drm/drm-rockchip-fix-for-mailbox-read-validation.patch39
-rw-r--r--series.conf1
2 files changed, 40 insertions, 0 deletions
diff --git a/patches.drm/drm-rockchip-fix-for-mailbox-read-validation.patch b/patches.drm/drm-rockchip-fix-for-mailbox-read-validation.patch
new file mode 100644
index 0000000000..8a696877e5
--- /dev/null
+++ b/patches.drm/drm-rockchip-fix-for-mailbox-read-validation.patch
@@ -0,0 +1,39 @@
+From e4056bbb6719fe713bfc4030ac78e8e97ddf7574 Mon Sep 17 00:00:00 2001
+From: Damian Kos <dkos@cadence.com>
+Date: Mon, 19 Nov 2018 15:14:14 +0000
+Subject: [PATCH] drm/rockchip: fix for mailbox read validation.
+Git-commit: e4056bbb6719fe713bfc4030ac78e8e97ddf7574
+Patch-mainline: v5.1-rc1
+References: bsc#1111666
+
+This is basically the same fix as in
+commit fa68d4f8476b ("drm/rockchip: fix for mailbox read size")
+but for cdn_dp_mailbox_validate_receive function.
+
+See patchwork.kernel.org/patch/10671981/ for details.
+
+Signed-off-by: Damian Kos <dkos@cadence.com>
+Signed-off-by: Heiko Stuebner <heiko@sntech.de>
+Link: https://patchwork.freedesktop.org/patch/msgid/1542640463-18332-1-git-send-email-dkos@cadence.com
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/gpu/drm/rockchip/cdn-dp-reg.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/rockchip/cdn-dp-reg.c b/drivers/gpu/drm/rockchip/cdn-dp-reg.c
+index 5a485489a1e2..6c8b14fb1d2f 100644
+--- a/drivers/gpu/drm/rockchip/cdn-dp-reg.c
++++ b/drivers/gpu/drm/rockchip/cdn-dp-reg.c
+@@ -113,7 +113,7 @@ static int cdp_dp_mailbox_write(struct cdn_dp_device *dp, u8 val)
+
+ static int cdn_dp_mailbox_validate_receive(struct cdn_dp_device *dp,
+ u8 module_id, u8 opcode,
+- u8 req_size)
++ u16 req_size)
+ {
+ u32 mbox_size, i;
+ u8 header[4];
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index 8697bf6d26..3b8b35dbd7 100644
--- a/series.conf
+++ b/series.conf
@@ -45002,6 +45002,7 @@
patches.drm/drm-Auto-set-allow_fb_modifiers-when-given-modifiers.patch
patches.drm/drm-panel-panel-innolux-set-display-off-in-innolux_p.patch
patches.drm/0003-drm-shmob-Fix-return-value-check-in-shmob_drm_probe.patch
+ patches.drm/drm-rockchip-fix-for-mailbox-read-validation.patch
patches.drm/drm-fb-helper-generic-Fix-drm_fbdev_client_restore.patch
patches.drm/drm-vkms-Bugfix-extra-vblank-frame.patch
patches.drm/drm-xen-front-Fix-mmap-attributes-for-display-buffer.patch