From: Rob Clark Date: Sun, 30 Jun 2019 13:14:42 +0000 (-0700) Subject: drm/msm/dpu: remove dpu_mdss:hwversion X-Git-Tag: v5.4-rc1~106^2~3^2~25 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1569fcd7555e03084eae670721cd8afe60a53211;p=thirdparty%2Fkernel%2Flinux.git drm/msm/dpu: remove dpu_mdss:hwversion Unused and the extra rpm get/put interferes with handover from bootloader (ie. happens before we have a chance to check if things are already enabled). Signed-off-by: Rob Clark Reviewed-by: Jordan Crouse Signed-off-by: Rob Clark --- diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c index c977baddfffd0..29705e773a4b7 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c @@ -26,7 +26,6 @@ struct dpu_mdss { struct msm_mdss base; void __iomem *mmio; unsigned long mmio_len; - u32 hwversion; struct dss_module_power mp; struct dpu_irq_controller irq_controller; struct icc_path *path[2]; @@ -291,10 +290,6 @@ int dpu_mdss_init(struct drm_device *dev) dpu_mdss_icc_request_bw(priv->mdss); - pm_runtime_get_sync(dev->dev); - dpu_mdss->hwversion = readl_relaxed(dpu_mdss->mmio); - pm_runtime_put_sync(dev->dev); - return ret; irq_error: