leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/tegra: vic: Skip stream ID programming without IOMMU

Browse Source 
If VIC is not behind an IOMMU, don't touch any of the registers related
to stream ID programming.

Signed-off-by: Thierry Reding <treding@nvidia.com>
This commit is contained in:
Thierry Reding 2019-02-08 13:09:49 +01:00
parent 0301196b57
commit dd631e8ac9
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/tegra/vic.c
View File

@ -97,6 +97,9 @@ static int vic_runtime_suspend(struct device *dev)
static int vic_boot(struct vic *vic) static int vic_boot(struct vic *vic)
{ {
#ifdef CONFIG_IOMMU_API
struct iommu_fwspec *spec = dev_iommu_fwspec_get(vic->dev);
#endif
u32 fce_ucode_size, fce_bin_data_offset; u32 fce_ucode_size, fce_bin_data_offset;
void *hdr; void *hdr;
int err = 0; int err = 0;
@ -105,15 +108,14 @@ static int vic_boot(struct vic *vic)
return 0; return 0;
#ifdef CONFIG_IOMMU_API #ifdef CONFIG_IOMMU_API
if (vic->config->supports_sid) { if (vic->config->supports_sid && spec) {
struct iommu_fwspec *spec = dev_iommu_fwspec_get(vic->dev);
u32 value; u32 value;
value = TRANSCFG_ATT(1, TRANSCFG_SID_FALCON) | value = TRANSCFG_ATT(1, TRANSCFG_SID_FALCON) |
TRANSCFG_ATT(0, TRANSCFG_SID_HW); TRANSCFG_ATT(0, TRANSCFG_SID_HW);
vic_writel(vic, value, VIC_TFBIF_TRANSCFG); vic_writel(vic, value, VIC_TFBIF_TRANSCFG);
if (spec && spec->num_ids > 0) { if (spec->num_ids > 0) {
value = spec->ids[0] & 0xffff; value = spec->ids[0] & 0xffff;
vic_writel(vic, value, VIC_THI_STREAMID0); vic_writel(vic, value, VIC_THI_STREAMID0);