Skip to content

Commit 8f5264d

Browse files
committed
drm/msm/adreno: Remove MODULE_FIRMWARE()'s
The driver handles the case where gpu fw is not in the initrd. OTOH it doesn't always handle the case where _some_ fw is in the initrd, but others are not. In particular the zap fw tends to be signed with an OEM specific key, so the paths/names differ across devices with the same SoC/GPU, so we cannot sanely list them with MODULE_FIRMWARE(). So MODULE_FIRMWARE() just ends up causing problems without actually solving anything. Remove them! Signed-off-by: Rob Clark <robdclark@chromium.org> Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com> Patchwork: https://patchwork.freedesktop.org/patch/652195/
1 parent 5a9c1be commit 8f5264d

5 files changed

Lines changed: 0 additions & 33 deletions

File tree

drivers/gpu/drm/msm/adreno/a2xx_catalog.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,3 @@ static const struct adreno_info a2xx_gpus[] = {
4545
}
4646
};
4747
DECLARE_ADRENO_GPULIST(a2xx);
48-
49-
MODULE_FIRMWARE("qcom/leia_pfp_470.fw");
50-
MODULE_FIRMWARE("qcom/leia_pm4_470.fw");
51-
MODULE_FIRMWARE("qcom/yamato_pfp.fw");
52-
MODULE_FIRMWARE("qcom/yamato_pm4.fw");

drivers/gpu/drm/msm/adreno/a3xx_catalog.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,3 @@ static const struct adreno_info a3xx_gpus[] = {
8585
}
8686
};
8787
DECLARE_ADRENO_GPULIST(a3xx);
88-
89-
MODULE_FIRMWARE("qcom/a300_pm4.fw");
90-
MODULE_FIRMWARE("qcom/a300_pfp.fw");
91-
MODULE_FIRMWARE("qcom/a330_pm4.fw");
92-
MODULE_FIRMWARE("qcom/a330_pfp.fw");

drivers/gpu/drm/msm/adreno/a4xx_catalog.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,3 @@ static const struct adreno_info a4xx_gpus[] = {
4545
}
4646
};
4747
DECLARE_ADRENO_GPULIST(a4xx);
48-
49-
MODULE_FIRMWARE("qcom/a420_pm4.fw");
50-
MODULE_FIRMWARE("qcom/a420_pfp.fw");

drivers/gpu/drm/msm/adreno/a5xx_catalog.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -150,12 +150,3 @@ static const struct adreno_info a5xx_gpus[] = {
150150
}
151151
};
152152
DECLARE_ADRENO_GPULIST(a5xx);
153-
154-
MODULE_FIRMWARE("qcom/a530_pm4.fw");
155-
MODULE_FIRMWARE("qcom/a530_pfp.fw");
156-
MODULE_FIRMWARE("qcom/a530v3_gpmu.fw2");
157-
MODULE_FIRMWARE("qcom/a530_zap.mdt");
158-
MODULE_FIRMWARE("qcom/a530_zap.b00");
159-
MODULE_FIRMWARE("qcom/a530_zap.b01");
160-
MODULE_FIRMWARE("qcom/a530_zap.b02");
161-
MODULE_FIRMWARE("qcom/a540_gpmu.fw2");

drivers/gpu/drm/msm/adreno/a6xx_catalog.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,17 +1093,6 @@ static const struct adreno_info a6xx_gpus[] = {
10931093
};
10941094
DECLARE_ADRENO_GPULIST(a6xx);
10951095

1096-
MODULE_FIRMWARE("qcom/a615_zap.mbn");
1097-
MODULE_FIRMWARE("qcom/a619_gmu.bin");
1098-
MODULE_FIRMWARE("qcom/a630_sqe.fw");
1099-
MODULE_FIRMWARE("qcom/a630_gmu.bin");
1100-
MODULE_FIRMWARE("qcom/a630_zap.mbn");
1101-
MODULE_FIRMWARE("qcom/a640_gmu.bin");
1102-
MODULE_FIRMWARE("qcom/a650_gmu.bin");
1103-
MODULE_FIRMWARE("qcom/a650_sqe.fw");
1104-
MODULE_FIRMWARE("qcom/a660_gmu.bin");
1105-
MODULE_FIRMWARE("qcom/a660_sqe.fw");
1106-
11071096
static const struct adreno_reglist a702_hwcg[] = {
11081097
{ REG_A6XX_RBBM_CLOCK_CNTL_SP0, 0x22222222 },
11091098
{ REG_A6XX_RBBM_CLOCK_CNTL2_SP0, 0x02222220 },

0 commit comments

Comments
 (0)