diff options
| author | Rob Herring <robh@kernel.org> | 2019-08-08 14:30:39 -0600 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2019-08-12 14:20:46 -0600 |
| commit | 73e467f60acdabd480d1b377a623ba13db0e5dd2 (patch) | |
| tree | c01cb5420cfd005f771a9ec940a23817ee334e7f /drivers/gpu/drm/panfrost/panfrost_device.c | |
| parent | 203270c025be02d52feca729d9193860317c2e82 (diff) | |
| download | linux-stable-73e467f60acdabd480d1b377a623ba13db0e5dd2.tar.gz linux-stable-73e467f60acdabd480d1b377a623ba13db0e5dd2.tar.bz2 linux-stable-73e467f60acdabd480d1b377a623ba13db0e5dd2.zip | |
drm/panfrost: Consolidate reset handling
Runtime PM resume and job timeouts both call the same sequence of
functions, so consolidate them to a common function. This will make
changing the reset related code easier. The MMU also needs some
re-initialization on reset, so rework its call. In the process, we
hide the address space details within the MMU code in preparation to
support multiple address spaces.
Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Robin Murphy <robin.murphy@arm.com>
Cc: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Steven Price <steven.price@arm.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190808222200.13176-7-robh@kernel.org
Diffstat (limited to 'drivers/gpu/drm/panfrost/panfrost_device.c')
| -rw-r--r-- | drivers/gpu/drm/panfrost/panfrost_device.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c b/drivers/gpu/drm/panfrost/panfrost_device.c index 8a111d7c0200..9814f4ccbd26 100644 --- a/drivers/gpu/drm/panfrost/panfrost_device.c +++ b/drivers/gpu/drm/panfrost/panfrost_device.c @@ -254,18 +254,22 @@ const char *panfrost_exception_name(struct panfrost_device *pfdev, u32 exception return "UNKNOWN"; } +void panfrost_device_reset(struct panfrost_device *pfdev) +{ + panfrost_gpu_soft_reset(pfdev); + + panfrost_gpu_power_on(pfdev); + panfrost_mmu_reset(pfdev); + panfrost_job_enable_interrupts(pfdev); +} + #ifdef CONFIG_PM int panfrost_device_resume(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); struct panfrost_device *pfdev = platform_get_drvdata(pdev); - panfrost_gpu_soft_reset(pfdev); - - /* TODO: Re-enable all other address spaces */ - panfrost_gpu_power_on(pfdev); - panfrost_mmu_enable(pfdev, 0); - panfrost_job_enable_interrupts(pfdev); + panfrost_device_reset(pfdev); panfrost_devfreq_resume(pfdev); return 0; |