Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60c94738 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: sde: Add mdss 3.0.0 support to sde v4l2 rotator driver" into msm-4.8

parents bd767bb1 9487de23

drivers/media/platform/msm/sde/rotator/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -15,9 +15,13 @@ obj-y += \ 
		sde_rotator_r1_ctl.o \

		sde_rotator_r1.o



obj-y += \

		sde_rotator_r3.o



obj-$(CONFIG_SYNC) += \

		sde_rotator_sync.o



obj-$(CONFIG_DEBUG_FS) += \

		sde_rotator_debug.o \

		sde_rotator_r1_debug.o
 
 No newline at end of file
 
		sde_rotator_r1_debug.o \

		sde_rotator_r3_debug.o

drivers/media/platform/msm/sde/rotator/sde_rotator_core.c

+3 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include "sde_rotator_io_util.h"

#include "sde_rotator_smmu.h"

#include "sde_rotator_r1.h"

#include "sde_rotator_r3.h"

#include "sde_rotator_trace.h"



/* waiting for hw time out, 3 vsync for 30fps*/
@@ -2278,6 +2279,8 @@ int sde_rotator_core_init(struct sde_rot_mgr **pmgr, 


	if ((mdata->mdss_version & 0xFFFF0000) == 0x10070000) {

		mgr->ops_hw_init = sde_rotator_r1_init;

	} else if ((mdata->mdss_version & 0xFFFF0000) == 0x30000000) {

		mgr->ops_hw_init = sde_rotator_r3_init;

	} else {

		SDEROT_ERR("unsupported sde version %x\n",

				mdata->mdss_version);