shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

amdolby_vision: fix kernel crash [1/1]

Browse Source 
PD# 173406

Problem:
kernel crash when play dv after insmod 4.9 stb dovi.ko at t962x-r311 platform
[  118.398098@0] Internal error: Oops: 96000047 [#1] PREEMPT SMP
[  118.440794@0] CPU: 0 PID: 2869 Comm: irq/40-vdec-0 Tainted: GO    4.9.113 #2
[  118.448726@0] Hardware name: Amlogic (DT)
[  118.452694@0] task: ffffffc01ae2b700 task.stack: ffffffc023e4c000
[  118.458740@0] PC is at __memcpy+0x110/0x180
[  118.462878@0] LR is at dolby_vision_parse_metadata+0xb3c/0x1920
[  118.468736@0] pc : [<ffffff800947c690>] lr : [<ffffff800998b33c>]pstate: 200001c5
[  118.476239@0] sp : ffffffc027e3fb30

Solution:
fix vmalloc error, function pointer add protection

Verify:
need verify at t962x-r311 platform

Change-Id: I3f0872480dabbf8b415d798d6b205028f08fd89a
Signed-off-by: shuanglong.wang <shuanglong.wang@amlogic.com>
This commit is contained in:
shuanglong.wang
2018-10-02 15:56:32 +08:00
committed by Jianxin Pan
parent 3413ce1850
commit 048afccfd2
1 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/amlogic/media/enhancement/amdolby_vision/amdolby_vision.c
View File

@@ -4881,18 +4881,22 @@ int dolby_vision_parse_metadata(
TUNINGMODE_EXTLEVEL4_DISABLE;
if (src_format != ((struct tv_dovi_setting_s *)
tv_dovi_setting)->src_format)
p_funcs->tv_control_path(
FORMAT_INVALID, 0,
NULL, 0,
NULL, 0,
0, 0,
SIG_RANGE_SMPTE,
NULL, NULL,
0,
NULL,
NULL);
tv_dovi_setting)->src_format) {
if (p_funcs->tv_control_path)
p_funcs->tv_control_path(
FORMAT_INVALID, 0,
NULL, 0,
NULL, 0,
0, 0,
SIG_RANGE_SMPTE,
NULL, NULL,
0,
NULL,
NULL);
}
#endif
if (!p_funcs->tv_control_path)
return -1;
flag = p_funcs->tv_control_path(
src_format, input_mode,
comp_buf[currentId], total_comp_size,
@@ -4975,8 +4979,7 @@ int dolby_vision_parse_metadata(
frame_count, debug_dolby);
el_mode = el_flag;
return 0; /* setting updated */
}
if (flag < 0) {
} else {
((struct tv_dovi_setting_s *)
tv_dovi_setting)->video_width = 0;
((struct tv_dovi_setting_s *)
@@ -5907,7 +5910,6 @@ int register_dv_functions(const struct dolby_vision_func_s *func)
if (!p_funcs && func) {
pr_info("*** register_dv_functions. version %s ***\n",
func->version_info);
p_funcs = func;
ret = 0;
/* get efuse flag*/
reg_clk = READ_VPP_REG(DOLBY_TV_CLKGATE_CTRL);
@@ -5933,9 +5935,17 @@ int register_dv_functions(const struct dolby_vision_func_s *func)
if (is_meson_gxm() ||
is_meson_g12())
dolby_vision_run_mode_delay = 3;
pq_config = vmalloc(sizeof(pq_config));
pq_config = vmalloc(sizeof(struct pq_config_s));
if (pq_config == NULL) {
pr_info("[amdolby_vision] vmalloc failed for pq_config_s error!\n");
return -1;
}
pq_config_fake = (struct pq_config_s *)pq_config;
dovi_setting = vmalloc(sizeof(dovi_setting));
dovi_setting = vmalloc(sizeof(struct tv_dovi_setting_s));
if (dovi_setting == NULL) {
pr_info("[amdolby_vision] vmalloc failed for tv_dovi_setting_s error!\n");
return -1;
}
tv_dovi_setting = (struct tv_dovi_setting_s *)dovi_setting;
/* adjust core2 setting to work around fixing with 1080p24hz */
if (is_meson_txlx())
@@ -5952,6 +5962,7 @@ int register_dv_functions(const struct dolby_vision_func_s *func)
g_vpotch = 0x8;
} else
g_vpotch = 0x8;
p_funcs = func;
}
return ret;
}