Merge tag 'drm/tegra/for-5.1-rc2' of git://anongit.freedesktop.org/tegra/linux into drm-fixes

airlied · airlied · commit b23b52b6720e · 2019-03-25T09:29:42.000+10:00
drm/tegra: Fixes for v5.1-rc2 These are a couple of minor fixes for build issues and sparse warnings. Signed-off-by: Dave Airlie <airlied@redhat.com> From: Thierry Reding <thierry.reding@gmail.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190322131517.825-1-thierry.reding@gmail.com
diff --git a/drivers/gpu/drm/tegra/hub.c b/drivers/gpu/drm/tegra/hub.c
@@ -378,14 +378,16 @@ static int tegra_shared_plane_atomic_check(struct drm_plane *plane,
 static void tegra_shared_plane_atomic_disable(struct drm_plane *plane,
 					      struct drm_plane_state *old_state)
 {
-	struct tegra_dc *dc = to_tegra_dc(old_state->crtc);
 	struct tegra_plane *p = to_tegra_plane(plane);
+	struct tegra_dc *dc;
 	u32 value;
 
 	/* rien ne va plus */
 	if (!old_state || !old_state->crtc)
 		return;
 
+	dc = to_tegra_dc(old_state->crtc);
+
 	/*
 	 * XXX Legacy helpers seem to sometimes call ->atomic_disable() even
 	 * on planes that are already disabled. Make sure we fallback to the
diff --git a/drivers/gpu/drm/tegra/vic.c b/drivers/gpu/drm/tegra/vic.c
@@ -106,6 +106,7 @@ static int vic_boot(struct vic *vic)
 	if (vic->booted)
 		return 0;
 
+#ifdef CONFIG_IOMMU_API
 	if (vic->config->supports_sid) {
 		struct iommu_fwspec *spec = dev_iommu_fwspec_get(vic->dev);
 		u32 value;
@@ -121,6 +122,7 @@ static int vic_boot(struct vic *vic)
 			vic_writel(vic, value, VIC_THI_STREAMID1);
 		}
 	}
+#endif
 
 	/* setup clockgating registers */
 	vic_writel(vic, CG_IDLE_CG_DLY_CNT(4) |

Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,7 @@ static int vic_boot(struct vic *vic)`
`106`	`106`	`if (vic->booted)`
`107`	`107`	`return 0;`
`108`	`108`
	`109`	`+#ifdef CONFIG_IOMMU_API`
`109`	`110`	`if (vic->config->supports_sid) {`
`110`	`111`	`struct iommu_fwspec *spec = dev_iommu_fwspec_get(vic->dev);`
`111`	`112`	`u32 value;`
`@@ -121,6 +122,7 @@ static int vic_boot(struct vic *vic)`
`121`	`122`	`vic_writel(vic, value, VIC_THI_STREAMID1);`
`122`	`123`	`}`
`123`	`124`	`}`
	`125`	`+#endif`
`124`	`126`
`125`	`127`	`/* setup clockgating registers */`
`126`	`128`	`vic_writel(vic, CG_IDLE_CG_DLY_CNT(4) \|`