diff options
| author | Zhou Peng <eagle.zhou@nxp.com> | 2018-06-06 17:52:34 +0800 |
|---|---|---|
| committer | Leonard Crestez <leonard.crestez@nxp.com> | 2018-08-24 12:41:33 +0300 |
| commit | 3dc34ec461a0af51b447c4a2bdbbada8450ca09f (patch) | |
| tree | bf04fe79bc3912fd58901fabfc36296d5f53535f /drivers/mxc | |
| parent | 3f99ca02d77cfd91263becb10ac8592d0068b523 (diff) | |
MLK-18532: [i.MX8MM/Hantro]: h1 encoder doesn't work when running with decoder simultaneously
Remove legacy function 'hantrodec_choose_core()'
Signed-off-by: Zhou Peng <eagle.zhou@nxp.com>
Diffstat (limited to 'drivers/mxc')
| -rwxr-xr-x | drivers/mxc/hantro_845/hantrodec_845s.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/mxc/hantro_845/hantrodec_845s.c b/drivers/mxc/hantro_845/hantrodec_845s.c index 2dc806aeab6c..90649439d15e 100755 --- a/drivers/mxc/hantro_845/hantrodec_845s.c +++ b/drivers/mxc/hantro_845/hantrodec_845s.c @@ -483,7 +483,7 @@ static int GetDecCoreID(unsigned long format) PDEBUG("GetDecCoreID=%d\n", core_id); return core_id; } - +#if 0 static int hantrodec_choose_core(int is_g1) { volatile unsigned char *reg = NULL; @@ -517,7 +517,7 @@ static int hantrodec_choose_core(int is_g1) PDEBUG("hantrodec_choose_core OK!\n"); return 0; } - +#endif static long ReserveDecoder(hantrodec_t *dev, struct file *filp, unsigned long format) { @@ -537,6 +537,7 @@ static long ReserveDecoder(hantrodec_t *dev, struct file *filp, unsigned long fo if (wait_event_interruptible(hw_queue, GetDecCoreAny(&Core, dev, filp, format) != 0)) return -ERESTARTSYS; #endif +#if 0 if (IS_G1(dev->hw_id)) { if (0 == hantrodec_choose_core(1)) PDEBUG("G1 is reserved\n"); @@ -548,7 +549,7 @@ static long ReserveDecoder(hantrodec_t *dev, struct file *filp, unsigned long fo else return -1; } - +#endif #ifdef CONFIG_DEVICE_THERMAL_XXX if (hantro_dynamic_clock) hantro_thermal_check(hantro_dev); |