summaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h
diff options
context:
space:
mode:
authorKamil Debski2013-01-03 15:02:07 +0100
committerMauro Carvalho Chehab2013-01-06 12:57:57 +0100
commit2e731e443fcc8e4553201ad0573c1d5571e906ac (patch)
tree180458e6f6960f5980738ee5d0817bdae0c44d58 /drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h
parent[media] s5p-mfc: Fix an error check (diff)
downloadkernel-qcow2-linux-2e731e443fcc8e4553201ad0573c1d5571e906ac.tar.gz
kernel-qcow2-linux-2e731e443fcc8e4553201ad0573c1d5571e906ac.tar.xz
kernel-qcow2-linux-2e731e443fcc8e4553201ad0573c1d5571e906ac.zip
[media] s5p-mfc: Move firmware allocation point to avoid allocation problems
Move firmware allocation from open to probe to avoid problems when using CMA for allocation. In certain circumstances CMA may allocate buffer that is not in the beginning of the MFC memory area. Signed-off-by: Kamil Debski <k.debski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h')
-rw-r--r--drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h b/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h
index 90aa9b9886d5..6a9b6f8606bb 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h
@@ -16,7 +16,8 @@
#include "s5p_mfc_common.h"
int s5p_mfc_release_firmware(struct s5p_mfc_dev *dev);
-int s5p_mfc_alloc_and_load_firmware(struct s5p_mfc_dev *dev);
+int s5p_mfc_alloc_firmware(struct s5p_mfc_dev *dev);
+int s5p_mfc_load_firmware(struct s5p_mfc_dev *dev);
int s5p_mfc_reload_firmware(struct s5p_mfc_dev *dev);
int s5p_mfc_init_hw(struct s5p_mfc_dev *dev);