mirror of
https://github.com/linux-msm/laptops-kernel.git
synced 2026-08-13 14:19:53 -07:00
media: iris: remove duplication between generic gen2 data and qcs8300
Now as we have removed PIPE value from inst_fw_caps_dec there should be no difference between inst_fw_caps of QCS8300 and SM8550+. Drop the QCS8300-specific tables and use generic one instead. The differences between QCS8300 and SM8550 data comes from a non-conflict merge of commitd22037f3fd("media: iris: Set platform capabilities to firmware for encoder video device") (which added .set callbacks), and commit6bdfa3f947("media: iris: Add platform-specific capabilities for encoder video device") (which added QCS8300 data, but not the callbacks). Reviewed-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com> Reviewed-by: Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> Signed-off-by: Bryan O'Donoghue <bod@kernel.org> Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
This commit is contained in:
committed by
Hans Verkuil
parent
6c67d1cf18
commit
69dfada4c9
@@ -995,7 +995,6 @@ const struct iris_platform_data sm8750_data = {
|
||||
/*
|
||||
* Shares most of SM8550 data except:
|
||||
* - inst_caps to platform_inst_cap_qcs8300
|
||||
* - inst_fw_caps to inst_fw_cap_qcs8300
|
||||
*/
|
||||
const struct iris_platform_data qcs8300_data = {
|
||||
.get_instance = iris_hfi_gen2_get_instance,
|
||||
@@ -1021,10 +1020,10 @@ const struct iris_platform_data qcs8300_data = {
|
||||
.fwname = "qcom/vpu/vpu30_p4_s6.mbn",
|
||||
.pas_id = IRIS_PAS_ID,
|
||||
.inst_caps = &platform_inst_cap_qcs8300,
|
||||
.inst_fw_caps_dec = inst_fw_cap_qcs8300_dec,
|
||||
.inst_fw_caps_dec_size = ARRAY_SIZE(inst_fw_cap_qcs8300_dec),
|
||||
.inst_fw_caps_enc = inst_fw_cap_qcs8300_enc,
|
||||
.inst_fw_caps_enc_size = ARRAY_SIZE(inst_fw_cap_qcs8300_enc),
|
||||
.inst_fw_caps_dec = inst_fw_cap_sm8550_dec,
|
||||
.inst_fw_caps_dec_size = ARRAY_SIZE(inst_fw_cap_sm8550_dec),
|
||||
.inst_fw_caps_enc = inst_fw_cap_sm8550_enc,
|
||||
.inst_fw_caps_enc_size = ARRAY_SIZE(inst_fw_cap_sm8550_enc),
|
||||
.tz_cp_config_data = &tz_cp_config_sm8550,
|
||||
.core_arch = VIDEO_ARCH_LX,
|
||||
.hw_response_timeout = HW_RESPONSE_TIMEOUT_VALUE,
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user