summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configs/odroid_rk3568_defconfig2
-rw-r--r--drivers/video/drm/dw_hdmi.c7
2 files changed, 7 insertions, 2 deletions
diff --git a/configs/odroid_rk3568_defconfig b/configs/odroid_rk3568_defconfig
index f821e219d4..07d14195ab 100644
--- a/configs/odroid_rk3568_defconfig
+++ b/configs/odroid_rk3568_defconfig
@@ -183,7 +183,7 @@ CONFIG_ROCKCHIP_FIT_IMAGE=y
# CONFIG_ROCKCHIP_UIMAGE is not set
# CONFIG_ROCKCHIP_EARLY_DISTRO_DTB is not set
# CONFIG_ROCKCHIP_HWID_DTB is not set
-CONFIG_ROCKCHIP_VENDOR_PARTITION=y
+# CONFIG_ROCKCHIP_VENDOR_PARTITION=y
CONFIG_USING_KERNEL_DTB=y
CONFIG_EMBED_KERNEL_DTB_PATH="rk3568-odroid-m1.dtb"
# CONFIG_EMBED_KERNEL_DTB_ALWAYS is not set
diff --git a/drivers/video/drm/dw_hdmi.c b/drivers/video/drm/dw_hdmi.c
index 10a593870a..08f0024e38 100644
--- a/drivers/video/drm/dw_hdmi.c
+++ b/drivers/video/drm/dw_hdmi.c
@@ -1888,7 +1888,10 @@ void dw_hdmi_set_sample_rate(struct dw_hdmi *hdmi, unsigned int rate)
static int dw_hdmi_hdcp_load_key(struct dw_hdmi *hdmi)
{
- int i, j, ret, val;
+ int i, j, val;
+#if defined(CONFIG_ROCKCHIP_VENDOR_PARTITION)
+ int ret;
+#endif
struct hdcp_keys *hdcp_keys;
val = sizeof(*hdcp_keys);
@@ -1898,12 +1901,14 @@ static int dw_hdmi_hdcp_load_key(struct dw_hdmi *hdmi)
memset(hdcp_keys, 0, val);
+#if defined(CONFIG_ROCKCHIP_VENDOR_PARTITION)
ret = vendor_storage_read(HDMI_HDCP1X_ID, hdcp_keys, val);
if (ret < val) {
printf("HDCP: read size %d\n", ret);
free(hdcp_keys);
return -EINVAL;
}
+#endif
if (hdcp_keys->KSV[0] == 0x00 &&
hdcp_keys->KSV[1] == 0x00 &&