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

Commit 4e0b78c0 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 64166b00 65e04bc5

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);

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

0 → 100644
+1872 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/media/platform/msm/sde/rotator/sde_rotator_r3.h

0 → 100644
+20 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#ifndef __SDE_ROTATOR_R3_H__

#define __SDE_ROTATOR_R3_H__



#include "sde_rotator_core.h"



int sde_rotator_r3_init(struct sde_rot_mgr *mgr);



#endif /* __SDE_ROTATOR_R3_H__ */

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

0 → 100644
+48 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 */



#define pr_fmt(fmt)	"%s: " fmt, __func__



#include <linux/types.h>

#include <linux/kernel.h>

#include <linux/slab.h>

#include <linux/uaccess.h>

#include <linux/debugfs.h>



#include "sde_rotator_r3_debug.h"

#include "sde_rotator_core.h"

#include "sde_rotator_r3.h"

#include "sde_rotator_r3_internal.h"



/*

 * sde_rotator_r3_create_debugfs - Setup rotator r3 debugfs directory structure.

 * @rot_dev: Pointer to rotator device

 */

int sde_rotator_r3_create_debugfs(struct sde_rot_mgr *mgr,

		struct dentry *debugfs_root)

{

	struct sde_hw_rotator *hw_data;



	if (!mgr || !debugfs_root || !mgr->hw_data)

		return -EINVAL;



	hw_data = mgr->hw_data;



	if (!debugfs_create_bool("dbgmem", S_IRUGO | S_IWUSR,

			debugfs_root, &hw_data->dbgmem)) {

		SDEROT_ERR("fail create dbgmem\n");

		return -EINVAL;

	}



	return 0;

}