Verified Commit 289d026d authored by Dan Johansen's avatar Dan Johansen
Browse files

add drm panfrost patch from dsimic


Signed-off-by: Dan Johansen's avatarDan Johansen <strit@manjaro.org>
parent 5259746a
Pipeline #4784 failed with stage
in 11 minutes and 52 seconds
diff -pruN -X linux-5.14.2-ORIG/Documentation/dontdiff linux-5.14.2-ORIG/drivers/gpu/drm/panfrost/panfrost_job.c linux-5.14.2-panfrost/drivers/gpu/drm/panfrost/panfrost_job.c
--- linux-5.14.2-ORIG/drivers/gpu/drm/panfrost/panfrost_job.c 2021-09-08 08:52:41.000000000 +0200
+++ linux-5.14.2-panfrost/drivers/gpu/drm/panfrost/panfrost_job.c 2021-09-11 07:47:51.601429126 +0200
@@ -446,7 +446,7 @@ static enum drm_gpu_sched_stat panfrost_
if (dma_fence_is_signaled(job->done_fence))
return DRM_GPU_SCHED_STAT_NOMINAL;
- dev_err(pfdev->dev, "gpu sched timeout, js=%d, config=0x%x, status=0x%x, head=0x%x, tail=0x%x, sched_job=%p",
+ dev_err(pfdev->dev, "GPU scheduler timeout: js=%d, config=0x%x, status=0x%x, head=0x%x, tail=0x%x, sched_job=%p",
js,
job_read(pfdev, JS_CONFIG(js)),
job_read(pfdev, JS_STATUS(js)),
@@ -478,7 +478,7 @@ static irqreturn_t panfrost_job_irq_hand
u32 status = job_read(pfdev, JOB_INT_STAT);
int j;
- dev_dbg(pfdev->dev, "jobslot irq status=%x\n", status);
+ dev_dbg(pfdev->dev, "Job slot IRQ status=%x\n", status);
if (!status)
return IRQ_NONE;
@@ -498,7 +498,7 @@ static irqreturn_t panfrost_job_irq_hand
job_write(pfdev, JS_COMMAND_NEXT(j), JS_COMMAND_NOP);
- dev_err(pfdev->dev, "js fault, js=%d, status=%s, head=0x%x, tail=0x%x",
+ dev_err(pfdev->dev, "Job slot fault: js=%d, status=%s, head=0x%x, tail=0x%x",
j,
panfrost_exception_name(pfdev, job_read(pfdev, JS_STATUS(j))),
job_read(pfdev, JS_HEAD_LO(j)),
@@ -615,7 +615,7 @@ int panfrost_job_init(struct panfrost_de
ret = devm_request_irq(pfdev->dev, irq, panfrost_job_irq_handler,
IRQF_SHARED, KBUILD_MODNAME "-job", pfdev);
if (ret) {
- dev_err(pfdev->dev, "failed to request job irq");
+ dev_err(pfdev->dev, "Failed to request job IRQ: %d", irq);
return ret;
}
diff -pruN -X linux-5.14.2-ORIG/Documentation/dontdiff linux-5.14.2-ORIG/drivers/gpu/drm/scheduler/sched_main.c linux-5.14.2-panfrost/drivers/gpu/drm/scheduler/sched_main.c
--- linux-5.14.2-ORIG/drivers/gpu/drm/scheduler/sched_main.c 2021-09-08 08:52:41.000000000 +0200
+++ linux-5.14.2-panfrost/drivers/gpu/drm/scheduler/sched_main.c 2021-09-11 07:47:51.601429126 +0200
@@ -776,7 +776,7 @@ static int drm_sched_main(void *param)
struct drm_gpu_scheduler *sched = (struct drm_gpu_scheduler *)param;
int r;
- sched_set_fifo_low(current);
+ sched_set_fifo(current);
while (!kthread_should_stop()) {
struct drm_sched_entity *entity = NULL;
@@ -823,13 +823,11 @@ static int drm_sched_main(void *param)
if (r == -ENOENT)
drm_sched_job_done(sched_job);
else if (r)
- DRM_ERROR("fence add callback failed (%d)\n",
- r);
+ DRM_ERROR("fence add callback failed (%d)\n", r);
dma_fence_put(fence);
} else {
if (IS_ERR(fence))
dma_fence_set_error(&s_fence->finished, PTR_ERR(fence));
-
drm_sched_job_done(sched_job);
}
......@@ -37,13 +37,14 @@ source=("https://git.kernel.org/torvalds/t/${_srcname}.tar.gz"
'0018-drm-meson-add-YUV422-output-support.patch'
'0019-arm64-dts-meson-add-initial-Beelink-GT1-Ultimate-dev.patch'
'0020-add-ugoos-device.patch'
'0021-drm-panfrost-scheduler-fix.patch'
'0022-arm64-dts-rockchip-Add-pcie-bus-scan-delay-to-rockpr.patch'
'0023-Revert-net-stmmac-dwmac-rk-fix-unbalanced-pm_runtime.patch'
'0001-Bluetooth-Add-new-quirk-for-broken-local-ext-features.patch'
'0002-Bluetooth-btrtl-add-support-for-the-RTL8723CS.patch'
'0003-arm64-allwinner-a64-enable-Bluetooth-On-Pinebook.patch'
'0004-arm64-dts-allwinner-enable-bluetooth-pinetab-pinepho.patch' #Pinephone part is in linux-next
'0005-staging-add-rtl8723cs-driver.patch' #Not upstreamable #missing net/ipx.h in 5.15, waiting on update from megi
'0005-staging-add-rtl8723cs-driver.patch' #Not upstreamable
'0006-pinetab-accelerometer.patch'
'0007-enable-jack-detection-pinetab.patch'
'0008-enable-hdmi-output-pinetab.patch'
......@@ -79,6 +80,7 @@ md5sums=('5606898dc633148586c7d2b2fe13fbe1'
'469417b64e6a2bf65bd74c6d9cad2040'
'c41b101c033ac487c15298bc5a9e95cd'
'1b92d7617e60d3c525a4b18ab4351185'
'98d840b2c92f107c4b4e38bfaa0da941'
'6bb2d84857359016b5e0878cf2fc50cc'
'4d1c5ad859cf3f22c0c9f7903d6d761c'
'cf64831f27bb47da29e708b7243bb340'
......@@ -122,6 +124,7 @@ prepare() {
patch -Np1 -i "${srcdir}/0018-drm-meson-add-YUV422-output-support.patch" #G12B
patch -Np1 -i "${srcdir}/0019-arm64-dts-meson-add-initial-Beelink-GT1-Ultimate-dev.patch" #Beelink
patch -Np1 -i "${srcdir}/0020-add-ugoos-device.patch" #Ugoos
patch -Np1 -i "${srcdir}/0021-drm-panfrost-scheduler-fix.patch" #Panfrost
patch -Np1 -i "${srcdir}/0022-arm64-dts-rockchip-Add-pcie-bus-scan-delay-to-rockpr.patch" #RockPro64
patch -Np1 -i "${srcdir}/0023-Revert-net-stmmac-dwmac-rk-fix-unbalanced-pm_runtime.patch" #Fix ethernet on RK3399
......@@ -141,12 +144,12 @@ prepare() {
patch -Np1 -i "${srcdir}/0009-drm-panel-Adjust-sync-values-for-Feixin-K101-IM2BYL02-panel.patch" #Display
# Quartz64 development patches, will probably change alot
#patch -Np1 -i "${srcdir}/0001-arm64-dts-rockchip-Add-quartz64-a-dts-from-linux-nex.patch" #Main DTS
patch -Np1 -i "${srcdir}/0001-arm64-dts-rockchip-Add-quartz64-a-dts-from-linux-nex.patch" #Main DTS
#patch -Np1 -i "${srcdir}/0002-fixes-and-enablement-for-rk356x.patch" #Fixes to DTS's
#patch -Np1 -i "${srcdir}/0003-Rockchip-I2S-TDM-controller.patch" #Analog audio
#patch -Np1 -i "${srcdir}/0009-power-supply-Add-Support-for-RK817-Charger.patch" #Charger
patch -Np1 -i "${srcdir}/0009-power-supply-Add-Support-for-RK817-Charger.patch" #Charger
#patch -Np1 -i "${srcdir}/0010-dt-bindings-pwm-rockchip-add-description-for-rk3568.patch" #PWM
#patch -Np1 -i "${srcdir}/0011-phy-rockchip-inno-usb2-support-rk356x-usb2phy.patch" #USB2PHY
patch -Np1 -i "${srcdir}/0011-phy-rockchip-inno-usb2-support-rk356x-usb2phy.patch" #USB2PHY
cat "${srcdir}/config" > ./.config
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment