drm/lima: add suspend/resume support
Subsystems (3)
Qiang Yu
maintainercover drm/lima: add suspend/resume support
Suspend need to wait running jobs finish and put hardware in poweroff state. Resume need to re-init hardware.
Qiang Yu (4):
drm/lima: add lima_devfreq_resume/suspend drm/lima: power down ip blocks when pmu exit drm/lima: add resume/suspend callback for each ip drm/lima: add pm resume/suspend
drivers/gpu/drm/lima/lima_bcast.c | 25 ++++++++-- drivers/gpu/drm/lima/lima_bcast.h | 2 + drivers/gpu/drm/lima/lima_devfreq.c | 24 ++++++++++ drivers/gpu/drm/lima/lima_devfreq.h | 3 ++ drivers/gpu/drm/lima/lima_device.c | 69 ++++++++++++++++++++++++++++ drivers/gpu/drm/lima/lima_device.h | 5 ++ drivers/gpu/drm/lima/lima_dlbu.c | 17 ++++++- drivers/gpu/drm/lima/lima_dlbu.h | 2 + drivers/gpu/drm/lima/lima_drv.c | 7 +++ drivers/gpu/drm/lima/lima_gp.c | 21 +++++++-- drivers/gpu/drm/lima/lima_gp.h | 2 + drivers/gpu/drm/lima/lima_l2_cache.c | 37 +++++++++++---- drivers/gpu/drm/lima/lima_l2_cache.h | 2 + drivers/gpu/drm/lima/lima_mmu.c | 45 +++++++++++++----- drivers/gpu/drm/lima/lima_mmu.h | 2 + drivers/gpu/drm/lima/lima_pmu.c | 68 ++++++++++++++++++++++++++- drivers/gpu/drm/lima/lima_pmu.h | 2 + drivers/gpu/drm/lima/lima_pp.c | 31 +++++++++++-- drivers/gpu/drm/lima/lima_pp.h | 4 ++ 19 files changed, 332 insertions(+), 36 deletions(-)
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Qiang Yu
maintainerPATCH 1/4 drm/lima: add lima_devfreq_resume/suspend
Used for device resume/suspend in the following commits.
--- drivers/gpu/drm/lima/lima_devfreq.c | 24 ++++++++++++++++++++++++ drivers/gpu/drm/lima/lima_devfreq.h | 3 +++ 2 files changed, 27 insertions(+)
drivers/gpu/drm/lima/lima_devfreq.c +24 -0
@@ -232,3 +232,27 @@ void lima_devfreq_record_idle(struct lima_devfreq *devfreq)spin_unlock_irqrestore (&devfreq->lock, irqflags); } + +int lima_devfreq_resume (struct lima_devfreq *devfreq) +{ +unsigned long irqflags; + +if (!devfreq->devfreq) +return 0 ; + +spin_lock_irqsave (&devfreq->lock, irqflags); + +lima_devfreq_reset (devfreq); + +spin_unlock_irqrestore (&devfreq->lock, irqflags); + +return devfreq_resume_device (devfreq->devfreq); +} + +int lima_devfreq_suspend (struct lima_devfreq *devfreq) +{ +if (!devfreq->devfreq) +return 0 ; + +return devfreq_suspend_device (devfreq->devfreq); +}
drivers/gpu/drm/lima/lima_devfreq.h +3 -0
@@ -38,4 +38,7 @@ void lima_devfreq_fini(struct lima_device *ldev);void lima_devfreq_record_busy (struct lima_devfreq *devfreq);void lima_devfreq_record_idle (struct lima_devfreq *devfreq); +int lima_devfreq_resume (struct lima_devfreq *devfreq); +int lima_devfreq_suspend (struct lima_devfreq *devfreq); +#endif
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Qiang Yu
maintainerPATCH 2/4 drm/lima: power down ip blocks when pmu exit
In reply to Qiang YuPrepare resume/suspend PM.
--- drivers/gpu/drm/lima/lima_device.h | 2 ++ drivers/gpu/drm/lima/lima_pmu.c | 43 ++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+)
drivers/gpu/drm/lima/lima_device.h +2 -0
@@ -64,6 +64,8 @@ struct lima_ip {bool async_reset;/* l2 cache */ spinlock_t lock; +/* pmu */ +u32 mask; } data; };
drivers/gpu/drm/lima/lima_pmu.c +43 -0
54 lines not on this page · raw message
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Qiang Yu
maintainerPATCH 3/4 drm/lima: add resume/suspend callback for each ip
In reply to Qiang YuFor called when PM do resume/suspend.
--- drivers/gpu/drm/lima/lima_bcast.c | 25 ++++++++++++---- drivers/gpu/drm/lima/lima_bcast.h | 2 ++ drivers/gpu/drm/lima/lima_device.c | 4 +++ drivers/gpu/drm/lima/lima_device.h | 2 +- drivers/gpu/drm/lima/lima_dlbu.c | 17 ++++++++++- drivers/gpu/drm/lima/lima_dlbu.h | 2 ++ drivers/gpu/drm/lima/lima_gp.c | 21 +++++++++++-- drivers/gpu/drm/lima/lima_gp.h | 2 ++ drivers/gpu/drm/lima/lima_l2_cache.c | 37 ++++++++++++++++------- drivers/gpu/drm/lima/lima_l2_cache.h | 2 ++ drivers/gpu/drm/lima/lima_mmu.c | 45 ++++++++++++++++++++-------- drivers/gpu/drm/lima/lima_mmu.h | 2 ++ drivers/gpu/drm/lima/lima_pmu.c | 25 ++++++++++++++-- drivers/gpu/drm/lima/lima_pmu.h | 2 ++ drivers/gpu/drm/lima/lima_pp.c | 31 +++++++++++++++++-- drivers/gpu/drm/lima/lima_pp.h | 4 +++ 16 files changed, 186 insertions(+), 37 deletions(-)
drivers/gpu/drm/lima/lima_bcast.c +20 -5
@@ -26,18 +26,33 @@ void lima_bcast_enable(struct lima_device *dev, int num_pp)bcast_write (LIMA_BCAST_BROADCAST_MASK , mask); } +static int lima_bcast_hw_init (struct lima_ip *ip) +{ +bcast_write (LIMA_BCAST_BROADCAST_MASK , ip->data.mask <<16 ); +bcast_write (LIMA_BCAST_INTERRUPT_MASK , ip->data.mask); +return 0 ; +} + +int lima_bcast_resume (struct lima_ip *ip) +{ +return lima_bcast_hw_init (ip); +} + +void lima_bcast_suspend (struct lima_ip *ip) +{ + +} +int lima_bcast_init (struct lima_ip *ip) { -int i, mask =0 ; +int i;for (i = lima_ip_pp0; i <= lima_ip_pp7; i++) {if (ip->dev->ip[i].present) - mask |=1 << (i - lima_ip_pp0); + ip->data.mask |=1 << (i - lima_ip_pp0); } -bcast_write (LIMA_BCAST_BROADCAST_MASK , mask <<16 ); -bcast_write (LIMA_BCAST_INTERRUPT_MASK , mask); -return 0 ; +return lima_bcast_hw_init (ip); }void lima_bcast_fini (struct lima_ip *ip)
drivers/gpu/drm/lima/lima_bcast.h +2 -0
@@ -6,6 +6,8 @@struct lima_ip ; +int lima_bcast_resume (struct lima_ip *ip); +void lima_bcast_suspend (struct lima_ip *ip);int lima_bcast_init (struct lima_ip *ip);void lima_bcast_fini (struct lima_ip *ip);
drivers/gpu/drm/lima/lima_device.c +4 -0
@@ -25,6 +25,8 @@ struct lima_ip_desc {int (*init)(struct lima_ip *ip);void (*fini)(struct lima_ip *ip); +int (*resume)(struct lima_ip *ip); +void (*suspend)(struct lima_ip *ip); };#define LIMA_IP_DESC (ipname, mst0, mst1, off0, off1, func, irq) \
@@ -41,6 +43,8 @@ struct lima_ip_desc { }, \ .init = lima_##func##_init, \ .fini = lima_##func##_fini, \ + .resume = lima_##func##_resume, \ + .suspend = lima_##func##_suspend, \ }static struct lima_ip_desc lima_ip_desc[lima_ip_num] = {
drivers/gpu/drm/lima/lima_device.h +1 -1
@@ -64,7 +64,7 @@ struct lima_ip {bool async_reset;/* l2 cache */ spinlock_t lock; -/* pmu */ +/* pmu/bcast */ u32 mask; } data; };
drivers/gpu/drm/lima/lima_dlbu.c +16 -1
@@ -42,7 +42,7 @@ void lima_dlbu_set_reg(struct lima_ip *ip, u32 *reg)dlbu_write (LIMA_DLBU_START_TILE_POS , reg[3 ]); } -int lima_dlbu_init (struct lima_ip *ip) +static int lima_dlbu_hw_init (struct lima_ip *ip) {struct lima_device *dev = ip->dev;
@@ -52,6 +52,21 @@ int lima_dlbu_init(struct lima_ip *ip)return 0 ; } +int lima_dlbu_resume (struct lima_ip *ip) +{ +return lima_dlbu_hw_init (ip); +} + +void lima_dlbu_suspend (struct lima_ip *ip) +{ + +} + +int lima_dlbu_init (struct lima_ip *ip) +{ +return lima_dlbu_hw_init (ip); +} +void lima_dlbu_fini (struct lima_ip *ip) {
drivers/gpu/drm/lima/lima_dlbu.h +2 -0
@@ -12,6 +12,8 @@ void lima_dlbu_disable(struct lima_device *dev);void lima_dlbu_set_reg (struct lima_ip *ip,u32 *reg); +int lima_dlbu_resume (struct lima_ip *ip); +void lima_dlbu_suspend (struct lima_ip *ip);int lima_dlbu_init (struct lima_ip *ip);void lima_dlbu_fini (struct lima_ip *ip);
drivers/gpu/drm/lima/lima_gp.c +18 -3
@@ -274,6 +274,23 @@ static void lima_gp_print_version(struct lima_ip *ip)static struct kmem_cache *lima_gp_task_slab;static int lima_gp_task_slab_refcnt; +static int lima_gp_hw_init (struct lima_ip *ip) +{ + ip->data.async_reset = false; +lima_gp_soft_reset_async (ip); +return lima_gp_soft_reset_async_wait (ip); +} + +int lima_gp_resume (struct lima_ip *ip) +{ +return lima_gp_hw_init (ip); +} + +void lima_gp_suspend (struct lima_ip *ip) +{ + +} +int lima_gp_init (struct lima_ip *ip) {struct lima_device *dev = ip->dev;
@@ -281,9 +298,7 @@ int lima_gp_init(struct lima_ip *ip)lima_gp_print_version (ip); - ip->data.async_reset = false; -lima_gp_soft_reset_async (ip); - err =lima_gp_soft_reset_async_wait (ip); + err =lima_gp_hw_init (ip);if (err)return err;
drivers/gpu/drm/lima/lima_gp.h +2 -0
@@ -7,6 +7,8 @@struct lima_ip ;struct lima_device ; +int lima_gp_resume (struct lima_ip *ip); +void lima_gp_suspend (struct lima_ip *ip);int lima_gp_init (struct lima_ip *ip);void lima_gp_fini (struct lima_ip *ip);
drivers/gpu/drm/lima/lima_l2_cache.c +27 -10
@@ -38,9 +38,34 @@ int lima_l2_cache_flush(struct lima_ip *ip)return ret; } +static int lima_l2_cache_hw_init (struct lima_ip *ip) +{ +int err; + + err =lima_l2_cache_flush (ip); +if (err) +return err; + +l2_cache_write (LIMA_L2_CACHE_ENABLE , +LIMA_L2_CACHE_ENABLE_ACCESS |LIMA_L2_CACHE_ENABLE_READ_ALLOCATE ); +l2_cache_write (LIMA_L2_CACHE_MAX_READS ,0x1c ); + +return 0 ; +} + +int lima_l2_cache_resume (struct lima_ip *ip) +{ +return lima_l2_cache_hw_init (ip); +} + +void lima_l2_cache_suspend (struct lima_ip *ip) +{ + +} +int lima_l2_cache_init (struct lima_ip *ip) { -int i, err; +int i;u32 size;struct lima_device *dev = ip->dev;
@@ -63,15 +88,7 @@ int lima_l2_cache_init(struct lima_ip *ip)1 << (size &0xff ), 1 << ((size >> 24) & 0xff)); - err =lima_l2_cache_flush (ip); -if (err) -return err; - -l2_cache_write (LIMA_L2_CACHE_ENABLE , -LIMA_L2_CACHE_ENABLE_ACCESS |LIMA_L2_CACHE_ENABLE_READ_ALLOCATE ); -l2_cache_write (LIMA_L2_CACHE_MAX_READS ,0x1c ); - -return 0 ; +return lima_l2_cache_hw_init (ip); }void lima_l2_cache_fini (struct lima_ip *ip)
drivers/gpu/drm/lima/lima_l2_cache.h +2 -0
@@ -6,6 +6,8 @@struct lima_ip ; +int lima_l2_cache_resume (struct lima_ip *ip); +void lima_l2_cache_suspend (struct lima_ip *ip);int lima_l2_cache_init (struct lima_ip *ip);void lima_l2_cache_fini (struct lima_ip *ip);
drivers/gpu/drm/lima/lima_mmu.c +33 -12
68 lines not on this page · raw message
drivers/gpu/drm/lima/lima_mmu.h +2 -0
@@ -7,6 +7,8 @@struct lima_ip ;struct lima_vm ; +int lima_mmu_resume (struct lima_ip *ip); +void lima_mmu_suspend (struct lima_ip *ip);int lima_mmu_init (struct lima_ip *ip);void lima_mmu_fini (struct lima_ip *ip);
drivers/gpu/drm/lima/lima_pmu.c +23 -2
@@ -63,7 +63,7 @@ static u32 lima_pmu_get_ip_mask(struct lima_ip *ip)return ret; } -int lima_pmu_init (struct lima_ip *ip) +static int lima_pmu_hw_init (struct lima_ip *ip) {int err;u32 stat;
@@ -88,7 +88,7 @@ int lima_pmu_init(struct lima_ip *ip)return 0 ; } -void lima_pmu_fini (struct lima_ip *ip) +static void lima_pmu_hw_fini (struct lima_ip *ip) {u32 stat;
@@ -101,3 +101,24 @@ void lima_pmu_fini(struct lima_ip *ip)lima_pmu_wait_cmd (ip); } } + +int lima_pmu_resume (struct lima_ip *ip) +{ +return lima_pmu_hw_init (ip); +} + +void lima_pmu_suspend (struct lima_ip *ip) +{ +lima_pmu_hw_fini (ip); +} + + +int lima_pmu_init (struct lima_ip *ip) +{ +return lima_pmu_hw_init (ip); +} + +void lima_pmu_fini (struct lima_ip *ip) +{ +lima_pmu_hw_fini (ip); +}
drivers/gpu/drm/lima/lima_pmu.h +2 -0
@@ -6,6 +6,8 @@struct lima_ip ; +int lima_pmu_resume (struct lima_ip *ip); +void lima_pmu_suspend (struct lima_ip *ip);int lima_pmu_init (struct lima_ip *ip);void lima_pmu_fini (struct lima_ip *ip);
drivers/gpu/drm/lima/lima_pp.c +28 -3
@@ -223,6 +223,23 @@ static void lima_pp_print_version(struct lima_ip *ip) lima_ip_name(ip), name, major, minor); } +static int lima_pp_hw_init (struct lima_ip *ip) +{ + ip->data.async_reset = false; +lima_pp_soft_reset_async (ip); +return lima_pp_soft_reset_async_wait (ip); +} + +int lima_pp_resume (struct lima_ip *ip) +{ +return lima_pp_hw_init (ip); +} + +void lima_pp_suspend (struct lima_ip *ip) +{ + +} +int lima_pp_init (struct lima_ip *ip) {struct lima_device *dev = ip->dev;
@@ -230,9 +247,7 @@ int lima_pp_init(struct lima_ip *ip)lima_pp_print_version (ip); - ip->data.async_reset = false; -lima_pp_soft_reset_async (ip); - err =lima_pp_soft_reset_async_wait (ip); + err =lima_pp_hw_init (ip);if (err)return err;
@@ -254,6 +269,16 @@ void lima_pp_fini(struct lima_ip *ip) } +int lima_pp_bcast_resume (struct lima_ip *ip) +{ +return 0 ; +} + +void lima_pp_bcast_suspend (struct lima_ip *ip) +{ + +} +int lima_pp_bcast_init (struct lima_ip *ip) {struct lima_device *dev = ip->dev;
drivers/gpu/drm/lima/lima_pp.h +4 -0
@@ -7,9 +7,13 @@struct lima_ip ;struct lima_device ; +int lima_pp_resume (struct lima_ip *ip); +void lima_pp_suspend (struct lima_ip *ip);int lima_pp_init (struct lima_ip *ip);void lima_pp_fini (struct lima_ip *ip); +int lima_pp_bcast_resume (struct lima_ip *ip); +void lima_pp_bcast_suspend (struct lima_ip *ip);int lima_pp_bcast_init (struct lima_ip *ip);void lima_pp_bcast_fini (struct lima_ip *ip);
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Qiang Yu
maintainerPATCH 4/4 drm/lima: add pm resume/suspend
In reply to Qiang YuDo hardware resume/suspend.
--- drivers/gpu/drm/lima/lima_device.c | 65 ++++++++++++++++++++++++++++++ drivers/gpu/drm/lima/lima_device.h | 3 ++ drivers/gpu/drm/lima/lima_drv.c | 7 ++++ 3 files changed, 75 insertions(+)
drivers/gpu/drm/lima/lima_device.c +65 -0
@@ -213,6 +213,27 @@ static void lima_fini_ip(struct lima_device *ldev, int index) desc->fini (ip); } +static int lima_resume_ip (struct lima_device *ldev,int index) +{ +struct lima_ip_desc *desc = lima_ip_desc + index; +struct lima_ip *ip = ldev->ip + index; +int ret =0 ; + +if (ip->present) + ret = desc->resume (ip); + +return ret; +} + +static void lima_suspend_ip (struct lima_device *ldev,int index) +{ +struct lima_ip_desc *desc = lima_ip_desc + index; +struct lima_ip *ip = ldev->ip + index; + +if (ip->present) + desc->suspend (ip); +} +static int lima_init_gp_pipe (struct lima_device *dev) {struct lima_sched_pipe *pipe = dev->pipe + lima_pipe_gp;
@@ -408,3 +429,47 @@ void lima_device_fini(struct lima_device *ldev)lima_clk_fini (ldev); } + +int lima_device_resume (struct device *dev) +{ +struct lima_device *ldev =dev_get_drvdata (dev); +int i, err; + +for (i =0 ; i < lima_ip_num; i++) { + err =lima_resume_ip (ldev, i); +if (err) + goto err_out; + } + + err =lima_devfreq_resume (&ldev->devfreq); +if (err) + goto err_out; + +return 0 ; + +err_out: +while (--i >=0 ) +lima_suspend_ip (ldev, i); +return err; +} + +int lima_device_suspend (struct device *dev) +{ +struct lima_device *ldev =dev_get_drvdata (dev); +int i, err; + +/* check any task running */ +for (i =0 ; i < lima_pipe_num; i++) { +if (atomic_read (&ldev->pipe[i].base.hw_rq_count)) +return -EBUSY ; + } + + err =lima_devfreq_suspend (&ldev->devfreq); +if (err) +return err; + +for (i = lima_ip_num -1 ; i >=0 ; i--) +lima_suspend_ip (ldev, i); + +return 0 ; +}
drivers/gpu/drm/lima/lima_device.h +3 -0
@@ -141,4 +141,7 @@ static inline int lima_poll_timeout(struct lima_ip *ip, lima_poll_func_t func, return 0; } +int lima_device_suspend (struct device *dev); +int lima_device_resume (struct device *dev); +#endif
drivers/gpu/drm/lima/lima_drv.c +7 -0
@@ -5,6 +5,7 @@#include <linux/of_platform.h> #include <linux/uaccess.h> #include <linux/slab.h> +#include <linux/pm_runtime.h> #include <drm/drm_ioctl.h> #include <drm/drm_drv.h> #include <drm/drm_prime.h>
@@ -452,11 +453,17 @@ static const struct of_device_id dt_match[] = { };MODULE_DEVICE_TABLE (of, dt_match); +static const struct dev_pm_ops lima_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume) +SET_RUNTIME_PM_OPS (lima_device_suspend, lima_device_resume,NULL ) +}; +static struct platform_driver lima_platform_driver = { .probe = lima_pdev_probe, .remove = lima_pdev_remove, .driver = { .name ="lima" , + .pm = &lima_pm_ops, .of_match_table = dt_match, }, };
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel