Verified Commit 16dfe4b0 authored by Dan Johansen's avatar Dan Johansen
Browse files

update previous patch


Signed-off-by: Dan Johansen's avatarDan Johansen <strit@manjaro.org>
parent 289d026d
Pipeline #4785 passed with stage
in 100 minutes and 51 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_
diff -pruN -X linux-5.15-rc1-ORIG/Documentation/dontdiff linux-5.15-rc1-ORIG/drivers/gpu/drm/panfrost/panfrost_job.c linux-5.15-rc1-panfrost/drivers/gpu/drm/panfrost/panfrost_job.c
--- linux-5.15-rc1-ORIG/drivers/gpu/drm/panfrost/panfrost_job.c 2021-09-13 01:28:37.000000000 +0200
+++ linux-5.15-rc1-panfrost/drivers/gpu/drm/panfrost/panfrost_job.c 2021-09-17 17:47:38.287735915 +0200
@@ -234,7 +234,7 @@ static void panfrost_job_hw_submit(struc
if (!atomic_read(&pfdev->reset.pending)) {
job_write(pfdev, JS_COMMAND_NEXT(js), JS_COMMAND_START);
dev_dbg(pfdev->dev,
- "JS: Submitting atom %p to js[%d][%d] with head=0x%llx AS %d",
+ "Job slot: submitting atom %p to js[%d][%d] with head=0x%llx, as=%d\n",
job, js, subslot, jc_head, cfg & 0xf);
}
spin_unlock(&pfdev->js->job_lock);
@@ -425,12 +425,12 @@ static void panfrost_job_handle_err(stru
bool signal_fence = true;
if (!panfrost_exception_is_fault(js_status)) {
- dev_dbg(pfdev->dev, "js event, js=%d, status=%s, head=0x%x, tail=0x%x",
+ dev_dbg(pfdev->dev, "Job slot event: js=%d, status=%s, head=0x%x, tail=0x%x\n",
js, exception_name,
job_read(pfdev, JS_HEAD_LO(js)),
job_read(pfdev, JS_TAIL_LO(js)));
} else {
- 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\n",
js, exception_name,
job_read(pfdev, JS_HEAD_LO(js)),
job_read(pfdev, JS_TAIL_LO(js)));
@@ -671,7 +671,7 @@ panfrost_reset(struct panfrost_device *p
10, 10000);
if (ret)
- dev_err(pfdev->dev, "Soft-stop failed\n");
+ dev_err(pfdev->dev, "Failed to complete soft-stop: %d\n", ret);
/* Handle the remaining interrupts before we reset. */
panfrost_job_handle_irqs(pfdev);
@@ -740,7 +740,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",
+ dev_err(pfdev->dev, "GPU scheduler timeout: js=%d, config=0x%x, status=0x%x, head=0x%x, tail=0x%x, sched_job=%p\n",
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);
@@ -822,7 +822,7 @@ int panfrost_job_init(struct panfrost_de
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);
+ dev_err(pfdev->dev, "Failed to request job IRQ: %d\n", ret);
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)
@@ -840,7 +840,7 @@ int panfrost_job_init(struct panfrost_de
pfdev->reset.wq,
NULL, "pan_js");
if (ret) {
- dev_err(pfdev->dev, "Failed to create scheduler: %d.", ret);
+ dev_err(pfdev->dev, "Failed to create scheduler: %d\n", ret);
goto err_sched;
}
}
diff -pruN -X linux-5.15-rc1-ORIG/Documentation/dontdiff linux-5.15-rc1-ORIG/drivers/gpu/drm/scheduler/sched_main.c linux-5.15-rc1-panfrost/drivers/gpu/drm/scheduler/sched_main.c
--- linux-5.15-rc1-ORIG/drivers/gpu/drm/scheduler/sched_main.c 2021-09-13 01:28:37.000000000 +0200
+++ linux-5.15-rc1-panfrost/drivers/gpu/drm/scheduler/sched_main.c 2021-09-17 17:50:54.947121296 +0200
@@ -489,8 +489,7 @@ void drm_sched_start(struct drm_gpu_sche
if (r == -ENOENT)
drm_sched_job_done(s_job);
else if (r)
- DRM_ERROR("fence add callback failed (%d)\n",
- r);
+ DRM_ERROR("Failed to add fence callback: %d\n", r);
} else
drm_sched_job_done(s_job);
}
@@ -776,7 +775,7 @@ static int drm_sched_main(void *param)
struct drm_gpu_scheduler *sched = (struct drm_gpu_scheduler *)param;
int r;
......@@ -49,13 +83,13 @@ diff -pruN -X linux-5.14.2-ORIG/Documentation/dontdiff linux-5.14.2-ORIG/drivers
while (!kthread_should_stop()) {
struct drm_sched_entity *entity = NULL;
@@ -823,13 +823,11 @@ static int drm_sched_main(void *param)
@@ -824,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);
+ DRM_ERROR("Failed to add fence callback: %d\n", r);
dma_fence_put(fence);
} else {
if (IS_ERR(fence))
......@@ -64,4 +98,12 @@ diff -pruN -X linux-5.14.2-ORIG/Documentation/dontdiff linux-5.14.2-ORIG/drivers
drm_sched_job_done(sched_job);
}
@@ -885,7 +882,7 @@ int drm_sched_init(struct drm_gpu_schedu
if (IS_ERR(sched->thread)) {
ret = PTR_ERR(sched->thread);
sched->thread = NULL;
- DRM_ERROR("Failed to create scheduler for %s.\n", name);
+ DRM_ERROR("Failed to create scheduler for %s: %d\n", name, ret);
return ret;
}
......@@ -80,7 +80,7 @@ md5sums=('5606898dc633148586c7d2b2fe13fbe1'
'469417b64e6a2bf65bd74c6d9cad2040'
'c41b101c033ac487c15298bc5a9e95cd'
'1b92d7617e60d3c525a4b18ab4351185'
'98d840b2c92f107c4b4e38bfaa0da941'
'c09e4e1c2dfc76a5b7e3b4c79aa7798d'
'6bb2d84857359016b5e0878cf2fc50cc'
'4d1c5ad859cf3f22c0c9f7903d6d761c'
'cf64831f27bb47da29e708b7243bb340'
......
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