mirror of
https://github.com/armbian/build.git
synced 2025-09-19 20:51:12 +02:00
d1186b8a0e
I have changed the way the patches are generated a bit. Instead of using orange-pi branch from megous tree for 6.6 kernel, I have used the following kernel branches a83t-suspend, af8133j, anx, audio, axp, cam, drm, err, fixes, mbus, modem, opi3, pb, pinetab, pp, ppkb, samuel, speed, tbs-a711, ths These branches were carefully chosen to include only allwinner related patches and remove importing of the rockchip related patches into the allwinner kernel. Following patches are modified to fix patch application failure - patches.armbian/arm64-dts-sun50i-h616-orangepi-zero2-reg_usb1_vbus-status-ok.patch - patches.armbian/arm64-dts-sun50i-h616-orangepi-zero2-Enable-GPU-mali.patch - patches.armbian/arm64-dts-allwinner-h616-Add-efuse_xlate-cpu-frequency-scaling-v1_6_2.patch - patches.armbian/arm64-dts-allwinner-h616-LED-green_power_on-red_status_heartbeat.patch - patches.armbian/arm64-dts-allwinner-overlay-Add-Overlays-for-sunxi64.patch - patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1.patch Following patches are modified because of kernel api change to fix compilation failure - patches.armbian/drv-gpu-drm-sun4i-Add-HDMI-audio-sun4i-hdmi-encoder.patch - patches.armbian/drv-of-Device-Tree-Overlay-ConfigFS-interface.patch
38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
From 2eea51a34ec73f5f19230014b32b477791cea7a7 Mon Sep 17 00:00:00 2001
|
|
From: Ondrej Jirman <megi@xff.cz>
|
|
Date: Sat, 24 Sep 2022 21:54:23 +0200
|
|
Subject: [PATCH 06/11] drm: rockchip: Fix panic on reboot when DRM device
|
|
fails to bind
|
|
|
|
When DRM device is freed, we need to clear the drvdata pointer, because
|
|
it now points to invalid memory.
|
|
|
|
Signed-off-by: Ondrej Jirman <megi@xff.cz>
|
|
---
|
|
drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
|
|
index ab55d7132550..5e2a4c967f83 100644
|
|
--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
|
|
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
|
|
@@ -202,6 +202,7 @@ static int rockchip_drm_bind(struct device *dev)
|
|
component_unbind_all(dev, drm_dev);
|
|
err_free:
|
|
drm_dev_put(drm_dev);
|
|
+ dev_set_drvdata(dev, NULL);
|
|
return ret;
|
|
}
|
|
|
|
@@ -218,6 +219,7 @@ static void rockchip_drm_unbind(struct device *dev)
|
|
rockchip_iommu_cleanup(drm_dev);
|
|
|
|
drm_dev_put(drm_dev);
|
|
+ dev_set_drvdata(dev, NULL);
|
|
}
|
|
|
|
DEFINE_DRM_GEM_FOPS(rockchip_drm_driver_fops);
|
|
--
|
|
2.34.1
|
|
|