diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-10-14 00:25:51 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-10-14 00:31:53 +0300 |
| commit | 640eee067d9aae0bb98d8706001976ff1affaf00 (patch) | |
| tree | 4ea2fcb8f8eab1d8a39e97b24bac20d79043e0fe /drivers/gpu/drm/panfrost | |
| parent | 0d2e90f47c4f80a5dcf10f5fe57b5e692e62b48f (diff) | |
| parent | d3c8f2784d3266d27956659c78835ee1d1925ad2 (diff) | |
| download | linux-640eee067d9aae0bb98d8706001976ff1affaf00.tar.xz | |
Merge tag 'drm-misc-next-fixes-2020-10-13' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
One fix for a bad revert in ingenic-drm, and one fix for panfrost to increase a timeout at power up.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20201013065709.lwjw3fthoxwsbqsl@gilmour.lan
Diffstat (limited to 'drivers/gpu/drm/panfrost')
| -rw-r--r-- | drivers/gpu/drm/panfrost/panfrost_gpu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/panfrost/panfrost_gpu.c b/drivers/gpu/drm/panfrost/panfrost_gpu.c index e1b2a3376624..2aae636f1cf5 100644 --- a/drivers/gpu/drm/panfrost/panfrost_gpu.c +++ b/drivers/gpu/drm/panfrost/panfrost_gpu.c @@ -325,13 +325,13 @@ void panfrost_gpu_power_on(struct panfrost_device *pfdev) /* Just turn on everything for now */ gpu_write(pfdev, L2_PWRON_LO, pfdev->features.l2_present); ret = readl_relaxed_poll_timeout(pfdev->iomem + L2_READY_LO, - val, val == pfdev->features.l2_present, 100, 1000); + val, val == pfdev->features.l2_present, 100, 20000); if (ret) dev_err(pfdev->dev, "error powering up gpu L2"); gpu_write(pfdev, SHADER_PWRON_LO, pfdev->features.shader_present); ret = readl_relaxed_poll_timeout(pfdev->iomem + SHADER_READY_LO, - val, val == pfdev->features.shader_present, 100, 1000); + val, val == pfdev->features.shader_present, 100, 20000); if (ret) dev_err(pfdev->dev, "error powering up gpu shader"); |