- A handful of fixes from -next that just missed feature freeze - More panfrost fixes that went directly in -misc-next-fixes (various) - Fix searchpaths during build (Masahiro) - msm patch to fix the driver for chips without zap shader (Rob) - Fix freeing imported buffers in drm_gem_cma_free_object() (Noralf) Cc: Masahiro Yamada <yamada.masahiro@socionext.com> Cc: Rob Clark <robdclark@chromium.org> Cc: Noralf Trønnes <noralf@tronnes.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
Unified · Split
| @@ -23,7 +23,7 @@ · 22 unmodified lines | ||
| 23 | 23 | # Makefile for the drm device driver. This driver provides support for the |
| 24 | 24 | # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. |
| 25 | 25 | |
| 26 | −FULL_AMD_PATH=$(src)/.. | |
| 26 | +FULL_AMD_PATH=$(srctree)/$(src)/.. | |
| 27 | 27 | DISPLAY_FOLDER_NAME=display |
| 28 | 28 | FULL_AMD_DISPLAY_PATH = $(FULL_AMD_PATH)/$(DISPLAY_FOLDER_NAME) |
| 29 | 29 | |
| @@ -1,8 +1,8 @@ | ||
| 1 | 1 | # SPDX-License-Identifier: GPL-2.0 |
| 2 | 2 | |
| 3 | 3 | ccflags-y := \ |
| 4 | − -I$(src)/../include \ | |
| 5 | − -I$(src) | |
| 4 | + -I $(srctree)/$(src)/../include \ | |
| 5 | + -I $(srctree)/$(src) | |
| 6 | 6 | |
| 7 | 7 | komeda-y := \ |
| 8 | 8 | komeda_drv.o \ |
| @@ -1416,12 +1416,6 @@ EXPORT_SYMBOL(drm_mode_create_scaling_mode_property); · 1415 unmodified lines | ||
| 1416 | 1416 | * |
| 1417 | 1417 | * The driver may place further restrictions within these minimum |
| 1418 | 1418 | * and maximum bounds. |
| 1419 | − * | |
| 1420 | − * The semantics for the vertical blank timestamp differ when | |
| 1421 | − * variable refresh rate is active. The vertical blank timestamp | |
| 1422 | − * is defined to be an estimate using the current mode's fixed | |
| 1423 | − * refresh rate timings. The semantics for the page-flip event | |
| 1424 | − * timestamp remain the same. | |
| 1425 | 1419 | */ |
| 1426 | 1420 | |
| 1427 | 1421 | /** |
| @@ -186,13 +186,13 @@ void drm_gem_cma_free_object(struct drm_gem_object *gem_obj) · 185 unmodified lines | ||
| 186 | 186 | |
| 187 | 187 | cma_obj = to_drm_gem_cma_obj(gem_obj); |
| 188 | 188 | |
| 189 | − if (cma_obj->vaddr) { | |
| 190 | − dma_free_wc(gem_obj->dev->dev, cma_obj->base.size, | |
| 191 | − cma_obj->vaddr, cma_obj->paddr); | |
| 192 | − } else if (gem_obj->import_attach) { | |
| 189 | + if (gem_obj->import_attach) { | |
| 193 | 190 | if (cma_obj->vaddr) |
| 194 | 191 | dma_buf_vunmap(gem_obj->import_attach->dmabuf, cma_obj->vaddr); |
| 195 | 192 | drm_prime_gem_destroy(gem_obj, cma_obj->sgt); |
| 193 | + } else if (cma_obj->vaddr) { | |
| 194 | + dma_free_wc(gem_obj->dev->dev, cma_obj->base.size, | |
| 195 | + cma_obj->vaddr, cma_obj->paddr); | |
| 196 | 196 | } |
| 197 | 197 | |
| 198 | 198 | drm_gem_object_release(gem_obj); |
| @@ -5,5 +5,5 @@ GVT_SOURCE := gvt.o aperture_gm.o handlers.o vgpu.o trace_points.o firmware.o \ · 4 unmodified lines | ||
| 5 | 5 | execlist.o scheduler.o sched_policy.o mmio_context.o cmd_parser.o debugfs.o \ |
| 6 | 6 | fb_decoder.o dmabuf.o page_track.o |
| 7 | 7 | |
| 8 | −ccflags-y += -I$(src) -I$(src)/$(GVT_DIR) | |
| 8 | +ccflags-y += -I $(srctree)/$(src) -I $(srctree)/$(src)/$(GVT_DIR)/ | |
| 9 | 9 | i915-y += $(addprefix $(GVT_DIR)/, $(GVT_SOURCE)) |
| @@ -1,7 +1,7 @@ | ||
| 1 | 1 | # SPDX-License-Identifier: GPL-2.0 |
| 2 | −ccflags-y := -Idrivers/gpu/drm/msm | |
| 3 | −ccflags-y += -Idrivers/gpu/drm/msm/disp/dpu1 | |
| 4 | −ccflags-$(CONFIG_DRM_MSM_DSI) += -Idrivers/gpu/drm/msm/dsi | |
| 2 | +ccflags-y := -I $(srctree)/$(src) | |
| 3 | +ccflags-y += -I $(srctree)/$(src)/disp/dpu1 | |
| 4 | +ccflags-$(CONFIG_DRM_MSM_DSI) += -I $(srctree)/$(src)/dsi | |
| 5 | 5 | |
| 6 | 6 | msm-y := \ |
| 7 | 7 | adreno/adreno_device.o \ |
| @@ -527,6 +527,7 @@ static int a6xx_hw_init(struct msm_gpu *gpu) · 526 unmodified lines | ||
| 527 | 527 | dev_warn_once(gpu->dev->dev, |
| 528 | 528 | "Zap shader not enabled - using SECVID_TRUST_CNTL instead\n"); |
| 529 | 529 | gpu_write(gpu, REG_A6XX_RBBM_SECVID_TRUST_CNTL, 0x0); |
| 530 | + ret = 0; | |
| 530 | 531 | } |
| 531 | 532 | |
| 532 | 533 | out: |
| @@ -1,7 +1,7 @@ | ||
| 1 | −ccflags-y += -I$(src)/include | |
| 2 | −ccflags-y += -I$(src)/include/nvkm | |
| 3 | −ccflags-y += -I$(src)/nvkm | |
| 4 | −ccflags-y += -I$(src) | |
| 1 | +ccflags-y += -I $(srctree)/$(src)/include | |
| 2 | +ccflags-y += -I $(srctree)/$(src)/include/nvkm | |
| 3 | +ccflags-y += -I $(srctree)/$(src)/nvkm | |
| 4 | +ccflags-y += -I $(srctree)/$(src) | |
| 5 | 5 | |
| 6 | 6 | # NVKM - HW resource manager |
| 7 | 7 | #- code also used by various userspace tools/tests |
| @@ -3,7 +3,7 @@ · 2 unmodified lines | ||
| 3 | 3 | config DRM_PANFROST |
| 4 | 4 | tristate "Panfrost (DRM support for ARM Mali Midgard/Bifrost GPUs)" |
| 5 | 5 | depends on DRM |
| 6 | − depends on ARM || ARM64 || COMPILE_TEST | |
| 6 | + depends on ARM || ARM64 || (COMPILE_TEST && !GENERIC_ATOMIC64) | |
| 7 | 7 | depends on MMU |
| 8 | 8 | select DRM_SCHED |
| 9 | 9 | select IOMMU_SUPPORT |
| @@ -7,6 +7,7 @@ · 6 unmodified lines | ||
| 7 | 7 | #include <linux/regulator/consumer.h> |
| 8 | 8 | |
| 9 | 9 | #include "panfrost_device.h" |
| 10 | +#include "panfrost_devfreq.h" | |
| 10 | 11 | #include "panfrost_features.h" |
| 11 | 12 | #include "panfrost_issues.h" |
| 12 | 13 | #include "panfrost_gpu.h" |
| @@ -98,6 +98,7 @@ int panfrost_device_init(struct panfrost_device *pfdev) · 97 unmodified lines | ||
| 98 | 98 | struct resource *res; |
| 99 | 99 | |
| 100 | 100 | mutex_init(&pfdev->sched_lock); |
| 101 | + mutex_init(&pfdev->reset_lock); | |
| 101 | 102 | INIT_LIST_HEAD(&pfdev->scheduled_jobs); |
| 102 | 103 | |
| 103 | 104 | spin_lock_init(&pfdev->hwaccess_lock); |
| @@ -78,6 +78,7 @@ struct panfrost_device { · 77 unmodified lines | ||
| 78 | 78 | struct list_head scheduled_jobs; |
| 79 | 79 | |
| 80 | 80 | struct mutex sched_lock; |
| 81 | + struct mutex reset_lock; | |
| 81 | 82 | |
| 82 | 83 | struct { |
| 83 | 84 | struct devfreq *devfreq; |
| @@ -3,8 +3,6 @@ · 2 unmodified lines | ||
| 3 | 3 | /* Copyright 2019 Linaro, Ltd., Rob Herring <robh@kernel.org> */ |
| 4 | 4 | /* Copyright 2019 Collabora ltd. */ |
| 5 | 5 | |
| 6 | −#include <linux/bitfield.h> | |
| 7 | −#include <linux/dma-mapping.h> | |
| 8 | 6 | #include <linux/module.h> |
| 9 | 7 | #include <linux/of_platform.h> |
| 10 | 8 | #include <linux/pagemap.h> |
| @@ -172,13 +170,27 @@ static int panfrost_ioctl_submit(struct drm_device *dev, void *data, · 161 unmodified lines | ||
| 172 | 170 | { |
| 173 | 171 | struct panfrost_device *pfdev = dev->dev_private; |
| 174 | 172 | struct drm_panfrost_submit *args = data; |
| 175 | − struct drm_syncobj *sync_out; | |
| 173 | + struct drm_syncobj *sync_out = NULL; | |
| 176 | 174 | struct panfrost_job *job; |
| 177 | 175 | int ret = 0; |
| 178 | 176 | |
| 177 | + if (!args->jc) | |
| 178 | + return -EINVAL; | |
| 179 | + | |
| 180 | + if (args->requirements && args->requirements != PANFROST_JD_REQ_FS) | |
| 181 | + return -EINVAL; | |
| 182 | + | |
| 183 | + if (args->out_sync > 0) { | |
| 184 | + sync_out = drm_syncobj_find(file, args->out_sync); | |
| 185 | + if (!sync_out) | |
| 186 | + return -ENODEV; | |
| 187 | + } | |
| 188 | + | |
| 179 | 189 | job = kzalloc(sizeof(*job), GFP_KERNEL); |
| 180 | − if (!job) | |
| 181 | − return -ENOMEM; | |
| 190 | + if (!job) { | |
| 191 | + ret = -ENOMEM; | |
| 192 | + goto fail_out_sync; | |
| 193 | + } | |
| 182 | 194 | |
| 183 | 195 | kref_init(&job->refcount); |
| 184 | 196 | |
| @@ -190,25 +202,24 @@ static int panfrost_ioctl_submit(struct drm_device *dev, void *data, · 5 unmodified lines | ||
| 190 | 202 | |
| 191 | 203 | ret = panfrost_copy_in_sync(dev, file, args, job); |
| 192 | 204 | if (ret) |
| 193 | − goto fail; | |
| 205 | + goto fail_job; | |
| 194 | 206 | |
| 195 | 207 | ret = panfrost_lookup_bos(dev, file, args, job); |
| 196 | 208 | if (ret) |
| 197 | − goto fail; | |
| 209 | + goto fail_job; | |
| 198 | 210 | |
| 199 | 211 | ret = panfrost_job_push(job); |
| 200 | 212 | if (ret) |
| 201 | − goto fail; | |
| 213 | + goto fail_job; | |
| 202 | 214 | |
| 203 | 215 | /* Update the return sync object for the job */ |
| 204 | − sync_out = drm_syncobj_find(file, args->out_sync); | |
| 205 | − if (sync_out) { | |
| 216 | + if (sync_out) | |
| 206 | 217 | drm_syncobj_replace_fence(sync_out, job->render_done_fence); |
| 207 | − drm_syncobj_put(sync_out); | |
| 208 | − } | |
| 209 | 218 | |
| 210 | −fail: | |
| 219 | +fail_job: | |
| 211 | 220 | panfrost_job_put(job); |
| 221 | +fail_out_sync: | |
| 222 | + drm_syncobj_put(sync_out); | |
| 212 | 223 | |
| 213 | 224 | return ret; |
| 214 | 225 | } |
| @@ -384,16 +395,15 @@ static int panfrost_probe(struct platform_device *pdev) · 169 unmodified lines | ||
| 384 | 395 | |
| 385 | 396 | err = panfrost_device_init(pfdev); |
| 386 | 397 | if (err) { |
| 387 | − dev_err(&pdev->dev, "Fatal error during GPU init\n"); | |
| 398 | + if (err != -EPROBE_DEFER) | |
| 399 | + dev_err(&pdev->dev, "Fatal error during GPU init\n"); | |
| 388 | 400 | goto err_out0; |
| 389 | 401 | } |
| 390 | 402 | |
| 391 | − dma_set_mask_and_coherent(pfdev->dev, | |
| 392 | − DMA_BIT_MASK(FIELD_GET(0xff00, pfdev->features.mmu_features))); | |
| 393 | − | |
| 394 | 403 | err = panfrost_devfreq_init(pfdev); |
| 395 | 404 | if (err) { |
| 396 | − dev_err(&pdev->dev, "Fatal error during devfreq init\n"); | |
| 405 | + if (err != -EPROBE_DEFER) | |
| 406 | + dev_err(&pdev->dev, "Fatal error during devfreq init\n"); | |
| 397 | 407 | goto err_out1; |
| 398 | 408 | } |
| 399 | 409 | |
| @@ -410,6 +420,7 @@ static int panfrost_probe(struct platform_device *pdev) · 10 unmodified lines | ||
| 410 | 420 | err_out1: |
| 411 | 421 | panfrost_device_fini(pfdev); |
| 412 | 422 | err_out0: |
| 423 | + pm_runtime_disable(pfdev->dev); | |
| 413 | 424 | drm_dev_put(ddev); |
| 414 | 425 | return err; |
| 415 | 426 | } |
| @@ -14,7 +14,7 @@ · 13 unmodified lines | ||
| 14 | 14 | /* Called DRM core on the last userspace/kernel unreference of the |
| 15 | 15 | * BO. |
| 16 | 16 | */ |
| 17 | −void panfrost_gem_free_object(struct drm_gem_object *obj) | |
| 17 | +static void panfrost_gem_free_object(struct drm_gem_object *obj) | |
| 18 | 18 | { |
| 19 | 19 | struct panfrost_gem_object *bo = to_panfrost_bo(obj); |
| 20 | 20 | struct panfrost_device *pfdev = obj->dev->dev_private; |
| @@ -2,8 +2,10 @@ · 1 unmodified line | ||
| 2 | 2 | /* Copyright 2018 Marty E. Plummer <hanetzer@startmail.com> */ |
| 3 | 3 | /* Copyright 2019 Linaro, Ltd., Rob Herring <robh@kernel.org> */ |
| 4 | 4 | /* Copyright 2019 Collabora ltd. */ |
| 5 | +#include <linux/bitfield.h> | |
| 5 | 6 | #include <linux/bitmap.h> |
| 6 | 7 | #include <linux/delay.h> |
| 8 | +#include <linux/dma-mapping.h> | |
| 7 | 9 | #include <linux/interrupt.h> |
| 8 | 10 | #include <linux/io.h> |
| 9 | 11 | #include <linux/iopoll.h> |
| @@ -276,13 +278,13 @@ static void panfrost_gpu_init_features(struct panfrost_device *pfdev) · 266 unmodified lines | ||
| 276 | 278 | pfdev->features.hw_issues); |
| 277 | 279 | |
| 278 | 280 | dev_info(pfdev->dev, "Features: L2:0x%08x Shader:0x%08x Tiler:0x%08x Mem:0x%0x MMU:0x%08x AS:0x%x JS:0x%x", |
| 279 | − gpu_read(pfdev, GPU_L2_FEATURES), | |
| 280 | − gpu_read(pfdev, GPU_CORE_FEATURES), | |
| 281 | − gpu_read(pfdev, GPU_TILER_FEATURES), | |
| 282 | − gpu_read(pfdev, GPU_MEM_FEATURES), | |
| 283 | − gpu_read(pfdev, GPU_MMU_FEATURES), | |
| 284 | − gpu_read(pfdev, GPU_AS_PRESENT), | |
| 285 | − gpu_read(pfdev, GPU_JS_PRESENT)); | |
| 281 | + pfdev->features.l2_features, | |
| 282 | + pfdev->features.core_features, | |
| 283 | + pfdev->features.tiler_features, | |
| 284 | + pfdev->features.mem_features, | |
| 285 | + pfdev->features.mmu_features, | |
| 286 | + pfdev->features.as_present, | |
| 287 | + pfdev->features.js_present); | |
| 286 | 288 | |
| 287 | 289 | dev_info(pfdev->dev, "shader_present=0x%0llx l2_present=0x%0llx", |
| 288 | 290 | pfdev->features.shader_present, pfdev->features.l2_present); |
| @@ -332,6 +334,9 @@ int panfrost_gpu_init(struct panfrost_device *pfdev) · 43 unmodified lines | ||
| 332 | 334 | |
| 333 | 335 | panfrost_gpu_init_features(pfdev); |
| 334 | 336 | |
| 337 | + dma_set_mask_and_coherent(pfdev->dev, | |
| 338 | + DMA_BIT_MASK(FIELD_GET(0xff00, pfdev->features.mmu_features))); | |
| 339 | + | |
| 335 | 340 | irq = platform_get_irq_byname(to_platform_device(pfdev->dev), "gpu"); |
| 336 | 341 | if (irq <= 0) |
| 337 | 342 | return -ENODEV; |
| @@ -384,6 +384,8 @@ static void panfrost_job_timedout(struct drm_sched_job *sched_job) · 383 unmodified lines | ||
| 384 | 384 | job_read(pfdev, JS_TAIL_LO(js)), |
| 385 | 385 | sched_job); |
| 386 | 386 | |
| 387 | + mutex_lock(&pfdev->reset_lock); | |
| 388 | + | |
| 387 | 389 | for (i = 0; i < NUM_JOB_SLOTS; i++) |
| 388 | 390 | drm_sched_stop(&pfdev->js->queue[i].sched); |
| 389 | 391 | |
| @@ -406,6 +408,8 @@ static void panfrost_job_timedout(struct drm_sched_job *sched_job) · 16 unmodified lines | ||
| 406 | 408 | /* restart scheduler after GPU is usable again */ |
| 407 | 409 | for (i = 0; i < NUM_JOB_SLOTS; i++) |
| 408 | 410 | drm_sched_start(&pfdev->js->queue[i].sched, true); |
| 411 | + | |
| 412 | + mutex_unlock(&pfdev->reset_lock); | |
| 409 | 413 | } |
| 410 | 414 | |
| 411 | 415 | static const struct drm_sched_backend_ops panfrost_sched_ops = { |
| @@ -448,6 +448,14 @@ static int rockchip_drm_platform_remove(struct platform_device *pdev) · 447 unmodified lines | ||
| 448 | 448 | return 0; |
| 449 | 449 | } |
| 450 | 450 | |
| 451 | +static void rockchip_drm_platform_shutdown(struct platform_device *pdev) | |
| 452 | +{ | |
| 453 | + struct drm_device *drm = platform_get_drvdata(pdev); | |
| 454 | + | |
| 455 | + if (drm) | |
| 456 | + drm_atomic_helper_shutdown(drm); | |
| 457 | +} | |
| 458 | + | |
| 451 | 459 | static const struct of_device_id rockchip_drm_dt_ids[] = { |
| 452 | 460 | { .compatible = "rockchip,display-subsystem", }, |
| 453 | 461 | { /* sentinel */ }, |
| @@ -457,6 +465,7 @@ MODULE_DEVICE_TABLE(of, rockchip_drm_dt_ids); · 3 unmodified lines | ||
| 457 | 465 | static struct platform_driver rockchip_drm_platform_driver = { |
| 458 | 466 | .probe = rockchip_drm_platform_probe, |
| 459 | 467 | .remove = rockchip_drm_platform_remove, |
| 468 | + .shutdown = rockchip_drm_platform_shutdown, | |
| 460 | 469 | .driver = { |
| 461 | 470 | .name = "rockchip-drm", |
| 462 | 471 | .of_match_table = rockchip_drm_dt_ids, |