Commit 77a788fc authored by Arun Kumar K's avatar Arun Kumar K Committed by Mauro Carvalho Chehab
Browse files

[media] s5p-mfc: Prepare driver for callback based re-architecture 



The patch renames hardware specific opr and cmd files to
opr_v5 and cmd_v5 respectively. This is done for accomodating
firmware v6. Also the shared memory management files are removed
and the functionality is added to the opr_v5 file.

Signed-off-by: default avatarArun Kumar K <arun.kk@samsung.com>
Acked-by: default avatarKamil Debski <k.debski@samsung.com>
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 2e81dde9

drivers/media/platform/s5p-mfc/Makefile

+3 −3
Original line number Diff line number Diff line 
obj-$(CONFIG_VIDEO_SAMSUNG_S5P_MFC) := s5p-mfc.o

s5p-mfc-y += s5p_mfc.o s5p_mfc_intr.o s5p_mfc_opr.o

s5p-mfc-y += s5p_mfc.o s5p_mfc_intr.o s5p_mfc_opr_v5.o

s5p-mfc-y += s5p_mfc_dec.o s5p_mfc_enc.o

s5p-mfc-y += s5p_mfc_ctrl.o s5p_mfc_cmd.o

s5p-mfc-y += s5p_mfc_pm.o s5p_mfc_shm.o
 
s5p-mfc-y += s5p_mfc_ctrl.o s5p_mfc_cmd_v5.o

s5p-mfc-y += s5p_mfc_pm.o

drivers/media/platform/s5p-mfc/s5p_mfc.c

+5 −6
Original line number Diff line number Diff line
@@ -28,9 +28,8 @@ 
#include "s5p_mfc_dec.h"

#include "s5p_mfc_enc.h"

#include "s5p_mfc_intr.h"

#include "s5p_mfc_opr.h"

#include "s5p_mfc_opr_v5.h"

#include "s5p_mfc_pm.h"

#include "s5p_mfc_shm.h"



#define S5P_MFC_NAME		"s5p-mfc"

#define S5P_MFC_DEC_NAME	"s5p-mfc-dec"
@@ -213,8 +212,8 @@ static void s5p_mfc_handle_frame_all_extracted(struct s5p_mfc_ctx *ctx) 
		ctx->dst_queue_cnt--;

		dst_buf->b->v4l2_buf.sequence = (ctx->sequence++);



		if (s5p_mfc_read_shm(ctx, PIC_TIME_TOP) ==

			s5p_mfc_read_shm(ctx, PIC_TIME_BOT))

		if (s5p_mfc_read_info_v5(ctx, PIC_TIME_TOP) ==

			s5p_mfc_read_info_v5(ctx, PIC_TIME_BOT))

			dst_buf->b->v4l2_buf.field = V4L2_FIELD_NONE;

		else

			dst_buf->b->v4l2_buf.field = V4L2_FIELD_INTERLACED;
@@ -285,8 +284,8 @@ static void s5p_mfc_handle_frame_new(struct s5p_mfc_ctx *ctx, unsigned int err) 
			list_del(&dst_buf->list);

			ctx->dst_queue_cnt--;

			dst_buf->b->v4l2_buf.sequence = ctx->sequence;

			if (s5p_mfc_read_shm(ctx, PIC_TIME_TOP) ==

				s5p_mfc_read_shm(ctx, PIC_TIME_BOT))

			if (s5p_mfc_read_info_v5(ctx, PIC_TIME_TOP) ==

				s5p_mfc_read_info_v5(ctx, PIC_TIME_BOT))

				dst_buf->b->v4l2_buf.field = V4L2_FIELD_NONE;

			else

				dst_buf->b->v4l2_buf.field =

drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c→drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
 */



#include "regs-mfc.h"

#include "s5p_mfc_cmd.h"

#include "s5p_mfc_cmd_v5.h"

#include "s5p_mfc_common.h"

#include "s5p_mfc_debug.h"

drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <linux/jiffies.h>

#include <linux/sched.h>

#include "regs-mfc.h"

#include "s5p_mfc_cmd.h"

#include "s5p_mfc_cmd_v5.h"

#include "s5p_mfc_common.h"

#include "s5p_mfc_debug.h"

#include "s5p_mfc_intr.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE