Some Panfrost fixes and improvements
Subsystems (3)
Adrián Larumbe
maintainerv6 cover Some Panfrost fixes and improvements
This is v6 of https://lore.kernel.org/dri-devel/[email protected]/
This patch series is a collection of minor fixes and improvements I came up with while working on driver related stuff.
Changelog:
v6:
- Don't optimise page range walk in the event of a double MMU fault
- Handle some minots and minor style changes
- Rebase patch series onto latest drm-misc-next
v5:
- Move devfreq record keeping further down job submission function to keep busy count balanced in case of an early bail-out.
- In MMU page fault ISR, bail out when sgt for 2MiB page is not assigned, rather than when the page array is populated. Add new commit for this.
- Add commit with myself as a new Panfrost maintainer
v4:
- Rebased older patch series onto latest drm-misc-next
- Added patch for renaming JM functions to reflect their actual role
- Fixed treatment of error code in perfcnt when enabling sample buffer AS
v3:
- Minor convenience fixes to patches 3 and 4 in the series
- Move unmapping of maped range of BO to the function's error path in case of BO mapping failure, also for putting BO's pages
- Split patch 6/8 into two: one makes sure the Job IRQ enablement mask isn't recalculated at every device reset and uses the same expression everywhere in the driver, and another one that breaks the enablement function into two stages.
v2:
- Removed commit that provided an explicit fence cleanup function
- Added commit for removing unused Panfrost device structure member
- Refactored how optional job interrupt reenabling during reset is handled
- Make the way errors and successful return values are delivered from inside panfrost_mmu_as_get more according to standard.
- Simplify unmapping of already mapped area when mapping the pages of a BO
- Fixing management of runtime-PM reference counts when failing HW job submission.
Adrián Larumbe (12):
drm/panfrost: Replace DRM driver allocation method with newer one drm/panfrost: Handle inexistent GPU during probe drm/panfrost: Handle job HW submit errors
drm/panfrost: Handle error when allocating AS number drm/panfrost: Check sgt to know whether pages are already mapped drm/panfrost: Handle page mapping failure
drm/panfrost: Don't rework job IRQ enable mask in the enable path drm/panfrost: Make re-enabling job interrupts at device reset optional drm/panfrost: Add forward declaration and types header drm/panfrost: Remove unused device property
drm/panfrost: Rename panfrost_job functions to reflect real role
MAINTAINERS: Panfrost: Add Steven Price and Adrian Larumbe
MAINTAINERS | 3 +- drivers/gpu/drm/panfrost/panfrost_devfreq.c | 4 +- drivers/gpu/drm/panfrost/panfrost_device.c | 68 +++++---- drivers/gpu/drm/panfrost/panfrost_device.h | 13 +- drivers/gpu/drm/panfrost/panfrost_drv.c | 78 ++++------ drivers/gpu/drm/panfrost/panfrost_dump.c | 8 +- drivers/gpu/drm/panfrost/panfrost_gem.c | 8 +- .../gpu/drm/panfrost/panfrost_gem_shrinker.c | 4 +- drivers/gpu/drm/panfrost/panfrost_gpu.c | 64 ++++---- drivers/gpu/drm/panfrost/panfrost_job.c | 139 +++++++++--------- drivers/gpu/drm/panfrost/panfrost_job.h | 15 +- drivers/gpu/drm/panfrost/panfrost_mmu.c | 112 +++++++++----- drivers/gpu/drm/panfrost/panfrost_mmu.h | 3 +- drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 26 ++-- 14 files changed, 301 insertions(+), 244 deletions(-)
base-commit: 7fb19ea1ec6aa85c75905b1fd732d50801e7fb28 --
2.51.0
Adrián Larumbe
maintainerPATCH v6 1/12 drm/panfrost: Replace DRM driver allocation method with newer one
Drop the deprecated DRM driver allocation method in favour of devm_drm_dev_alloc(). Overall just make it the same as in Panthor. Also discard now superfluous generic and platform device pointers inside the main panfrost device structure.
Some ancient checkpatch issues unearthed as a result of these changes were also fixed, like lines too long or double assignment in one line.
--- drivers/gpu/drm/panfrost/panfrost_devfreq.c | 4 +- drivers/gpu/drm/panfrost/panfrost_device.c | 49 ++++++------ drivers/gpu/drm/panfrost/panfrost_device.h | 6 +- drivers/gpu/drm/panfrost/panfrost_drv.c | 74 ++++++++----------- drivers/gpu/drm/panfrost/panfrost_dump.c | 8 +- drivers/gpu/drm/panfrost/panfrost_gem.c | 8 +- .../gpu/drm/panfrost/panfrost_gem_shrinker.c | 4 +- drivers/gpu/drm/panfrost/panfrost_gpu.c | 49 ++++++------ drivers/gpu/drm/panfrost/panfrost_job.c | 37 +++++----- drivers/gpu/drm/panfrost/panfrost_mmu.c | 46 ++++++------ drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 18 ++--- 11 files changed, 146 insertions(+), 157 deletions(-)
drivers/gpu/drm/panfrost/panfrost_devfreq.c +2 -2
@@ -74,7 +74,7 @@ static int panfrost_devfreq_get_dev_status(struct device *dev,spin_unlock_irqrestore (&pfdevfreq->lock, irqflags); -dev_dbg (pfdev->dev,"busy %lu total %lu %lu %% freq %lu MHz\n" , +dev_dbg (pfdev->base.dev,"busy %lu total %lu %lu %% freq %lu MHz\n" , status->busy_time, status->total_time, status->busy_time / (status->total_time /100 ), status->current_frequency /1000 /1000 );
@@ -119,7 +119,7 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev)int ret;struct dev_pm_opp *opp;unsigned long cur_freq; -struct device *dev = &pfdev->pdev->dev; +struct device *dev = pfdev->base.dev;struct devfreq *devfreq;struct thermal_cooling_device *cooling;struct panfrost_devfreq *pfdevfreq = &pfdev->pfdevfreq;
drivers/gpu/drm/panfrost/panfrost_device.c +25 -24
150 lines not on this page · raw message
drivers/gpu/drm/panfrost/panfrost_device.h +2 -4
@@ -124,9 +124,7 @@ struct panfrost_device_debugfs { };struct panfrost_device { -struct device *dev; -struct drm_device *ddev; -struct platform_device *pdev; +struct drm_device base;int gpu_irq;int mmu_irq;
@@ -222,7 +220,7 @@ static inline bool panfrost_high_prio_allowed(struct drm_file *file)static inline struct panfrost_device *to_panfrost_device (struct drm_device *ddev) { -return ddev->dev_private; + return container_of(ddev, struct panfrost_device, base); }static inline int panfrost_model_cmp (struct panfrost_device *pfdev,s32 id)
drivers/gpu/drm/panfrost/panfrost_drv.c +29 -45
174 lines not on this page · raw message
drivers/gpu/drm/panfrost/panfrost_dump.c +4 -4
@@ -163,7 +163,7 @@ void panfrost_core_dump(struct panfrost_job *job) iter.start =__vmalloc (file_size,GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY);if (!iter.start) { -dev_warn (pfdev->dev,"failed to allocate devcoredump file\n" ); +dev_warn (pfdev->base.dev,"failed to allocate devcoredump file\n" );return ; }
@@ -204,14 +204,14 @@ void panfrost_core_dump(struct panfrost_job *job) mapping = job->mappings[i];if (!bo->base.sgt) { -dev_err (pfdev->dev,"Panfrost Dump: BO has no sgt, cannot dump\n" ); +dev_err (pfdev->base.dev,"Panfrost Dump: BO has no sgt, cannot dump\n" ); iter.hdr->bomap.valid =0 ; goto dump_header; } ret =drm_gem_vmap (&bo->base.base, &map);if (ret) { -dev_err (pfdev->dev,"Panfrost Dump: couldn't map Buffer Object\n" ); +dev_err (pfdev->base.dev,"Panfrost Dump: couldn't map Buffer Object\n" ); iter.hdr->bomap.valid =0 ; goto dump_header; }
@@ -237,5 +237,5 @@ dump_header: panfrost_core_dump_header(&iter, PANFROSTDUMP_BUF_BO, iter.data + }panfrost_core_dump_header (&iter,PANFROSTDUMP_BUF_TRAILER , iter.data); -dev_coredumpv (pfdev->dev, iter.start, iter.data - iter.start,GFP_KERNEL ); +dev_coredumpv (pfdev->base.dev, iter.start, iter.data - iter.start,GFP_KERNEL ); }
drivers/gpu/drm/panfrost/panfrost_gem.c +4 -4
@@ -26,7 +26,7 @@ static void panfrost_gem_debugfs_bo_add(struct panfrost_device *pfdev,static void panfrost_gem_debugfs_bo_rm (struct panfrost_gem_object *bo) { -struct panfrost_device *pfdev = bo->base.base.dev->dev_private; +struct panfrost_device *pfdev =to_panfrost_device (bo->base.base.dev);if (list_empty (&bo->debugfs.node))return ;
@@ -48,7 +48,7 @@ static void panfrost_gem_debugfs_bo_rm(struct panfrost_gem_object *bo) {}static void panfrost_gem_free_object (struct drm_gem_object *obj) {struct panfrost_gem_object *bo =to_panfrost_bo (obj); -struct panfrost_device *pfdev = obj->dev->dev_private; +struct panfrost_device *pfdev =to_panfrost_device (obj->dev);/* * Make sure the BO is no longer inserted in the shrinker list before
@@ -76,7 +76,7 @@ static void panfrost_gem_free_object(struct drm_gem_object *obj)for (i =0 ; i < n_sgt; i++) {if (bo->sgts[i].sgl) { -dma_unmap_sgtable (pfdev->dev, &bo->sgts[i], +dma_unmap_sgtable (pfdev->base.dev, &bo->sgts[i],DMA_BIDIRECTIONAL ,0 );sg_free_table (&bo->sgts[i]); }
@@ -284,7 +284,7 @@ static const struct drm_gem_object_funcs panfrost_gem_funcs = {*/ struct drm_gem_object *panfrost_gem_create_object (struct drm_device *dev,size_t size) { -struct panfrost_device *pfdev = dev->dev_private; +struct panfrost_device *pfdev =to_panfrost_device (dev);struct panfrost_gem_object *obj; obj =kzalloc (sizeof (*obj),GFP_KERNEL );
drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c +2 -2
@@ -97,7 +97,7 @@ panfrost_gem_shrinker_scan(struct shrinker *shrinker, struct shrink_control *sc)*/ int panfrost_gem_shrinker_init (struct drm_device *dev) { -struct panfrost_device *pfdev = dev->dev_private; +struct panfrost_device *pfdev =to_panfrost_device (dev); pfdev->shrinker =shrinker_alloc (0 ,"drm-panfrost" );if (!pfdev->shrinker)
@@ -120,7 +120,7 @@ int panfrost_gem_shrinker_init(struct drm_device *dev)*/ void panfrost_gem_shrinker_cleanup (struct drm_device *dev) { -struct panfrost_device *pfdev = dev->dev_private; +struct panfrost_device *pfdev =to_panfrost_device (dev);if (pfdev->shrinker)shrinker_free (pfdev->shrinker);
drivers/gpu/drm/panfrost/panfrost_gpu.c +25 -24
153 lines not on this page · raw message
drivers/gpu/drm/panfrost/panfrost_job.c +19 -18
@@ -99,7 +99,7 @@ static struct dma_fence *panfrost_fence_create(struct panfrost_device *pfdev, inif (!fence)return ERR_PTR (-ENOMEM ); - fence->dev = pfdev->ddev; + fence->dev = &pfdev->base; fence->queue = js_num; fence->seqno = ++js->queue[js_num].emit_seqno; dma_fence_init(&fence->base, &panfrost_fence_ops, &js->job_lock,
@@ -210,7 +210,7 @@ static void panfrost_job_hw_submit(struct panfrost_job *job, int js)panfrost_devfreq_record_busy (&pfdev->pfdevfreq); - ret =pm_runtime_get_sync (pfdev->dev); + ret =pm_runtime_get_sync (pfdev->base.dev);if (ret <0 )return ;
@@ -261,7 +261,7 @@ static void panfrost_job_hw_submit(struct panfrost_job *job, int js) }job_write (pfdev,JS_COMMAND_NEXT (js),JS_COMMAND_START ); -dev_dbg (pfdev->dev, +dev_dbg (pfdev->base.dev,"JS: Submitting atom %p to js[%d][%d] with head=0x%llx AS %d" , job, js, subslot, jc_head, cfg &0xf ); }
@@ -446,12 +446,12 @@ static void panfrost_job_handle_err(struct panfrost_device *pfdev,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->base.dev,"js event, js=%d, status=%s, head=0x%x, tail=0x%x" , 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->base.dev,"js fault, js=%d, status=%s, head=0x%x, tail=0x%x" , js, exception_name,job_read (pfdev,JS_HEAD_LO (js)),job_read (pfdev,JS_TAIL_LO (js)));
@@ -483,7 +483,7 @@ static void panfrost_job_handle_err(struct panfrost_device *pfdev,if (signal_fence)dma_fence_signal_locked (job->done_fence); -pm_runtime_put_autosuspend (pfdev->dev); +pm_runtime_put_autosuspend (pfdev->base.dev);if (panfrost_exception_needs_reset (pfdev, js_status)) {atomic_set (&pfdev->reset.pending,1 );
@@ -502,7 +502,7 @@ static void panfrost_job_handle_done(struct panfrost_device *pfdev,panfrost_devfreq_record_idle (&pfdev->pfdevfreq);dma_fence_signal_locked (job->done_fence); -pm_runtime_put_autosuspend (pfdev->dev); +pm_runtime_put_autosuspend (pfdev->base.dev); }static void panfrost_job_handle_irq (struct panfrost_device *pfdev,u32 status)
@@ -611,7 +611,7 @@ static void panfrost_job_handle_irqs(struct panfrost_device *pfdev)u32 status =job_read (pfdev,JOB_INT_RAWSTAT );while (status) { -pm_runtime_mark_last_busy (pfdev->dev); +pm_runtime_mark_last_busy (pfdev->base.dev);spin_lock (&pfdev->js->job_lock);panfrost_job_handle_irq (pfdev, status);
@@ -692,7 +692,7 @@ panfrost_reset(struct panfrost_device *pfdev, 10, 10000);if (ret) -dev_err (pfdev->dev,"Soft-stop failed\n" ); +dev_err (pfdev->base.dev,"Soft-stop failed\n" );/* Handle the remaining interrupts before we reset. */ panfrost_job_handle_irqs (pfdev);
@@ -710,7 +710,7 @@ panfrost_reset(struct panfrost_device *pfdev,if (pfdev->jobs[i][j]->requirements &PANFROST_JD_REQ_CYCLE_COUNT || pfdev->jobs[i][j]->is_profiled)panfrost_cycle_counter_put (pfdev->jobs[i][j]->pfdev); -pm_runtime_put_noidle (pfdev->dev); +pm_runtime_put_noidle (pfdev->base.dev);panfrost_devfreq_record_idle (&pfdev->pfdevfreq); } }
@@ -778,11 +778,11 @@ static enum drm_gpu_sched_stat panfrost_job_timedout(struct drm_sched_jobsynchronize_irq (pfdev->js->irq);if (dma_fence_is_signaled (job->done_fence)) { -dev_warn (pfdev->dev,"unexpectedly high interrupt latency\n" ); +dev_warn (pfdev->base.dev,"unexpectedly high interrupt latency\n" );return DRM_GPU_SCHED_STAT_NO_HANG ; } - 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->base.dev, "gpu sched 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)),
@@ -850,7 +850,7 @@ int panfrost_job_init(struct panfrost_device *pfdev) .num_rqs = DRM_SCHED_PRIORITY_COUNT, .credit_limit = 2, .timeout = msecs_to_jiffies(JOB_TIMEOUT_MS), - .dev = pfdev->dev, + .dev = pfdev->base.dev, };struct panfrost_job_slot *js;int ret, j;
@@ -864,24 +864,25 @@ int panfrost_job_init(struct panfrost_device *pfdev)if (!panfrost_has_hw_feature (pfdev,HW_FEATURE_JOBCHAIN_DISAMBIGUATION )) args.credit_limit =1 ; - pfdev->js = js =devm_kzalloc (pfdev->dev,sizeof (*js),GFP_KERNEL ); + js =devm_kzalloc (pfdev->base.dev,sizeof (*js),GFP_KERNEL );if (!js)return -ENOMEM ; + pfdev->js = js;INIT_WORK (&pfdev->reset.work, panfrost_reset_work);spin_lock_init (&js->job_lock); - js->irq =platform_get_irq_byname (to_platform_device (pfdev->dev),"job" ); + js->irq =platform_get_irq_byname (to_platform_device (pfdev->base.dev),"job" );if (js->irq <0 )return js->irq; - ret =devm_request_threaded_irq (pfdev->dev, js->irq, + ret =devm_request_threaded_irq (pfdev->base.dev, js->irq, panfrost_job_irq_handler, panfrost_job_irq_handler_thread,IRQF_SHARED ,KBUILD_MODNAME "-job" , pfdev);if (ret) { -dev_err (pfdev->dev,"failed to request job irq" ); +dev_err (pfdev->base.dev,"failed to request job irq" );return ret; }
@@ -896,7 +897,7 @@ int panfrost_job_init(struct panfrost_device *pfdev) ret =drm_sched_init (&js->queue[j].sched, &args);if (ret) { -dev_err (pfdev->dev,"Failed to create scheduler: %d." , ret); +dev_err (pfdev->base.dev,"Failed to create scheduler: %d." , ret); goto err_sched; } }
drivers/gpu/drm/panfrost/panfrost_mmu.c +25 -21
150 lines not on this page · raw message
drivers/gpu/drm/panfrost/panfrost_perfcnt.c +9 -9
@@ -84,11 +84,11 @@ static int panfrost_perfcnt_enable_locked(struct panfrost_device *pfdev,else if (perfcnt->user)return -EBUSY ; - ret =pm_runtime_get_sync (pfdev->dev); + ret =pm_runtime_get_sync (pfdev->base.dev);if (ret <0 ) goto err_put_pm; - bo =drm_gem_shmem_create (pfdev->ddev, perfcnt->bosize); + bo =drm_gem_shmem_create (&pfdev->base, perfcnt->bosize);if (IS_ERR (bo)) { ret =PTR_ERR (bo); goto err_put_pm;
@@ -175,7 +175,7 @@ static int panfrost_perfcnt_enable_locked(struct panfrost_device *pfdev, err_put_bo:drm_gem_object_put (&bo->base); err_put_pm: -pm_runtime_put (pfdev->dev); +pm_runtime_put (pfdev->base.dev);return ret; }
@@ -203,7 +203,7 @@ static int panfrost_perfcnt_disable_locked(struct panfrost_device *pfdev,panfrost_mmu_as_put (pfdev, perfcnt->mapping->mmu);panfrost_gem_mapping_put (perfcnt->mapping); perfcnt->mapping =NULL ; -pm_runtime_put_autosuspend (pfdev->dev); +pm_runtime_put_autosuspend (pfdev->base.dev);return 0 ; }
@@ -211,7 +211,7 @@ static int panfrost_perfcnt_disable_locked(struct panfrost_device *pfdev,int panfrost_ioctl_perfcnt_enable (struct drm_device *dev,void *data,struct drm_file *file_priv) { -struct panfrost_device *pfdev = dev->dev_private; +struct panfrost_device *pfdev =to_panfrost_device (dev);struct panfrost_perfcnt *perfcnt = pfdev->perfcnt;struct drm_panfrost_perfcnt_enable *req = data;int ret;
@@ -238,7 +238,7 @@ int panfrost_ioctl_perfcnt_enable(struct drm_device *dev, void *data,int panfrost_ioctl_perfcnt_dump (struct drm_device *dev,void *data,struct drm_file *file_priv) { -struct panfrost_device *pfdev = dev->dev_private; +struct panfrost_device *pfdev =to_panfrost_device (dev);struct panfrost_perfcnt *perfcnt = pfdev->perfcnt;struct drm_panfrost_perfcnt_dump *req = data;void __user *user_ptr = (void __user *)(uintptr_t )req->buf_ptr;
@@ -273,12 +273,12 @@ void panfrost_perfcnt_close(struct drm_file *file_priv)struct panfrost_device *pfdev = pfile->pfdev;struct panfrost_perfcnt *perfcnt = pfdev->perfcnt; -pm_runtime_get_sync (pfdev->dev); +pm_runtime_get_sync (pfdev->base.dev);mutex_lock (&perfcnt->lock);if (perfcnt->user == pfile)panfrost_perfcnt_disable_locked (pfdev, file_priv);mutex_unlock (&perfcnt->lock); -pm_runtime_put_autosuspend (pfdev->dev); +pm_runtime_put_autosuspend (pfdev->base.dev); }int panfrost_perfcnt_init (struct panfrost_device *pfdev)
@@ -316,7 +316,7 @@ int panfrost_perfcnt_init(struct panfrost_device *pfdev)COUNTERS_PER_BLOCK *BYTES_PER_COUNTER ; } - perfcnt =devm_kzalloc (pfdev->dev,sizeof (*perfcnt),GFP_KERNEL ); + perfcnt =devm_kzalloc (pfdev->base.dev,sizeof (*perfcnt),GFP_KERNEL );if (!perfcnt)return -ENOMEM ;
Signature · 1 line
2.51.0
Adrián Larumbe
maintainerPATCH v6 2/12 drm/panfrost: Handle inexistent GPU during probe
In reply to Adrián LarumbeJust in case we're dealing with a yet not recognised device.
--- drivers/gpu/drm/panfrost/panfrost_gpu.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
drivers/gpu/drm/panfrost/panfrost_gpu.c +13 -2
@@ -240,9 +240,10 @@ static const struct panfrost_model gpu_models[] = {/* MediaTek MT8188 Mali-G57 MC3 */ GPU_MODEL (g57,0x9093 ,GPU_REV (g57,0 ,0 )), + {0}, }; -static void panfrost_gpu_init_features (struct panfrost_device *pfdev) +static int panfrost_gpu_init_features (struct panfrost_device *pfdev) {u32 gpu_id, num_js, major, minor, status, rev;const char *name ="unknown" ;
@@ -327,6 +328,12 @@ static void panfrost_gpu_init_features(struct panfrost_device *pfdev)break ; } +if (!model->name) { +dev_err (pfdev->base.dev,"GPU model not found: mali-%s id rev %#x %#x\n" , + name, gpu_id, rev); +return -ENODEV ; + } +bitmap_from_u64 (pfdev->features.hw_features, hw_feat);bitmap_from_u64 (pfdev->features.hw_issues, hw_issues);
@@ -347,6 +354,8 @@ static void panfrost_gpu_init_features(struct panfrost_device *pfdev)dev_info (pfdev->base.dev,"shader_present=0x%0llx l2_present=0x%0llx" , pfdev->features.shader_present, pfdev->features.l2_present); + +return 0 ; }void panfrost_cycle_counter_get (struct panfrost_device *pfdev)
@@ -489,7 +498,9 @@ int panfrost_gpu_init(struct panfrost_device *pfdev)if (err)return err; -panfrost_gpu_init_features (pfdev); + err =panfrost_gpu_init_features (pfdev); +if (err) +return err; err = dma_set_mask_and_coherent(pfdev->base.dev, DMA_BIT_MASK(FIELD_GET(0xff00,
Signature · 1 line
2.51.0
Adrián Larumbe
maintainerPATCH v6 3/12 drm/panfrost: Handle job HW submit errors
In reply to Adrián LarumbeAvoid waiting for the DRM scheduler job timedout handler, and instead, let the DRM scheduler core signal the error fence immediately when HW job submission fails.
That means we must also decrement the runtime-PM refcnt for the device, because the job will never be enqueued or inflight.
--- drivers/gpu/drm/panfrost/panfrost_job.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-)
drivers/gpu/drm/panfrost/panfrost_job.c +18 -6
@@ -200,7 +200,7 @@ panfrost_enqueue_job(struct panfrost_device *pfdev, int slot,return 1 ; } -static void panfrost_job_hw_submit (struct panfrost_job *job,int js) +static int panfrost_job_hw_submit (struct panfrost_job *job,int js) {struct panfrost_device *pfdev = job->pfdev;unsigned int subslot;
@@ -208,18 +208,19 @@ static void panfrost_job_hw_submit(struct panfrost_job *job, int js)u64 jc_head = job->jc;int ret; -panfrost_devfreq_record_busy (&pfdev->pfdevfreq); - ret =pm_runtime_get_sync (pfdev->base.dev);if (ret <0 ) -return ; + goto err_hwsubmit;if (WARN_ON (job_read (pfdev,JS_COMMAND_NEXT (js)))) { -return ; + ret = -EINVAL ; + goto err_hwsubmit; } cfg =panfrost_mmu_as_get (pfdev, job->mmu); +panfrost_devfreq_record_busy (&pfdev->pfdevfreq); +job_write (pfdev,JS_HEAD_NEXT_LO (js),lower_32_bits (jc_head));job_write (pfdev,JS_HEAD_NEXT_HI (js),upper_32_bits (jc_head));
@@ -266,6 +267,12 @@ static void panfrost_job_hw_submit(struct panfrost_job *job, int js) job, js, subslot, jc_head, cfg & 0xf); }spin_unlock (&pfdev->js->job_lock); + +return 0 ; + +err_hwsubmit: +pm_runtime_put_autosuspend (pfdev->base.dev); +return ret; } static int panfrost_acquire_object_fences(struct drm_gem_object **bos,
@@ -388,6 +395,7 @@ static struct dma_fence *panfrost_job_run(struct drm_sched_job *sched_job)struct panfrost_device *pfdev = job->pfdev;int slot =panfrost_job_get_slot (job);struct dma_fence *fence =NULL ; +int ret;if (job->ctx->destroyed)return ERR_PTR (-ECANCELED );
@@ -409,7 +417,11 @@ static struct dma_fence *panfrost_job_run(struct drm_sched_job *sched_job)dma_fence_put (job->done_fence); job->done_fence =dma_fence_get (fence); -panfrost_job_hw_submit (job, slot); + ret =panfrost_job_hw_submit (job, slot); +if (ret) { +dma_fence_put (fence); +return ERR_PTR (ret); + }return fence; }
Signature · 1 line
2.51.0
Adrián Larumbe
maintainerPATCH v6 4/12 drm/panfrost: Handle error when allocating AS number
In reply to Adrián LarumbeIf we reach the beginning of the LRU AS list, then return an error.
--- drivers/gpu/drm/panfrost/panfrost_job.c | 6 +++++- drivers/gpu/drm/panfrost/panfrost_mmu.c | 5 +++-- drivers/gpu/drm/panfrost/panfrost_mmu.h | 2 +- drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 8 ++++++-- 4 files changed, 15 insertions(+), 6 deletions(-)
drivers/gpu/drm/panfrost/panfrost_job.c +5 -1
@@ -217,7 +217,11 @@ static int panfrost_job_hw_submit(struct panfrost_job *job, int js) goto err_hwsubmit; } - cfg =panfrost_mmu_as_get (pfdev, job->mmu); + ret =panfrost_mmu_as_get (pfdev, job->mmu); +if (ret <0 ) + goto err_hwsubmit; + + cfg = ret;panfrost_devfreq_record_busy (&pfdev->pfdevfreq);
drivers/gpu/drm/panfrost/panfrost_mmu.c +3 -2
@@ -258,7 +258,7 @@ static int panfrost_mmu_cfg_init(struct panfrost_mmu *mmu, } } -u32 panfrost_mmu_as_get (struct panfrost_device *pfdev,struct panfrost_mmu *mmu) +int panfrost_mmu_as_get (struct panfrost_device *pfdev,struct panfrost_mmu *mmu) {int as;
@@ -300,7 +300,8 @@ u32 panfrost_mmu_as_get(struct panfrost_device *pfdev, struct panfrost_mmu *mmu)if (!atomic_read (&lru_mmu->as_count))break ; } -WARN_ON (&lru_mmu->list == &pfdev->as_lru_list); +if (WARN_ON (&lru_mmu->list == &pfdev->as_lru_list)) +return -EBUSY ;list_del_init (&lru_mmu->list); as = lru_mmu->as;
drivers/gpu/drm/panfrost/panfrost_mmu.h +1 -1
@@ -16,7 +16,7 @@ void panfrost_mmu_fini(struct panfrost_device *pfdev);void panfrost_mmu_reset (struct panfrost_device *pfdev);void panfrost_mmu_suspend_irq (struct panfrost_device *pfdev); -u32 panfrost_mmu_as_get (struct panfrost_device *pfdev,struct panfrost_mmu *mmu); +int panfrost_mmu_as_get (struct panfrost_device *pfdev,struct panfrost_mmu *mmu);void panfrost_mmu_as_put (struct panfrost_device *pfdev,struct panfrost_mmu *mmu);struct panfrost_mmu *panfrost_mmu_ctx_get (struct panfrost_mmu *mmu);
drivers/gpu/drm/panfrost/panfrost_perfcnt.c +6 -2
@@ -130,9 +130,11 @@ static int panfrost_perfcnt_enable_locked(struct panfrost_device *pfdev, goto err_vunmap; } - perfcnt->user = user; + ret =panfrost_mmu_as_get (pfdev, perfcnt->mapping->mmu); +if (ret <0 ) + goto err_vunmap; - as =panfrost_mmu_as_get (pfdev, perfcnt->mapping->mmu); + as = ret; cfg =GPU_PERFCNT_CFG_AS (as) |GPU_PERFCNT_CFG_MODE (GPU_PERFCNT_CFG_MODE_MANUAL );
@@ -164,6 +166,8 @@ static int panfrost_perfcnt_enable_locked(struct panfrost_device *pfdev,/* The BO ref is retained by the mapping. */ drm_gem_object_put (&bo->base); + perfcnt->user = user; +return 0 ; err_vunmap:
Signature · 1 line
2.51.0
Steven Price
maintainerRe: [PATCH v6 04/12] drm/panfrost: Handle error when allocating AS number
Quoted 43 lines · Adrián Larumbe
If we reach the beginning of the LRU AS list, then return an error.
Reviewed-by Steven Price <[email protected]>Reviewed-by Boris Brezillon <[email protected]>Signed-off-by Adrián Larumbe <[email protected]>--- drivers/gpu/drm/panfrost/panfrost_job.c | 6 +++++- drivers/gpu/drm/panfrost/panfrost_mmu.c | 5 +++-- drivers/gpu/drm/panfrost/panfrost_mmu.h | 2 +- drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 8 ++++++-- 4 files changed, 15 insertions(+), 6 deletions(-)drivers/gpu/drm/panfrost/panfrost_job.c +5
-1@@ -217,7 +217,11 @@ static int panfrost_job_hw_submit(struct panfrost_job *job, int js) goto err_hwsubmit; } - cfg =panfrost_mmu_as_get (pfdev, job->mmu); + ret =panfrost_mmu_as_get (pfdev, job->mmu); +if (ret <0 ) + goto err_hwsubmit; + + cfg = ret;panfrost_devfreq_record_busy (&pfdev->pfdevfreq);drivers/gpu/drm/panfrost/panfrost_mmu.c +1
-1@@ -258,7 +258,7 @@ static int panfrost_mmu_cfg_init(struct panfrost_mmu *mmu, } } -u32 panfrost_mmu_as_get (struct panfrost_device *pfdev,struct panfrost_mmu *mmu) +int panfrost_mmu_as_get (struct panfrost_device *pfdev,struct panfrost_mmu *mmu) {int as;
drivers/gpu/drm/panfrost/panfrost_mmu.c u32 panfrost_mmu_as_get(struct panfrost_device *pfdev, struct panfrost_mmu *mmu) · line 304
Quoted 6 lines
drivers/gpu/drm/panfrost/panfrost_mmu.c +2
-1@@ -300,7 +300,8 @@ u32 panfrost_mmu_as_get(struct panfrost_device *pfdev, struct panfrost_mmu *mmu)if (!atomic_read (&lru_mmu->as_count))break ; } -WARN_ON (&lru_mmu->list == &pfdev->as_lru_list); +if (WARN_ON (&lru_mmu->list == &pfdev->as_lru_list)) +return -EBUSY ;
I was about to apply this series, but sparse told me that this is broken. We're holding the as_lock here, so we need to drop that before returning.
Thanks,
Steve
Quoted 43 lines
drivers/gpu/drm/panfrost/panfrost_mmu.c +0
-0list_del_init (&lru_mmu->list); as = lru_mmu->as;drivers/gpu/drm/panfrost/panfrost_mmu.h +1
-1@@ -16,7 +16,7 @@ void panfrost_mmu_fini(struct panfrost_device *pfdev);void panfrost_mmu_reset (struct panfrost_device *pfdev);void panfrost_mmu_suspend_irq (struct panfrost_device *pfdev); -u32 panfrost_mmu_as_get (struct panfrost_device *pfdev,struct panfrost_mmu *mmu); +int panfrost_mmu_as_get (struct panfrost_device *pfdev,struct panfrost_mmu *mmu);void panfrost_mmu_as_put (struct panfrost_device *pfdev,struct panfrost_mmu *mmu);struct panfrost_mmu *panfrost_mmu_ctx_get (struct panfrost_mmu *mmu);drivers/gpu/drm/panfrost/panfrost_perfcnt.c +6
-2@@ -130,9 +130,11 @@ static int panfrost_perfcnt_enable_locked(struct panfrost_device *pfdev, goto err_vunmap; } - perfcnt->user = user; + ret =panfrost_mmu_as_get (pfdev, perfcnt->mapping->mmu); +if (ret <0 ) + goto err_vunmap; - as =panfrost_mmu_as_get (pfdev, perfcnt->mapping->mmu); + as = ret; cfg =GPU_PERFCNT_CFG_AS (as) |GPU_PERFCNT_CFG_MODE (GPU_PERFCNT_CFG_MODE_MANUAL );@@ -164,6 +166,8 @@ static int panfrost_perfcnt_enable_locked(struct panfrost_device *pfdev,/* The BO ref is retained by the mapping. */ drm_gem_object_put (&bo->base); + perfcnt->user = user; +return 0 ; err_vunmap:
Adrián Larumbe
maintainerRe: [PATCH v6 04/12] drm/panfrost: Handle error when allocating AS number
Quoted 43 lines · Steven Price
Quoted 42 lines · Adrián Larumbe
If we reach the beginning of the LRU AS list, then return an error.
Reviewed-by Steven Price <[email protected]>Reviewed-by Boris Brezillon <[email protected]>Signed-off-by Adrián Larumbe <[email protected]>--- drivers/gpu/drm/panfrost/panfrost_job.c | 6 +++++- drivers/gpu/drm/panfrost/panfrost_mmu.c | 5 +++-- drivers/gpu/drm/panfrost/panfrost_mmu.h | 2 +- drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 8 ++++++-- 4 files changed, 15 insertions(+), 6 deletions(-)drivers/gpu/drm/panfrost/panfrost_job.c +5
-1@@ -217,7 +217,11 @@ static int panfrost_job_hw_submit(struct panfrost_job *job, int js) goto err_hwsubmit; } - cfg =panfrost_mmu_as_get (pfdev, job->mmu); + ret =panfrost_mmu_as_get (pfdev, job->mmu); +if (ret <0 ) + goto err_hwsubmit; + + cfg = ret;panfrost_devfreq_record_busy (&pfdev->pfdevfreq);drivers/gpu/drm/panfrost/panfrost_mmu.c +1
-1@@ -258,7 +258,7 @@ static int panfrost_mmu_cfg_init(struct panfrost_mmu *mmu, } } -u32 panfrost_mmu_as_get (struct panfrost_device *pfdev,struct panfrost_mmu *mmu) +int panfrost_mmu_as_get (struct panfrost_device *pfdev,struct panfrost_mmu *mmu) {int as;
Quoted 11 lines
drivers/gpu/drm/panfrost/panfrost_mmu.c u32 panfrost_mmu_as_get(struct panfrost_device *pfdev, struct panfrost_mmu *mmu) · line 304
Quoted 7 lines
drivers/gpu/drm/panfrost/panfrost_mmu.c +2
-1@@ -300,7 +300,8 @@ u32 panfrost_mmu_as_get(struct panfrost_device *pfdev, struct panfrost_mmu *mmu)if (!atomic_read (&lru_mmu->as_count))break ; } -WARN_ON (&lru_mmu->list == &pfdev->as_lru_list); +if (WARN_ON (&lru_mmu->list == &pfdev->as_lru_list)) +return -EBUSY ;I was about to apply this series, but sparse told me that this is broken. We're holding the
as_lockhere, so we need to drop that before returning.
Thanks for catching this, I think going forward I should make a point of always running sparse on a patch series before sending it out to the ML.
Adrian
Quoted 47 lines
Thanks,
Steve
Quoted 43 lines
drivers/gpu/drm/panfrost/panfrost_mmu.c +0
-0list_del_init (&lru_mmu->list); as = lru_mmu->as;drivers/gpu/drm/panfrost/panfrost_mmu.h +1
-1@@ -16,7 +16,7 @@ void panfrost_mmu_fini(struct panfrost_device *pfdev);void panfrost_mmu_reset (struct panfrost_device *pfdev);void panfrost_mmu_suspend_irq (struct panfrost_device *pfdev); -u32 panfrost_mmu_as_get (struct panfrost_device *pfdev,struct panfrost_mmu *mmu); +int panfrost_mmu_as_get (struct panfrost_device *pfdev,struct panfrost_mmu *mmu);void panfrost_mmu_as_put (struct panfrost_device *pfdev,struct panfrost_mmu *mmu);struct panfrost_mmu *panfrost_mmu_ctx_get (struct panfrost_mmu *mmu);drivers/gpu/drm/panfrost/panfrost_perfcnt.c +6
-2@@ -130,9 +130,11 @@ static int panfrost_perfcnt_enable_locked(struct panfrost_device *pfdev, goto err_vunmap; } - perfcnt->user = user; + ret =panfrost_mmu_as_get (pfdev, perfcnt->mapping->mmu); +if (ret <0 ) + goto err_vunmap; - as =panfrost_mmu_as_get (pfdev, perfcnt->mapping->mmu); + as = ret; cfg =GPU_PERFCNT_CFG_AS (as) |GPU_PERFCNT_CFG_MODE (GPU_PERFCNT_CFG_MODE_MANUAL );@@ -164,6 +166,8 @@ static int panfrost_perfcnt_enable_locked(struct panfrost_device *pfdev,/* The BO ref is retained by the mapping. */ drm_gem_object_put (&bo->base); + perfcnt->user = user; +return 0 ; err_vunmap:
Adrián Larumbe
maintainerPATCH v6 5/12 drm/panfrost: Check sgt to know whether pages are already mapped
In reply to Adrián LarumbeIn the MMU's page fault ISR for a heap object, determine whether the faulting address belongs to a 2MiB block that was already mapped by checking its corresponding sgt in the Panfrost BO.
This is done in preparation for a future commit in which the MMU mapping helper might fail, but the page array is left populated, so this cannot be used as a check for an early bail-out.
--- drivers/gpu/drm/panfrost/panfrost_mmu.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/gpu/drm/panfrost/panfrost_mmu.c +6 -5
@@ -600,10 +600,12 @@ static int panfrost_mmu_map_fault_addr(struct panfrost_device *pfdev, int as,refcount_set (&bo->base.pages_use_count,1 ); }else { pages = bo->base.pages; -if (pages[page_offset]) { -/* Pages are already mapped, bail out. */ - goto out; - } + } + + sgt = &bo->sgts[page_offset / (SZ_2M /PAGE_SIZE )]; +if (sgt->sgl) { +/* Pages are already mapped, bail out. */ + goto out; } mapping = bo->base.base.filp->f_mapping;
@@ -625,7 +627,6 @@ static int panfrost_mmu_map_fault_addr(struct panfrost_device *pfdev, int as, } } - sgt = &bo->sgts[page_offset / (SZ_2M /PAGE_SIZE )]; ret =sg_alloc_table_from_pages (sgt, pages + page_offset,NUM_FAULT_PAGES ,0 ,SZ_2M ,GFP_KERNEL );if (ret)
Signature · 1 line
2.51.0
Re: [PATCH v6 05/12] drm/panfrost: Check sgt to know whether pages are already mapped
Quoted 9 lines · Adrián Larumbe
In the MMU's page fault ISR for a heap object, determine whether the faulting address belongs to a 2MiB block that was already mapped by checking its corresponding sgt in the Panfrost BO.
This is done in preparation for a future commit in which the MMU mapping helper might fail, but the page array is left populated, so this cannot be used as a check for an early bail-out.
Signed-off-by Adrián Larumbe <[email protected]>
Quoted 33 lines
--- drivers/gpu/drm/panfrost/panfrost_mmu.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)drivers/gpu/drm/panfrost/panfrost_mmu.c +6
-5@@ -600,10 +600,12 @@ static int panfrost_mmu_map_fault_addr(struct panfrost_device *pfdev, int as,refcount_set (&bo->base.pages_use_count,1 ); }else { pages = bo->base.pages; -if (pages[page_offset]) { -/* Pages are already mapped, bail out. */ - goto out; - } + } + + sgt = &bo->sgts[page_offset / (SZ_2M /PAGE_SIZE )]; +if (sgt->sgl) { +/* Pages are already mapped, bail out. */ + goto out; } mapping = bo->base.base.filp->f_mapping;@@ -625,7 +627,6 @@ static int panfrost_mmu_map_fault_addr(struct panfrost_device *pfdev, int as, } } - sgt = &bo->sgts[page_offset / (SZ_2M /PAGE_SIZE )]; ret =sg_alloc_table_from_pages (sgt, pages + page_offset,NUM_FAULT_PAGES ,0 ,SZ_2M ,GFP_KERNEL );if (ret)
Adrián Larumbe
maintainerPATCH v6 6/12 drm/panfrost: Handle page mapping failure
In reply to Adrián LarumbeWhen mapping the pages of a BO, either a heap type at page fault time or else a non-heap BO at object creation time, if the ARM page table mapping function fails, we unmap what had been mapped so far and bail out.
--- drivers/gpu/drm/panfrost/panfrost_mmu.c | 49 ++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 5 deletions(-)
drivers/gpu/drm/panfrost/panfrost_mmu.c +44 -5
@@ -393,13 +393,32 @@ static void panfrost_mmu_flush_range(struct panfrost_device *pfdev,pm_runtime_put_autosuspend (pfdev->base.dev); } +static void mmu_unmap_range (struct panfrost_mmu *mmu,u64 iova,size_t len) +{ +struct io_pgtable_ops *ops = mmu->pgtbl_ops; +size_t pgsize, unmapped_len =0 ; +size_t unmapped_page, pgcount; + +while (unmapped_len < len) { + pgsize =get_pgsize (iova, len - unmapped_len, &pgcount); + + unmapped_page = ops->unmap_pages (ops, iova, pgsize, pgcount,NULL ); +WARN_ON (unmapped_page != pgsize * pgcount); + + iova += pgsize * pgcount; + unmapped_len += pgsize * pgcount; + } +} +static int mmu_map_sg (struct panfrost_device *pfdev,struct panfrost_mmu *mmu,u64 iova,int prot,struct sg_table *sgt) {unsigned int count;struct scatterlist *sgl;struct io_pgtable_ops *ops = mmu->pgtbl_ops; +size_t total_mapped =0 ;u64 start_iova = iova; +int ret;for_each_sgtable_dma_sg (sgt, sgl, count) {unsigned long paddr =sg_dma_address (sgl);
@@ -413,10 +432,14 @@ static int mmu_map_sg(struct panfrost_device *pfdev, struct panfrost_mmu *mmu,size_t pgcount, mapped =0 ;size_t pgsize =get_pgsize (iova | paddr, len, &pgcount); - ops->map_pages (ops, iova, paddr, pgsize, pgcount, prot, + ret = ops->map_pages (ops, iova, paddr, pgsize, pgcount, prot,GFP_KERNEL , &mapped); +if (ret) + goto err_unmap_pages; +/* Don't get stuck if things have gone wrong */ mapped =max (mapped, pgsize); + total_mapped += mapped; iova += mapped; paddr += mapped; len -= mapped;
@@ -426,6 +449,10 @@ static int mmu_map_sg(struct panfrost_device *pfdev, struct panfrost_mmu *mmu,panfrost_mmu_flush_range (pfdev, mmu, start_iova, iova - start_iova);return 0 ; + +err_unmap_pages: +mmu_unmap_range (mmu, start_iova, total_mapped); +return ret; }int panfrost_mmu_map (struct panfrost_gem_mapping *mapping)
@@ -436,6 +463,7 @@ int panfrost_mmu_map(struct panfrost_gem_mapping *mapping)struct panfrost_device *pfdev =to_panfrost_device (obj->dev);struct sg_table *sgt;int prot =IOMMU_READ |IOMMU_WRITE |IOMMU_CACHE ; +int ret;if (WARN_ON (mapping->active))return 0 ;
@@ -447,11 +475,18 @@ int panfrost_mmu_map(struct panfrost_gem_mapping *mapping)if (WARN_ON (IS_ERR (sgt)))return PTR_ERR (sgt); -mmu_map_sg (pfdev, mapping->mmu, mapping->mmnode.start <<PAGE_SHIFT , - prot, sgt); + ret =mmu_map_sg (pfdev, mapping->mmu, mapping->mmnode.start <<PAGE_SHIFT , + prot, sgt); +if (ret) + goto err_put_pages; + mapping->active = true;return 0 ; + +err_put_pages: +drm_gem_shmem_put_pages_locked (shmem); +return ret; }void panfrost_mmu_unmap (struct panfrost_gem_mapping *mapping)
@@ -636,8 +671,10 @@ static int panfrost_mmu_map_fault_addr(struct panfrost_device *pfdev, int as,if (ret) goto err_map; -mmu_map_sg (pfdev, bomapping->mmu, addr, -IOMMU_WRITE |IOMMU_READ |IOMMU_CACHE |IOMMU_NOEXEC , sgt); + ret =mmu_map_sg (pfdev, bomapping->mmu, addr, +IOMMU_WRITE |IOMMU_READ |IOMMU_CACHE |IOMMU_NOEXEC , sgt); +if (ret) + goto err_mmu_map_sg; bomapping->active = true; bo->heap_rss_size +=SZ_2M ;
@@ -651,6 +688,8 @@ static int panfrost_mmu_map_fault_addr(struct panfrost_device *pfdev, int as,return 0 ; +err_mmu_map_sg: +dma_unmap_sgtable (pfdev->base.dev, sgt,DMA_BIDIRECTIONAL ,0 ); err_map:sg_free_table (sgt); err_unlock:
Signature · 1 line
2.51.0
Re: [PATCH v6 06/12] drm/panfrost: Handle page mapping failure
Quoted 6 lines · Adrián Larumbe
When mapping the pages of a BO, either a heap type at page fault time or else a non-heap BO at object creation time, if the ARM page table mapping function fails, we unmap what had been mapped so far and bail out.
Reviewed-by Boris Brezillon <[email protected]>Signed-off-by Adrián Larumbe <[email protected]>
Quoted 119 lines
--- drivers/gpu/drm/panfrost/panfrost_mmu.c | 49 ++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 5 deletions(-)drivers/gpu/drm/panfrost/panfrost_mmu.c +44
-5@@ -393,13 +393,32 @@ static void panfrost_mmu_flush_range(struct panfrost_device *pfdev,pm_runtime_put_autosuspend (pfdev->base.dev); } +static void mmu_unmap_range (struct panfrost_mmu *mmu,u64 iova,size_t len) +{ +struct io_pgtable_ops *ops = mmu->pgtbl_ops; +size_t pgsize, unmapped_len =0 ; +size_t unmapped_page, pgcount; + +while (unmapped_len < len) { + pgsize =get_pgsize (iova, len - unmapped_len, &pgcount); + + unmapped_page = ops->unmap_pages (ops, iova, pgsize, pgcount,NULL ); +WARN_ON (unmapped_page != pgsize * pgcount); + + iova += pgsize * pgcount; + unmapped_len += pgsize * pgcount; + } +} +static int mmu_map_sg (struct panfrost_device *pfdev,struct panfrost_mmu *mmu,u64 iova,int prot,struct sg_table *sgt) {unsigned int count;struct scatterlist *sgl;struct io_pgtable_ops *ops = mmu->pgtbl_ops; +size_t total_mapped =0 ;u64 start_iova = iova; +int ret;for_each_sgtable_dma_sg (sgt, sgl, count) {unsigned long paddr =sg_dma_address (sgl);@@ -413,10 +432,14 @@ static int mmu_map_sg(struct panfrost_device *pfdev, struct panfrost_mmu *mmu,size_t pgcount, mapped =0 ;size_t pgsize =get_pgsize (iova | paddr, len, &pgcount); - ops->map_pages (ops, iova, paddr, pgsize, pgcount, prot, + ret = ops->map_pages (ops, iova, paddr, pgsize, pgcount, prot,GFP_KERNEL , &mapped); +if (ret) + goto err_unmap_pages; +/* Don't get stuck if things have gone wrong */ mapped =max (mapped, pgsize); + total_mapped += mapped; iova += mapped; paddr += mapped; len -= mapped;@@ -426,6 +449,10 @@ static int mmu_map_sg(struct panfrost_device *pfdev, struct panfrost_mmu *mmu,panfrost_mmu_flush_range (pfdev, mmu, start_iova, iova - start_iova);return 0 ; + +err_unmap_pages: +mmu_unmap_range (mmu, start_iova, total_mapped); +return ret; }int panfrost_mmu_map (struct panfrost_gem_mapping *mapping)@@ -436,6 +463,7 @@ int panfrost_mmu_map(struct panfrost_gem_mapping *mapping)struct panfrost_device *pfdev =to_panfrost_device (obj->dev);struct sg_table *sgt;int prot =IOMMU_READ |IOMMU_WRITE |IOMMU_CACHE ; +int ret;if (WARN_ON (mapping->active))return 0 ;@@ -447,11 +475,18 @@ int panfrost_mmu_map(struct panfrost_gem_mapping *mapping)if (WARN_ON (IS_ERR (sgt)))return PTR_ERR (sgt); -mmu_map_sg (pfdev, mapping->mmu, mapping->mmnode.start <<PAGE_SHIFT , - prot, sgt); + ret =mmu_map_sg (pfdev, mapping->mmu, mapping->mmnode.start <<PAGE_SHIFT , + prot, sgt); +if (ret) + goto err_put_pages; + mapping->active = true;return 0 ; + +err_put_pages: +drm_gem_shmem_put_pages_locked (shmem); +return ret; }void panfrost_mmu_unmap (struct panfrost_gem_mapping *mapping)@@ -636,8 +671,10 @@ static int panfrost_mmu_map_fault_addr(struct panfrost_device *pfdev, int as,if (ret) goto err_map; -mmu_map_sg (pfdev, bomapping->mmu, addr, -IOMMU_WRITE |IOMMU_READ |IOMMU_CACHE |IOMMU_NOEXEC , sgt); + ret =mmu_map_sg (pfdev, bomapping->mmu, addr, +IOMMU_WRITE |IOMMU_READ |IOMMU_CACHE |IOMMU_NOEXEC , sgt); +if (ret) + goto err_mmu_map_sg; bomapping->active = true; bo->heap_rss_size +=SZ_2M ;@@ -651,6 +688,8 @@ static int panfrost_mmu_map_fault_addr(struct panfrost_device *pfdev, int as,return 0 ; +err_mmu_map_sg: +dma_unmap_sgtable (pfdev->base.dev, sgt,DMA_BIDIRECTIONAL ,0 ); err_map:sg_free_table (sgt); err_unlock:
Adrián Larumbe
maintainerPATCH v6 7/12 drm/panfrost: Don't rework job IRQ enable mask in the enable path
In reply to Adrián LarumbeUp until now, panfrost_job_enable_interrupts() would always recalculate the same job IRQ enablement mask, which is effectively a constant.
Replace it with a compile-time constant value, and also in another couple places where an equivalent expression was being used.
--- drivers/gpu/drm/panfrost/panfrost_device.h | 4 ++++ drivers/gpu/drm/panfrost/panfrost_job.c | 19 ++++--------------- 2 files changed, 8 insertions(+), 15 deletions(-)
drivers/gpu/drm/panfrost/panfrost_device.h +4 -0
@@ -26,6 +26,10 @@ struct panfrost_perfcnt;#define MAX_PM_DOMAINS 5 +#define ALL_JS_INT_MASK \ + (GENMASK(16 + NUM_JOB_SLOTS - 1, 16) | \ + GENMASK(NUM_JOB_SLOTS - 1, 0)) +enum panfrost_drv_comp_bits {PANFROST_COMP_BIT_GPU ,PANFROST_COMP_BIT_JOB ,
drivers/gpu/drm/panfrost/panfrost_job.c +4 -15
@@ -432,17 +432,10 @@ static struct dma_fence *panfrost_job_run(struct drm_sched_job *sched_job)void panfrost_job_enable_interrupts (struct panfrost_device *pfdev) { -int j; -u32 irq_mask =0 ; -clear_bit (PANFROST_COMP_BIT_JOB , pfdev->is_suspended); -for (j =0 ; j <NUM_JOB_SLOTS ; j++) { - irq_mask |=MK_JS_MASK (j); - } - -job_write (pfdev,JOB_INT_CLEAR , irq_mask); -job_write (pfdev,JOB_INT_MASK , irq_mask); +job_write (pfdev,JOB_INT_CLEAR ,ALL_JS_INT_MASK ); +job_write (pfdev,JOB_INT_MASK ,ALL_JS_INT_MASK ); }void panfrost_job_suspend_irq (struct panfrost_device *pfdev)
@@ -761,9 +754,7 @@ panfrost_reset(struct panfrost_device *pfdev,drm_sched_start (&pfdev->js->queue[i].sched,0 );/* Re-enable job interrupts now that everything has been restarted. */ -job_write (pfdev,JOB_INT_MASK , -GENMASK (16 +NUM_JOB_SLOTS -1 ,16 ) | -GENMASK (NUM_JOB_SLOTS -1 ,0 )); +job_write (pfdev,JOB_INT_MASK ,ALL_JS_INT_MASK );dma_fence_end_signalling (cookie); }
@@ -836,9 +827,7 @@ static irqreturn_t panfrost_job_irq_handler_thread(int irq, void *data)/* Enable interrupts only if we're not about to get suspended */ if (!test_bit (PANFROST_COMP_BIT_JOB , pfdev->is_suspended)) -job_write (pfdev,JOB_INT_MASK , -GENMASK (16 +NUM_JOB_SLOTS -1 ,16 ) | -GENMASK (NUM_JOB_SLOTS -1 ,0 )); +job_write (pfdev,JOB_INT_MASK ,ALL_JS_INT_MASK );return IRQ_HANDLED ; }
Signature · 1 line
2.51.0
Adrián Larumbe
maintainerPATCH v6 8/12 drm/panfrost: Make re-enabling job interrupts at device reset optional
In reply to Adrián LarumbeRather than remasking interrupts after a device reset in the main reset path, allow selecting whether to do this with an additional bool parameter.
To this end, split reenabling job interrupts into two functions, one that clears the interrupts and another one which unmasks them conditionally.
--- drivers/gpu/drm/panfrost/panfrost_device.c | 9 ++++++--- drivers/gpu/drm/panfrost/panfrost_device.h | 2 +- drivers/gpu/drm/panfrost/panfrost_job.c | 17 ++++++++--------- drivers/gpu/drm/panfrost/panfrost_job.h | 1 + 4 files changed, 16 insertions(+), 13 deletions(-)
drivers/gpu/drm/panfrost/panfrost_device.c +6 -3
@@ -400,13 +400,16 @@ bool panfrost_exception_needs_reset(const struct panfrost_device *pfdev,return false; } -void panfrost_device_reset (struct panfrost_device *pfdev) +void panfrost_device_reset (struct panfrost_device *pfdev,bool enable_job_int) {panfrost_gpu_soft_reset (pfdev);panfrost_gpu_power_on (pfdev);panfrost_mmu_reset (pfdev); -panfrost_job_enable_interrupts (pfdev); + +panfrost_job_reset_interrupts (pfdev); +if (enable_job_int) +panfrost_job_enable_interrupts (pfdev); }static int panfrost_device_runtime_resume (struct device *dev)
@@ -430,7 +433,7 @@ static int panfrost_device_runtime_resume(struct device *dev) } } -panfrost_device_reset (pfdev); +panfrost_device_reset (pfdev, true);panfrost_devfreq_resume (pfdev);return 0 ;
drivers/gpu/drm/panfrost/panfrost_device.h +1 -1
@@ -250,7 +250,7 @@ int panfrost_unstable_ioctl_check(void);int panfrost_device_init (struct panfrost_device *pfdev);void panfrost_device_fini (struct panfrost_device *pfdev); -void panfrost_device_reset (struct panfrost_device *pfdev); +void panfrost_device_reset (struct panfrost_device *pfdev,bool enable_job_int);extern const struct dev_pm_ops panfrost_pm_ops;
drivers/gpu/drm/panfrost/panfrost_job.c +8 -9
@@ -430,11 +430,14 @@ static struct dma_fence *panfrost_job_run(struct drm_sched_job *sched_job)return fence; } +void panfrost_job_reset_interrupts (struct panfrost_device *pfdev) +{ +job_write (pfdev,JOB_INT_CLEAR ,ALL_JS_INT_MASK ); +} +void panfrost_job_enable_interrupts (struct panfrost_device *pfdev) {clear_bit (PANFROST_COMP_BIT_JOB , pfdev->is_suspended); - -job_write (pfdev,JOB_INT_CLEAR ,ALL_JS_INT_MASK );job_write (pfdev,JOB_INT_MASK ,ALL_JS_INT_MASK ); }
@@ -727,12 +730,7 @@ panfrost_reset(struct panfrost_device *pfdev,spin_unlock (&pfdev->js->job_lock);/* Proceed with reset now. */ -panfrost_device_reset (pfdev); - -/* panfrost_device_reset() unmasks job interrupts, but we want to -* keep them masked a bit longer. -*/ -job_write (pfdev,JOB_INT_MASK ,0 ); +panfrost_device_reset (pfdev, false);/* GPU has been reset, we can clear the reset pending bit. */ atomic_set (&pfdev->reset.pending,0 );
@@ -754,7 +752,7 @@ panfrost_reset(struct panfrost_device *pfdev,drm_sched_start (&pfdev->js->queue[i].sched,0 );/* Re-enable job interrupts now that everything has been restarted. */ -job_write (pfdev,JOB_INT_MASK ,ALL_JS_INT_MASK ); +panfrost_job_enable_interrupts (pfdev);dma_fence_end_signalling (cookie); }
@@ -907,6 +905,7 @@ int panfrost_job_init(struct panfrost_device *pfdev) } } +panfrost_job_reset_interrupts (pfdev);panfrost_job_enable_interrupts (pfdev);return 0 ;
drivers/gpu/drm/panfrost/panfrost_job.h +1 -0
@@ -69,6 +69,7 @@ void panfrost_job_close(struct drm_file *file);int panfrost_job_get_slot (struct panfrost_job *job);int panfrost_job_push (struct panfrost_job *job);void panfrost_job_put (struct panfrost_job *job); +void panfrost_job_reset_interrupts (struct panfrost_device *pfdev);void panfrost_job_enable_interrupts (struct panfrost_device *pfdev);void panfrost_job_suspend_irq (struct panfrost_device *pfdev);int panfrost_job_is_idle (struct panfrost_device *pfdev);
Signature · 1 line
2.51.0
Adrián Larumbe
maintainerPATCH v6 9/12 drm/panfrost: Add forward declaration and types header
In reply to Adrián LarumbeThis is to make LLVM syntactic analysers happy.
--- drivers/gpu/drm/panfrost/panfrost_mmu.h | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/panfrost/panfrost_mmu.h +1 -0
@@ -4,6 +4,7 @@#ifndef __PANFROST_MMU_H__#define __PANFROST_MMU_H__ +struct panfrost_device ;struct panfrost_gem_mapping ;struct panfrost_file_priv ;struct panfrost_mmu ;
Signature · 1 line
2.51.0
Adrián Larumbe
maintainerPATCH v6 10/12 drm/panfrost: Remove unused device property
In reply to Adrián LarumbeThe as_in_use_mask device state variable is no longer in use.
--- drivers/gpu/drm/panfrost/panfrost_device.h | 1 - drivers/gpu/drm/panfrost/panfrost_mmu.c | 1 - 2 files changed, 2 deletions(-)
drivers/gpu/drm/panfrost/panfrost_device.h +0 -1
@@ -147,7 +147,6 @@ struct panfrost_device {DECLARE_BITMAP (is_suspended,PANFROST_COMP_BIT_MAX );spinlock_t as_lock; -unsigned long as_in_use_mask;unsigned long as_alloc_mask;unsigned long as_faulty_mask;struct list_head as_lru_list;
drivers/gpu/drm/panfrost/panfrost_mmu.c +0 -1
@@ -713,7 +713,6 @@ static void panfrost_mmu_release_ctx(struct kref *kref)pm_runtime_put_autosuspend (pfdev->base.dev);clear_bit (mmu->as, &pfdev->as_alloc_mask); -clear_bit (mmu->as, &pfdev->as_in_use_mask);list_del (&mmu->list); }spin_unlock (&pfdev->as_lock);
Signature · 1 line
2.51.0
Adrián Larumbe
maintainerPATCH v6 11/12 drm/panfrost: Rename panfrost_job functions to reflect real role
In reply to Adrián Larumbepanfrost_job_* prefixed functions in panfrost_job.c deal with both panfrost_job objects and also the more general JM (Job Manager) side of the device itself. This is confusing.
Reprefix functions that program the JM to panfrosot_jm_* instead.
--- drivers/gpu/drm/panfrost/panfrost_device.c | 14 +++---- drivers/gpu/drm/panfrost/panfrost_drv.c | 4 +- drivers/gpu/drm/panfrost/panfrost_job.c | 48 +++++++++++----------- drivers/gpu/drm/panfrost/panfrost_job.h | 16 ++++---- 4 files changed, 41 insertions(+), 41 deletions(-)
drivers/gpu/drm/panfrost/panfrost_device.c +7 -7
@@ -259,7 +259,7 @@ int panfrost_device_init(struct panfrost_device *pfdev)if (err) goto out_gpu; - err =panfrost_job_init (pfdev); + err =panfrost_jm_init (pfdev);if (err) goto out_mmu;
@@ -269,7 +269,7 @@ int panfrost_device_init(struct panfrost_device *pfdev)return 0 ; out_job: -panfrost_job_fini (pfdev); +panfrost_jm_fini (pfdev); out_mmu:panfrost_mmu_fini (pfdev); out_gpu:
@@ -290,7 +290,7 @@ int panfrost_device_init(struct panfrost_device *pfdev)void panfrost_device_fini (struct panfrost_device *pfdev) {panfrost_perfcnt_fini (pfdev); -panfrost_job_fini (pfdev); +panfrost_jm_fini (pfdev);panfrost_mmu_fini (pfdev);panfrost_gpu_fini (pfdev);panfrost_devfreq_fini (pfdev);
@@ -407,9 +407,9 @@ void panfrost_device_reset(struct panfrost_device *pfdev, bool enable_job_int)panfrost_gpu_power_on (pfdev);panfrost_mmu_reset (pfdev); -panfrost_job_reset_interrupts (pfdev); +panfrost_jm_reset_interrupts (pfdev);if (enable_job_int) -panfrost_job_enable_interrupts (pfdev); +panfrost_jm_enable_interrupts (pfdev); }static int panfrost_device_runtime_resume (struct device *dev)
@@ -451,11 +451,11 @@ static int panfrost_device_runtime_suspend(struct device *dev) {struct panfrost_device *pfdev =dev_get_drvdata (dev); -if (!panfrost_job_is_idle (pfdev)) +if (!panfrost_jm_is_idle (pfdev))return -EBUSY ;panfrost_devfreq_suspend (pfdev); -panfrost_job_suspend_irq (pfdev); +panfrost_jm_suspend_irq (pfdev);panfrost_mmu_suspend_irq (pfdev);panfrost_gpu_suspend_irq (pfdev);panfrost_gpu_power_off (pfdev);
drivers/gpu/drm/panfrost/panfrost_drv.c +2 -2
@@ -606,7 +606,7 @@ panfrost_open(struct drm_device *dev, struct drm_file *file) goto err_free; } - ret =panfrost_job_open (file); + ret =panfrost_jm_open (file);if (ret) goto err_job;
@@ -625,7 +625,7 @@ panfrost_postclose(struct drm_device *dev, struct drm_file *file)struct panfrost_file_priv *panfrost_priv = file->driver_priv;panfrost_perfcnt_close (file); -panfrost_job_close (file); +panfrost_jm_close (file);panfrost_mmu_ctx_put (panfrost_priv->mmu);kfree (panfrost_priv);
drivers/gpu/drm/panfrost/panfrost_job.c +24 -24
168 lines not on this page · raw message
drivers/gpu/drm/panfrost/panfrost_job.h +8 -8
@@ -62,16 +62,16 @@ void panfrost_jm_ctx_put(struct panfrost_jm_ctx *jm_ctx);struct panfrost_jm_ctx *panfrost_jm_ctx_get (struct panfrost_jm_ctx *jm_ctx);struct panfrost_jm_ctx *panfrost_jm_ctx_from_handle (struct drm_file *file,u32 handle); -int panfrost_job_init (struct panfrost_device *pfdev); -void panfrost_job_fini (struct panfrost_device *pfdev); -int panfrost_job_open (struct drm_file *file); -void panfrost_job_close (struct drm_file *file); +int panfrost_jm_init (struct panfrost_device *pfdev); +void panfrost_jm_fini (struct panfrost_device *pfdev); +int panfrost_jm_open (struct drm_file *file); +void panfrost_jm_close (struct drm_file *file); +void panfrost_jm_reset_interrupts (struct panfrost_device *pfdev); +void panfrost_jm_enable_interrupts (struct panfrost_device *pfdev); +void panfrost_jm_suspend_irq (struct panfrost_device *pfdev); +int panfrost_jm_is_idle (struct panfrost_device *pfdev);int panfrost_job_get_slot (struct panfrost_job *job);int panfrost_job_push (struct panfrost_job *job);void panfrost_job_put (struct panfrost_job *job); -void panfrost_job_reset_interrupts (struct panfrost_device *pfdev); -void panfrost_job_enable_interrupts (struct panfrost_device *pfdev); -void panfrost_job_suspend_irq (struct panfrost_device *pfdev); -int panfrost_job_is_idle (struct panfrost_device *pfdev);#endif
Signature · 1 line
2.51.0
Adrián Larumbe
maintainerPATCH v6 12/12 MAINTAINERS: Panfrost: Add Steven Price and Adrian Larumbe
In reply to Adrián LarumbeRecast Steven Price as Panfrost driver maintainer. Also add Adrian Larumbe in the same role.
--- MAINTAINERS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
MAINTAINERS +2 -1
@@ -2092,7 +2092,8 @@ F: drivers/gpu/drm/arm/display/komeda/ ARM MALI PANFROST DRM DRIVER M: Boris Brezillon <[email protected]> M: Rob Herring <[email protected]> -R: Steven Price <[email protected]> +M: Steven Price <[email protected]> +M: Adrián Larumbe <[email protected]> L: [email protected] S: Supported T: git https://gitlab.freedesktop.org/drm/misc/kernel.git
Signature · 1 line
2.51.0
Il 15/10/25 02:09, Adrián Larumbe ha scritto:
Quoted 5 lines
This is v6 of https://lore.kernel.org/dri-devel/[email protected]/
This patch series is a collection of minor fixes and improvements I came up with while working on driver related stuff.
Whole series is
Quoted 69 lines
Changelog:
v6:
- Don't optimise page range walk in the event of a double MMU fault
- Handle some minots and minor style changes
- Rebase patch series onto latest drm-misc-next
v5:
- Move devfreq record keeping further down job submission function to keep busy count balanced in case of an early bail-out.
- In MMU page fault ISR, bail out when sgt for 2MiB page is not assigned, rather than when the page array is populated. Add new commit for this.
- Add commit with myself as a new Panfrost maintainerv4:
- Rebased older patch series onto latest drm-misc-next
- Added patch for renaming JM functions to reflect their actual role
- Fixed treatment of error code in perfcnt when enabling sample buffer ASv3:
- Minor convenience fixes to patches 3 and 4 in the series
- Move unmapping of maped range of BO to the function's error path in case of BO mapping failure, also for putting BO's pages
- Split patch 6/8 into two: one makes sure the Job IRQ enablement mask isn't recalculated at every device reset and uses the same expression everywhere in the driver, and another one that breaks the enablement function into two stages.v2:
- Removed commit that provided an explicit fence cleanup function
- Added commit for removing unused Panfrost device structure member
- Refactored how optional job interrupt reenabling during reset is handled
- Make the way errors and successful return values are delivered from insidepanfrost_mmu_as_getmore according to standard.
- Simplify unmapping of already mapped area when mapping the pages of a BO
- Fixing management of runtime-PM reference counts when failing HW job submission.Adrián Larumbe (12):
drm/panfrost: Replace DRM driver allocation method with newer one drm/panfrost: Handle inexistent GPU during probe drm/panfrost: Handle job HW submit errors
drm/panfrost: Handle error when allocating AS number drm/panfrost: Check sgt to know whether pages are already mapped drm/panfrost: Handle page mapping failure
drm/panfrost: Don't rework job IRQ enable mask in the enable path drm/panfrost: Make re-enabling job interrupts at device reset optional drm/panfrost: Add forward declaration and types header drm/panfrost: Remove unused device property
drm/panfrost: Renamepanfrost_jobfunctions to reflect real role
MAINTAINERS: Panfrost: Add Steven Price and Adrian LarumbeMAINTAINERS | 3 +- drivers/gpu/drm/panfrost/panfrost_devfreq.c | 4 +- drivers/gpu/drm/panfrost/panfrost_device.c | 68 +++++---- drivers/gpu/drm/panfrost/panfrost_device.h | 13 +- drivers/gpu/drm/panfrost/panfrost_drv.c | 78 ++++------ drivers/gpu/drm/panfrost/panfrost_dump.c | 8 +- drivers/gpu/drm/panfrost/panfrost_gem.c | 8 +- .../gpu/drm/panfrost/panfrost_gem_shrinker.c | 4 +- drivers/gpu/drm/panfrost/panfrost_gpu.c | 64 ++++---- drivers/gpu/drm/panfrost/panfrost_job.c | 139 +++++++++--------- drivers/gpu/drm/panfrost/panfrost_job.h | 15 +- drivers/gpu/drm/panfrost/panfrost_mmu.c | 112 +++++++++----- drivers/gpu/drm/panfrost/panfrost_mmu.h | 3 +- drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 26 ++-- 14 files changed, 301 insertions(+), 244 deletions(-)base-commit:
7fb19ea1ec6aa85c75905b1fd732d50801e7fb28--
2.51.0