[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20201230152944.3635488-1-iskren.chernev@gmail.com>
Date: Wed, 30 Dec 2020 17:29:42 +0200
From: Iskren Chernev <iskren.chernev@...il.com>
To: Rob Clark <robdclark@...il.com>
Cc: Akhil P Oommen <akhilpo@...eaurora.org>,
Bjorn Andersson <bjorn.andersson@...aro.org>,
Brian Masney <masneyb@...tation.org>,
Daniel Vetter <daniel@...ll.ch>,
David Airlie <airlied@...ux.ie>,
dri-devel@...ts.freedesktop.org, freedreno@...ts.freedesktop.org,
Iskren Chernev <iskren.chernev@...il.com>,
Jonathan Marek <jonathan@...ek.ca>,
Jordan Crouse <jcrouse@...eaurora.org>,
linux-arm-msm@...r.kernel.org, linux-kernel@...r.kernel.org,
Sean Paul <sean@...rly.run>,
Sharat Masetty <smasetty@...eaurora.org>,
Shawn Guo <shawn.guo@...aro.org>,
Wambui Karuga <wambui.karugax@...il.com>,
~postmarketos/upstreaming@...ts.sr.ht,
Craig Tatlor <ctatlor97@...il.com>
Subject: [PATCH 1/2] drm/msm: Call msm_init_vram before binding the gpu
From: Craig Tatlor <ctatlor97@...il.com>
vram.size is needed when binding a gpu without an iommu and is defined
in msm_init_vram(), so run that before binding it.
Signed-off-by: Craig Tatlor <ctatlor97@...il.com>
---
drivers/gpu/drm/msm/msm_drv.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index 535a0263ceeb4..108c405e03dd9 100644
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -457,14 +457,14 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv)
drm_mode_config_init(ddev);
- /* Bind all our sub-components: */
- ret = component_bind_all(dev, ddev);
+ ret = msm_init_vram(ddev);
if (ret)
goto err_destroy_mdss;
- ret = msm_init_vram(ddev);
+ /* Bind all our sub-components: */
+ ret = component_bind_all(dev, ddev);
if (ret)
- goto err_msm_uninit;
+ goto err_destroy_mdss;
dma_set_max_seg_size(dev, UINT_MAX);
base-commit: d7a03a44a5e93f39ece70ec75d25c6088caa0fdb
prerequisite-patch-id: aba6f684932cab35d98457c21e4ff7a5ac75c753
prerequisite-patch-id: 4884d57df1bd197896b69e115d9002d6c26ae2e2
--
2.29.2
Powered by blists - more mailing lists