media: iris: don't specify highest_bank_bit in the source code

The highest_bank_bit param is specified both in the Iris driver and in
the platform UBWC config. Use the platform UBWC configuration instead of
specifying it directly in the source.

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Reviewed-by: Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com>
Tested-by: Wangao Wang <wangao.wang@oss.qualcomm.com>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: Bryan O'Donoghue <bod@kernel.org>

diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_packet.c b/drivers/media/platform/qcom/iris/iris_hfi_gen2_packet.c
index aa4520b277391666f01338facfb060fdbf63d112..6dc0cbaa9c1938c9267c03d8a5a660ed97683d7d 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_packet.c
+++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_packet.c
@@ -160,7 +160,7 @@ void iris_hfi_gen2_packet_sys_init(struct iris_core *core, struct iris_hfi_heade
                                    &payload,
                                    sizeof(u32));
 
-       payload = core->iris_platform_data->ubwc_config->highest_bank_bit;
+       payload = ubwc->highest_bank_bit;
        iris_hfi_gen2_create_packet(hdr,
                                    HFI_PROP_UBWC_HBB,
                                    HFI_HOST_FLAGS_NONE,

diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h
index 08a9529e599b011abae002935a83935a7f085028..5639eb5a75b6a34fa24aca80f7ad806c9463da93 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_platform_common.h
+++ b/drivers/media/platform/qcom/iris/iris_platform_common.h
@@ -77,7 +77,6 @@ struct tz_cp_config {
 
 struct ubwc_config_data {
        u32     max_channels;
-       u32     highest_bank_bit;
        u32     bank_swzl_level;
        u32     bank_swz2_level;
        u32     bank_swz3_level;

diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen2.c b/drivers/media/platform/qcom/iris/iris_platform_gen2.c
index 01c6ffa7e084d3e309d0118ee6677b6bca0ec5d2..bdeb92e0b7bc2334d16c6c452445a59bda5558b4 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_platform_gen2.c
+++ b/drivers/media/platform/qcom/iris/iris_platform_gen2.c
@@ -792,7 +792,6 @@ static const char * const sm8550_opp_clk_table[] = {
 
 static struct ubwc_config_data ubwc_config_sm8550 = {
        .max_channels = 8,
-       .highest_bank_bit = 16,
        .bank_swzl_level = 0,
        .bank_swz2_level = 1,
        .bank_swz3_level = 1,