Add support for "Adreno 8c Gen 3" gpu along with the necessary speedbin support.
Signed-off-by: Akhil P Oommen quic_akhilpo@quicinc.com ---
drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 21 +++++++++++++++++---- drivers/gpu/drm/msm/adreno/adreno_device.c | 29 ++++++++++++++++++++++++++--- drivers/gpu/drm/msm/adreno/adreno_gpu.h | 10 ++++++++-- 3 files changed, 51 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c index 51b8377..9268ce3 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -10,7 +10,6 @@
#include <linux/bitfield.h> #include <linux/devfreq.h> -#include <linux/nvmem-consumer.h> #include <linux/soc/qcom/llcc-qcom.h>
#define GPU_PAS_ID 13 @@ -1734,6 +1733,18 @@ static u32 a618_get_speed_bin(u32 fuse) return UINT_MAX; }
+static u32 adreno_7c3_get_speed_bin(u32 fuse) +{ + if (fuse == 0) + return 0; + else if (fuse == 117) + return 0; + else if (fuse == 190) + return 1; + + return UINT_MAX; +} + static u32 fuse_to_supp_hw(struct device *dev, struct adreno_rev rev, u32 fuse) { u32 val = UINT_MAX; @@ -1741,6 +1752,9 @@ static u32 fuse_to_supp_hw(struct device *dev, struct adreno_rev rev, u32 fuse) if (adreno_cmp_rev(ADRENO_REV(6, 1, 8, ANY_ID), rev)) val = a618_get_speed_bin(fuse);
+ if (adreno_cmp_rev(ADRENO_REV(6, 3, 5, ANY_ID), rev)) + val = adreno_7c3_get_speed_bin(fuse); + if (val == UINT_MAX) { DRM_DEV_ERROR(dev, "missing support for speed-bin: %u. Some OPPs may not be supported by hardware", @@ -1753,11 +1767,10 @@ static u32 fuse_to_supp_hw(struct device *dev, struct adreno_rev rev, u32 fuse)
static int a6xx_set_supported_hw(struct device *dev, struct adreno_rev rev) { - u32 supp_hw = UINT_MAX; - u32 speedbin; + u32 speedbin, supp_hw = UINT_MAX; int ret;
- ret = nvmem_cell_read_variable_le_u32(dev, "speed_bin", &speedbin); + ret = adreno_read_speedbin(dev, &speedbin); /* * -ENOENT means that the platform doesn't support speedbin which is * fine diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c index 9300583..f35c631 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_device.c +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c @@ -6,6 +6,7 @@ * Copyright (c) 2014,2017 The Linux Foundation. All rights reserved. */
+#include <linux/nvmem-consumer.h> #include "adreno_gpu.h"
bool hang_debug = false; @@ -317,6 +318,17 @@ static const struct adreno_info gpulist[] = { .zapfw = "a660_zap.mdt", .hwcg = a660_hwcg, }, { + .rev = ADRENO_REV_SKU(6, 3, 5, ANY_ID, 190), + .name = "Adreno 8c Gen 3", + .fw = { + [ADRENO_FW_SQE] = "a660_sqe.fw", + [ADRENO_FW_GMU] = "a660_gmu.bin", + }, + .gmem = SZ_512K, + .inactive_period = DRM_MSM_INACTIVE_PERIOD, + .init = a6xx_gpu_init, + .hwcg = a660_hwcg, + }, { .rev = ADRENO_REV(6, 3, 5, ANY_ID), .name = "Adreno 7c Gen 3", .fw = { @@ -371,7 +383,8 @@ bool adreno_cmp_rev(struct adreno_rev rev1, struct adreno_rev rev2) return _rev_match(rev1.core, rev2.core) && _rev_match(rev1.major, rev2.major) && _rev_match(rev1.minor, rev2.minor) && - _rev_match(rev1.patchid, rev2.patchid); + _rev_match(rev1.patchid, rev2.patchid) && + _rev_match(rev1.sku, rev2.sku); }
const struct adreno_info *adreno_info(struct adreno_rev rev) @@ -445,12 +458,17 @@ struct msm_gpu *adreno_load_gpu(struct drm_device *dev) return gpu; }
+int adreno_read_speedbin(struct device *dev, u32 *speedbin) +{ + return nvmem_cell_read_variable_le_u32(dev, "speed_bin", speedbin); +} + static int find_chipid(struct device *dev, struct adreno_rev *rev) { struct device_node *node = dev->of_node; const char *compat; int ret; - u32 chipid; + u32 chipid, speedbin;
/* first search the compat strings for qcom,adreno-XYZ.W: */ ret = of_property_read_string_index(node, "compatible", 0, &compat); @@ -466,7 +484,7 @@ static int find_chipid(struct device *dev, struct adreno_rev *rev) rev->minor = r; rev->patchid = patch;
- return 0; + goto done; } }
@@ -486,6 +504,11 @@ static int find_chipid(struct device *dev, struct adreno_rev *rev) dev_warn(dev, "Use compatible qcom,adreno-%u%u%u.%u instead.\n", rev->core, rev->major, rev->minor, rev->patchid);
+done: + if (adreno_read_speedbin(dev, &speedbin)) + speedbin = ANY_ID; + + rev->sku = (uint16_t) (0xffff & speedbin); return 0; }
diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/adreno/adreno_gpu.h index cffabe7..52bd93a 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h @@ -40,12 +40,16 @@ struct adreno_rev { uint8_t major; uint8_t minor; uint8_t patchid; + uint16_t sku; };
-#define ANY_ID 0xff +#define ANY_ID 0xff +#define ANY_SKU 0xffff
#define ADRENO_REV(core, major, minor, patchid) \ - ((struct adreno_rev){ core, major, minor, patchid }) + ((struct adreno_rev){ core, major, minor, patchid, ANY_SKU }) +#define ADRENO_REV_SKU(core, major, minor, patchid, sku) \ + ((struct adreno_rev){ core, major, minor, patchid, sku })
struct adreno_gpu_funcs { struct msm_gpu_funcs base; @@ -324,6 +328,8 @@ adreno_iommu_create_address_space(struct msm_gpu *gpu,
void adreno_set_llc_attributes(struct iommu_domain *iommu);
+int adreno_read_speedbin(struct device *dev, u32 *speedbin); + /* * For a5xx and a6xx targets load the zap shader that is used to pull the GPU * out of secure mode
Add the speedbin fuse and the required opps to support gpu sku.
Signed-off-by: Akhil P Oommen quic_akhilpo@quicinc.com ---
arch/arm64/boot/dts/qcom/sc7280.dtsi | 46 ++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi index 365a2e0..f8fc8b8 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -605,6 +605,11 @@ power-domains = <&rpmhpd SC7280_MX>; #address-cells = <1>; #size-cells = <1>; + + gpu_speed_bin: gpu_speed_bin@1e9 { + reg = <0x1e9 0x2>; + bits = <5 8>; + }; };
sdhc_1: sdhci@7c4000 { @@ -1762,6 +1767,9 @@ interconnect-names = "gfx-mem"; #cooling-cells = <2>;
+ nvmem-cells = <&gpu_speed_bin>; + nvmem-cell-names = "speed_bin"; + gpu_opp_table: opp-table { compatible = "operating-points-v2";
@@ -1769,18 +1777,56 @@ opp-hz = /bits/ 64 <315000000>; opp-level = <RPMH_REGULATOR_LEVEL_LOW_SVS>; opp-peak-kBps = <1804000>; + opp-supported-hw = <0x03>; };
opp-450000000 { opp-hz = /bits/ 64 <450000000>; opp-level = <RPMH_REGULATOR_LEVEL_SVS>; opp-peak-kBps = <4068000>; + opp-supported-hw = <0x03>; };
opp-550000000 { opp-hz = /bits/ 64 <550000000>; opp-level = <RPMH_REGULATOR_LEVEL_SVS_L1>; opp-peak-kBps = <6832000>; + opp-supported-hw = <0x03>; + }; + + opp-608000000 { + opp-hz = /bits/ 64 <608000000>; + opp-level = <RPMH_REGULATOR_LEVEL_SVS_L2>; + opp-peak-kBps = <8368000>; + opp-supported-hw = <0x02>; + }; + + opp-700000000 { + opp-hz = /bits/ 64 <700000000>; + opp-level = <RPMH_REGULATOR_LEVEL_NOM>; + opp-peak-kBps = <8532000>; + opp-supported-hw = <0x02>; + }; + + opp-812000000 { + opp-hz = /bits/ 64 <812000000>; + opp-level = <RPMH_REGULATOR_LEVEL_NOM_L1>; + opp-peak-kBps = <8532000>; + opp-supported-hw = <0x02>; + }; + + opp-840000000 { + opp-hz = /bits/ 64 <840000000>; + opp-level = <RPMH_REGULATOR_LEVEL_TURBO>; + opp-peak-kBps = <8532000>; + opp-supported-hw = <0x02>; + }; + + opp-900000000 { + opp-hz = /bits/ 64 <900000000>; + opp-level = <RPMH_REGULATOR_LEVEL_TURBO_L1>; + opp-peak-kBps = <8532000>; + opp-supported-hw = <0x02>; }; }; };
Expose speedbin through MSM_PARAM_CHIP_ID parameter to help userspace identify the sku.
Signed-off-by: Akhil P Oommen quic_akhilpo@quicinc.com ---
drivers/gpu/drm/msm/adreno/adreno_gpu.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c index f33cfa4..e970e6a 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -242,10 +242,11 @@ int adreno_get_param(struct msm_gpu *gpu, uint32_t param, uint64_t *value) *value = !adreno_is_a650_family(adreno_gpu) ? 0x100000 : 0; return 0; case MSM_PARAM_CHIP_ID: - *value = adreno_gpu->rev.patchid | - (adreno_gpu->rev.minor << 8) | - (adreno_gpu->rev.major << 16) | - (adreno_gpu->rev.core << 24); + *value = (uint64_t) adreno_gpu->rev.patchid | + (uint64_t) (adreno_gpu->rev.minor << 8) | + (uint64_t) (adreno_gpu->rev.major << 16) | + (uint64_t) (adreno_gpu->rev.core << 24) | + (((uint64_t) adreno_gpu->rev.sku) << 32); return 0; case MSM_PARAM_MAX_FREQ: *value = adreno_gpu->base.fast_rate;
On Tue, Jan 11, 2022 at 1:31 PM Akhil P Oommen quic_akhilpo@quicinc.com wrote:
Expose speedbin through MSM_PARAM_CHIP_ID parameter to help userspace identify the sku.
Signed-off-by: Akhil P Oommen quic_akhilpo@quicinc.com
drivers/gpu/drm/msm/adreno/adreno_gpu.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c index f33cfa4..e970e6a 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -242,10 +242,11 @@ int adreno_get_param(struct msm_gpu *gpu, uint32_t param, uint64_t *value) *value = !adreno_is_a650_family(adreno_gpu) ? 0x100000 : 0; return 0; case MSM_PARAM_CHIP_ID:
*value = adreno_gpu->rev.patchid |(adreno_gpu->rev.minor << 8) |(adreno_gpu->rev.major << 16) |(adreno_gpu->rev.core << 24);
*value = (uint64_t) adreno_gpu->rev.patchid |(uint64_t) (adreno_gpu->rev.minor << 8) |(uint64_t) (adreno_gpu->rev.major << 16) |(uint64_t) (adreno_gpu->rev.core << 24) |(((uint64_t) adreno_gpu->rev.sku) << 32);
How about this instead, so we are only changing the behavior for new/unreleased devices:
*value = adreno_gpu->rev.patchid | (adreno_gpu->rev.minor << 8) | (adreno_gpu->rev.major << 16) | (adreno_gpu->rev.core << 24); if (!adreno_gpu->info->revn) *value |= (((uint64_t) adreno_gpu->rev.sku) << 32);
(sorry about the butchered indentation.. somehow gmail has become antagonistic about pasting code)
BR, -R
return 0; case MSM_PARAM_MAX_FREQ: *value = adreno_gpu->base.fast_rate;-- 2.7.4
On Thu, 13 Jan 2022 at 00:19, Rob Clark robdclark@gmail.com wrote:
On Tue, Jan 11, 2022 at 1:31 PM Akhil P Oommen quic_akhilpo@quicinc.com wrote:
Expose speedbin through MSM_PARAM_CHIP_ID parameter to help userspace identify the sku.
Signed-off-by: Akhil P Oommen quic_akhilpo@quicinc.com
drivers/gpu/drm/msm/adreno/adreno_gpu.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c index f33cfa4..e970e6a 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -242,10 +242,11 @@ int adreno_get_param(struct msm_gpu *gpu, uint32_t param, uint64_t *value) *value = !adreno_is_a650_family(adreno_gpu) ? 0x100000 : 0; return 0; case MSM_PARAM_CHIP_ID:
*value = adreno_gpu->rev.patchid |(adreno_gpu->rev.minor << 8) |(adreno_gpu->rev.major << 16) |(adreno_gpu->rev.core << 24);
*value = (uint64_t) adreno_gpu->rev.patchid |(uint64_t) (adreno_gpu->rev.minor << 8) |(uint64_t) (adreno_gpu->rev.major << 16) |(uint64_t) (adreno_gpu->rev.core << 24) |(((uint64_t) adreno_gpu->rev.sku) << 32);How about this instead, so we are only changing the behavior for new/unreleased devices:
*value = adreno_gpu->rev.patchid | (adreno_gpu->rev.minor << 8) | (adreno_gpu->rev.major << 16) | (adreno_gpu->rev.core << 24); if (!adreno_gpu->info->revn) *value |= (((uint64_t) adreno_gpu->rev.sku) << 32);
(sorry about the butchered indentation.. somehow gmail has become antagonistic about pasting code)
I assume that you would like to keep userspace compat for older chips. thus the if. Maybe we should introduce MSM_PARAM_CHIP_ID_SKU instead (and gradually make userspace switch to it)?
BR, -R
return 0; case MSM_PARAM_MAX_FREQ: *value = adreno_gpu->base.fast_rate;-- 2.7.4
On 1/13/2022 12:43 PM, Dmitry Baryshkov wrote:
On Thu, 13 Jan 2022 at 00:19, Rob Clark robdclark@gmail.com wrote:
On Tue, Jan 11, 2022 at 1:31 PM Akhil P Oommen quic_akhilpo@quicinc.com wrote:
Expose speedbin through MSM_PARAM_CHIP_ID parameter to help userspace identify the sku.
Signed-off-by: Akhil P Oommen quic_akhilpo@quicinc.com
drivers/gpu/drm/msm/adreno/adreno_gpu.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c index f33cfa4..e970e6a 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -242,10 +242,11 @@ int adreno_get_param(struct msm_gpu *gpu, uint32_t param, uint64_t *value) *value = !adreno_is_a650_family(adreno_gpu) ? 0x100000 : 0; return 0; case MSM_PARAM_CHIP_ID:
*value = adreno_gpu->rev.patchid |(adreno_gpu->rev.minor << 8) |(adreno_gpu->rev.major << 16) |(adreno_gpu->rev.core << 24);
*value = (uint64_t) adreno_gpu->rev.patchid |(uint64_t) (adreno_gpu->rev.minor << 8) |(uint64_t) (adreno_gpu->rev.major << 16) |(uint64_t) (adreno_gpu->rev.core << 24) |(((uint64_t) adreno_gpu->rev.sku) << 32);How about this instead, so we are only changing the behavior for new/unreleased devices:
I thought this property was only used for new devices whereas the existing devices rely on REVN.
-Akhil.
*value = adreno_gpu->rev.patchid | (adreno_gpu->rev.minor << 8) | (adreno_gpu->rev.major << 16) | (adreno_gpu->rev.core << 24); if (!adreno_gpu->info->revn) *value |= (((uint64_t) adreno_gpu->rev.sku) << 32);
(sorry about the butchered indentation.. somehow gmail has become antagonistic about pasting code)
I assume that you would like to keep userspace compat for older chips. thus the if. Maybe we should introduce MSM_PARAM_CHIP_ID_SKU instead (and gradually make userspace switch to it)?
BR, -R
return 0; case MSM_PARAM_MAX_FREQ: *value = adreno_gpu->base.fast_rate;-- 2.7.4
On Mon, Jan 17, 2022 at 6:38 AM Akhil P Oommen quic_akhilpo@quicinc.com wrote:
On 1/13/2022 12:43 PM, Dmitry Baryshkov wrote:
On Thu, 13 Jan 2022 at 00:19, Rob Clark robdclark@gmail.com wrote:
On Tue, Jan 11, 2022 at 1:31 PM Akhil P Oommen quic_akhilpo@quicinc.com wrote:
Expose speedbin through MSM_PARAM_CHIP_ID parameter to help userspace identify the sku.
Signed-off-by: Akhil P Oommen quic_akhilpo@quicinc.com
drivers/gpu/drm/msm/adreno/adreno_gpu.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c index f33cfa4..e970e6a 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -242,10 +242,11 @@ int adreno_get_param(struct msm_gpu *gpu, uint32_t param, uint64_t *value) *value = !adreno_is_a650_family(adreno_gpu) ? 0x100000 : 0; return 0; case MSM_PARAM_CHIP_ID:
*value = adreno_gpu->rev.patchid |(adreno_gpu->rev.minor << 8) |(adreno_gpu->rev.major << 16) |(adreno_gpu->rev.core << 24);
*value = (uint64_t) adreno_gpu->rev.patchid |(uint64_t) (adreno_gpu->rev.minor << 8) |(uint64_t) (adreno_gpu->rev.major << 16) |(uint64_t) (adreno_gpu->rev.core << 24) |(((uint64_t) adreno_gpu->rev.sku) << 32);How about this instead, so we are only changing the behavior for new/unreleased devices:
I thought this property was only used for new devices whereas the existing devices rely on REVN.
-Akhil.
*value = adreno_gpu->rev.patchid | (adreno_gpu->rev.minor << 8) | (adreno_gpu->rev.major << 16) | (adreno_gpu->rev.core << 24); if (!adreno_gpu->info->revn) *value |= (((uint64_t) adreno_gpu->rev.sku) << 32);
(sorry about the butchered indentation.. somehow gmail has become antagonistic about pasting code)
I assume that you would like to keep userspace compat for older chips. thus the if. Maybe we should introduce MSM_PARAM_CHIP_ID_SKU instead (and gradually make userspace switch to it)?
Existing userspace tools do query CHIP_ID, but match based on GPU_ID (falling back to CHIP_ID only if GPU_ID==0).. still, out of an abundance of caution, we should probably not change the behavior for existing GPUs. But so far the only thing with GPU_ID==0 does not exist in the wild yet, so I think we can get away without having to introduce a new param if we only set the upper bits of CHIP_ID when GPU_ID==0.
BR, -R
Update the name in the gpulist for 7c3 gpu as per the latest recommendation.
Signed-off-by: Akhil P Oommen quic_akhilpo@quicinc.com ---
drivers/gpu/drm/msm/adreno/adreno_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c index f35c631..2f1cc56 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_device.c +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c @@ -330,7 +330,7 @@ static const struct adreno_info gpulist[] = { .hwcg = a660_hwcg, }, { .rev = ADRENO_REV(6, 3, 5, ANY_ID), - .name = "Adreno 7c Gen 3", + .name = "Adreno 7c+ Gen 3", .fw = { [ADRENO_FW_SQE] = "a660_sqe.fw", [ADRENO_FW_GMU] = "a660_gmu.bin",
On Tue, Jan 11, 2022 at 1:31 PM Akhil P Oommen quic_akhilpo@quicinc.com wrote:
Add support for "Adreno 8c Gen 3" gpu along with the necessary speedbin support.
Signed-off-by: Akhil P Oommen quic_akhilpo@quicinc.com
drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 21 +++++++++++++++++---- drivers/gpu/drm/msm/adreno/adreno_device.c | 29 ++++++++++++++++++++++++++--- drivers/gpu/drm/msm/adreno/adreno_gpu.h | 10 ++++++++-- 3 files changed, 51 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c index 51b8377..9268ce3 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -10,7 +10,6 @@
#include <linux/bitfield.h> #include <linux/devfreq.h> -#include <linux/nvmem-consumer.h> #include <linux/soc/qcom/llcc-qcom.h>
#define GPU_PAS_ID 13 @@ -1734,6 +1733,18 @@ static u32 a618_get_speed_bin(u32 fuse) return UINT_MAX; }
+static u32 adreno_7c3_get_speed_bin(u32 fuse) +{
if (fuse == 0)return 0;else if (fuse == 117)return 0;else if (fuse == 190)return 1;return UINT_MAX;+}
static u32 fuse_to_supp_hw(struct device *dev, struct adreno_rev rev, u32 fuse) { u32 val = UINT_MAX; @@ -1741,6 +1752,9 @@ static u32 fuse_to_supp_hw(struct device *dev, struct adreno_rev rev, u32 fuse) if (adreno_cmp_rev(ADRENO_REV(6, 1, 8, ANY_ID), rev)) val = a618_get_speed_bin(fuse);
if (adreno_cmp_rev(ADRENO_REV(6, 3, 5, ANY_ID), rev))val = adreno_7c3_get_speed_bin(fuse);if (val == UINT_MAX) { DRM_DEV_ERROR(dev, "missing support for speed-bin: %u. Some OPPs may not be supported by hardware",@@ -1753,11 +1767,10 @@ static u32 fuse_to_supp_hw(struct device *dev, struct adreno_rev rev, u32 fuse)
static int a6xx_set_supported_hw(struct device *dev, struct adreno_rev rev) {
u32 supp_hw = UINT_MAX;u32 speedbin;
u32 speedbin, supp_hw = UINT_MAX; int ret;
ret = nvmem_cell_read_variable_le_u32(dev, "speed_bin", &speedbin);
ret = adreno_read_speedbin(dev, &speedbin); /* * -ENOENT means that the platform doesn't support speedbin which is * finediff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c index 9300583..f35c631 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_device.c +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c @@ -6,6 +6,7 @@
- Copyright (c) 2014,2017 The Linux Foundation. All rights reserved.
*/
+#include <linux/nvmem-consumer.h> #include "adreno_gpu.h"
bool hang_debug = false; @@ -317,6 +318,17 @@ static const struct adreno_info gpulist[] = { .zapfw = "a660_zap.mdt", .hwcg = a660_hwcg, }, {
.rev = ADRENO_REV_SKU(6, 3, 5, ANY_ID, 190),.name = "Adreno 8c Gen 3",.fw = {[ADRENO_FW_SQE] = "a660_sqe.fw",[ADRENO_FW_GMU] = "a660_gmu.bin",},.gmem = SZ_512K,.inactive_period = DRM_MSM_INACTIVE_PERIOD,.init = a6xx_gpu_init,.hwcg = a660_hwcg,}, { .rev = ADRENO_REV(6, 3, 5, ANY_ID), .name = "Adreno 7c Gen 3", .fw = {@@ -371,7 +383,8 @@ bool adreno_cmp_rev(struct adreno_rev rev1, struct adreno_rev rev2) return _rev_match(rev1.core, rev2.core) && _rev_match(rev1.major, rev2.major) && _rev_match(rev1.minor, rev2.minor) &&
_rev_match(rev1.patchid, rev2.patchid);
_rev_match(rev1.patchid, rev2.patchid) &&_rev_match(rev1.sku, rev2.sku);}
const struct adreno_info *adreno_info(struct adreno_rev rev) @@ -445,12 +458,17 @@ struct msm_gpu *adreno_load_gpu(struct drm_device *dev) return gpu; }
+int adreno_read_speedbin(struct device *dev, u32 *speedbin) +{
return nvmem_cell_read_variable_le_u32(dev, "speed_bin", speedbin);+}
If you are going to add a helper for this, you should probably use it in a6xx_set_supported_hw() as well..
BR, -R
static int find_chipid(struct device *dev, struct adreno_rev *rev) { struct device_node *node = dev->of_node; const char *compat; int ret;
u32 chipid;
u32 chipid, speedbin; /* first search the compat strings for qcom,adreno-XYZ.W: */ ret = of_property_read_string_index(node, "compatible", 0, &compat);@@ -466,7 +484,7 @@ static int find_chipid(struct device *dev, struct adreno_rev *rev) rev->minor = r; rev->patchid = patch;
return 0;
goto done; } }@@ -486,6 +504,11 @@ static int find_chipid(struct device *dev, struct adreno_rev *rev) dev_warn(dev, "Use compatible qcom,adreno-%u%u%u.%u instead.\n", rev->core, rev->major, rev->minor, rev->patchid);
+done:
if (adreno_read_speedbin(dev, &speedbin))speedbin = ANY_ID;rev->sku = (uint16_t) (0xffff & speedbin); return 0;}
diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/adreno/adreno_gpu.h index cffabe7..52bd93a 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h @@ -40,12 +40,16 @@ struct adreno_rev { uint8_t major; uint8_t minor; uint8_t patchid;
uint16_t sku;};
-#define ANY_ID 0xff +#define ANY_ID 0xff +#define ANY_SKU 0xffff
#define ADRENO_REV(core, major, minor, patchid) \
((struct adreno_rev){ core, major, minor, patchid })
((struct adreno_rev){ core, major, minor, patchid, ANY_SKU })+#define ADRENO_REV_SKU(core, major, minor, patchid, sku) \
((struct adreno_rev){ core, major, minor, patchid, sku })struct adreno_gpu_funcs { struct msm_gpu_funcs base; @@ -324,6 +328,8 @@ adreno_iommu_create_address_space(struct msm_gpu *gpu,
void adreno_set_llc_attributes(struct iommu_domain *iommu);
+int adreno_read_speedbin(struct device *dev, u32 *speedbin);
/*
- For a5xx and a6xx targets load the zap shader that is used to pull the GPU
- out of secure mode
-- 2.7.4
dri-devel@lists.freedesktop.org
-
Akhil P Oommen -
Dmitry Baryshkov -
Rob Clark