Skip to content

Commit 02ddec6

Browse files
committed
hack
1 parent 3c23062 commit 02ddec6

File tree

3 files changed

+16
-12
lines changed

3 files changed

+16
-12
lines changed

arch/arm/boot/dts/qcom/qcom-msm8909.dtsi

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -423,26 +423,29 @@
423423
compatible = "qcom,msm8909-venus";
424424
reg = <0x01d00000 0xff000>;
425425
interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
426-
power-domains = <&gcc VENUS_GDSC>;
426+
power-domains = <&gcc VENUS_GDSC>,<&gcc VENUS_CORE0_GDSC>;
427+
// power-domains = <&gcc VENUS_GDSC>;
427428
clocks = <&gcc GCC_VENUS0_VCODEC0_CLK>,
429+
<&gcc GCC_VENUS0_CORE0_VCODEC0_CLK>,
428430
<&gcc GCC_VENUS0_AHB_CLK>,
429431
<&gcc GCC_VENUS0_AXI_CLK>;
430-
clock-names = "core", "iface", "bus";
432+
clock-names = "core", "core0","iface", "bus";
433+
//clock-names = "core", "iface", "bus";
431434
iommus = <&apps_iommu 5>;
432435
memory-region = <&venus_mem>;
433436

434437
video-decoder {
435438
compatible = "venus-decoder";
436-
clocks = <&gcc GCC_VENUS0_CORE0_VCODEC0_CLK>;
437-
clock-names = "core";
438-
power-domains = <&gcc VENUS_CORE0_GDSC>;
439+
//clocks = <&gcc GCC_VENUS0_CORE0_VCODEC0_CLK>;
440+
//clock-names = "core";
441+
//power-domains = <&gcc VENUS_CORE0_GDSC>;
439442
};
440443

441444
video-encoder {
442445
compatible = "venus-encoder";
443-
clocks = <&gcc GCC_VENUS0_CORE0_VCODEC0_CLK>;
444-
clock-names = "core";
445-
power-domains = <&gcc VENUS_CORE0_GDSC>;
446+
//clocks = <&gcc GCC_VENUS0_CORE0_VCODEC0_CLK>;
447+
//clock-names = "core";
448+
//power-domains = <&gcc VENUS_CORE0_GDSC>;
446449

447450
};
448451
};

drivers/clk/qcom/gcc-msm8909.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2401,7 +2401,8 @@ static struct clk_branch gcc_venus0_axi_clk = {
24012401
};
24022402

24032403
static struct clk_branch gcc_venus0_core0_vcodec0_clk = {
2404-
.halt_reg = 0x4c02c,
2404+
//.halt_reg = 0x4c02c,
2405+
.halt_reg = 0x4c01c,
24052406
.halt_check = BRANCH_HALT,
24062407
.clkr = {
24072408
.enable_reg = 0x4c02c,

drivers/media/platform/qcom/venus/core.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -688,10 +688,10 @@ static const struct venus_resources msm8909_res = {
688688
.freq_tbl_size = ARRAY_SIZE(msm8909_freq_table),
689689
.reg_tbl = msm8916_reg_preset,
690690
.reg_tbl_size = ARRAY_SIZE(msm8916_reg_preset),
691-
.clks = { "core", "iface", "bus", },
691+
.clks = { "core", "core0","iface", "bus", },
692692
.clks_num = 3,
693-
.vcodec0_clks = { "core" },
694-
.vcodec1_clks = { "core" },
693+
// .vcodec0_clks = { "core" },
694+
// .vcodec1_clks = { "core" },
695695
.max_load = 244800, /* 1080p@30 */
696696
.hfi_version = HFI_VERSION_1XX,
697697
.vmem_id = VIDC_RESOURCE_NONE,

0 commit comments

Comments
 (0)