diff --git a/packages/multimedia/rkmpp/package.mk b/packages/multimedia/rkmpp/package.mk index 2e30c053b4..328bf315ef 100644 --- a/packages/multimedia/rkmpp/package.mk +++ b/packages/multimedia/rkmpp/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="rkmpp" -PKG_VERSION="b9dda0fb95674651673cbab0b846d29ab9b0e96c" -PKG_SHA256="c78ce9cd4a77fade1122e10553b00eec42d622d97838bd08e644ec816bb43e5f" +PKG_VERSION="1babbc9cc277692d02fc4727daef2e91f91ce8b0" +PKG_SHA256="6cbc3c5656c5b2ab61f6466899012e0725c2b573f19765c68a197a19f95c4d54" PKG_ARCH="arm aarch64" PKG_LICENSE="APL" PKG_SITE="https://github.com/rockchip-linux/mpp" diff --git a/projects/Rockchip/patches/linux/rockchip-4.4/linux-0001-rockchip.patch b/projects/Rockchip/patches/linux/rockchip-4.4/linux-0001-rockchip.patch index 7e010658f3..7dfe3f0ed3 100644 --- a/projects/Rockchip/patches/linux/rockchip-4.4/linux-0001-rockchip.patch +++ b/projects/Rockchip/patches/linux/rockchip-4.4/linux-0001-rockchip.patch @@ -1371,3 +1371,27 @@ index f748a292b7f4..d72c02afeb76 100644 { /* sentinel */ }, }; + +From 06d1099d7f4cece7af7793ff68fabc08eb55935d Mon Sep 17 00:00:00 2001 +From: Jonas Karlman +Date: Wed, 14 Nov 2018 06:08:01 +0100 +Subject: [PATCH] drm: workaround for crash when trying to open render node + +--- + drivers/gpu/drm/drm_ioctl.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c +index 34757168ffaa..0914c886277f 100644 +--- a/drivers/gpu/drm/drm_ioctl.c ++++ b/drivers/gpu/drm/drm_ioctl.c +@@ -57,6 +57,9 @@ static int drm_getunique(struct drm_device *dev, void *data, + struct drm_unique *u = data; + struct drm_master *master = file_priv->master; + ++ if (!master) ++ return -EINVAL; ++ + if (u->unique_len >= master->unique_len) { + if (copy_to_user(u->unique, master->unique, master->unique_len)) + return -EFAULT; diff --git a/projects/Rockchip/patches/linux/rockchip-4.4/linux-0006-rtl8211f.patch b/projects/Rockchip/patches/linux/rockchip-4.4/linux-0006-rtl8211f.patch index 4a3a9f386d..6a5e7a4e7f 100644 --- a/projects/Rockchip/patches/linux/rockchip-4.4/linux-0006-rtl8211f.patch +++ b/projects/Rockchip/patches/linux/rockchip-4.4/linux-0006-rtl8211f.patch @@ -868,4 +868,3 @@ index f307d220b49a..15d342eefd6d 100644 #define RTL821x_INSR 0x13 -