Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[media] s5p-mfc: Use clock gating only on MFC v5 hardware

Newer MFC hardware have internal clock gating feature, so additional
software-triggered clock gating sometimes causes misbehavior of the MFC
firmware and results in freeze or crash. This patch changes the driver
to use software-triggered clock gating only when working with v5 MFC
hardware, where it has been proven to work properly.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

authored by

Marek Szyprowski and committed by
Mauro Carvalho Chehab
c5086f13 5d1ec731

+18 -2
+1
drivers/media/platform/s5p-mfc/s5p_mfc.c
··· 1442 1442 .buf_size = &buf_size_v5, 1443 1443 .buf_align = &mfc_buf_align_v5, 1444 1444 .fw_name[0] = "s5p-mfc.fw", 1445 + .use_clock_gating = true, 1445 1446 }; 1446 1447 1447 1448 static struct s5p_mfc_buf_size_v6 mfc_buf_size_v6 = {
+2
drivers/media/platform/s5p-mfc/s5p_mfc_common.h
··· 199 199 struct s5p_mfc_pm { 200 200 struct clk *clock; 201 201 struct clk *clock_gate; 202 + bool use_clock_gating; 202 203 atomic_t power; 203 204 struct device *device; 204 205 }; ··· 236 235 struct s5p_mfc_buf_size *buf_size; 237 236 struct s5p_mfc_buf_align *buf_align; 238 237 char *fw_name[MFC_FW_MAX_VERSIONS]; 238 + bool use_clock_gating; 239 239 }; 240 240 241 241 /**
+15 -2
drivers/media/platform/s5p-mfc/s5p_mfc_pm.c
··· 37 37 38 38 pm = &dev->pm; 39 39 p_dev = dev; 40 + pm->use_clock_gating = dev->variant->use_clock_gating; 40 41 pm->clock_gate = clk_get(&dev->plat_dev->dev, MFC_GATE_CLK_NAME); 41 42 if (IS_ERR(pm->clock_gate)) { 42 43 mfc_err("Failed to get clock-gating control\n"); ··· 109 108 atomic_inc(&clk_ref); 110 109 mfc_debug(3, "+ %d\n", atomic_read(&clk_ref)); 111 110 #endif 111 + if (!pm->use_clock_gating) 112 + return 0; 112 113 if (!IS_ERR_OR_NULL(pm->clock_gate)) 113 114 ret = clk_enable(pm->clock_gate); 114 115 return ret; ··· 122 119 atomic_dec(&clk_ref); 123 120 mfc_debug(3, "- %d\n", atomic_read(&clk_ref)); 124 121 #endif 122 + if (!pm->use_clock_gating) 123 + return; 125 124 if (!IS_ERR_OR_NULL(pm->clock_gate)) 126 125 clk_disable(pm->clock_gate); 127 126 } 128 127 129 128 int s5p_mfc_power_on(void) 130 129 { 130 + int ret = 0; 131 + 131 132 #ifdef CONFIG_PM 132 - return pm_runtime_get_sync(pm->device); 133 + ret = pm_runtime_get_sync(pm->device); 134 + if (ret) 135 + return ret; 133 136 #else 134 137 atomic_set(&pm->power, 1); 135 - return 0; 136 138 #endif 139 + if (!pm->use_clock_gating && !IS_ERR_OR_NULL(pm->clock_gate)) 140 + ret = clk_enable(pm->clock_gate); 141 + return ret; 137 142 } 138 143 139 144 int s5p_mfc_power_off(void) 140 145 { 146 + if (!pm->use_clock_gating && !IS_ERR_OR_NULL(pm->clock_gate)) 147 + clk_disable(pm->clock_gate); 141 148 #ifdef CONFIG_PM 142 149 return pm_runtime_put_sync(pm->device); 143 150 #else