disp: msm: sde rotator driver configs for probe only

Added code for dummy probe defined under
CONFIG_SDE_ROTATOR_INIT_ONLY to address cases where
rotator device node is defined but driver needs to be
disabled. This is stop gap arrangement until v4l2
configs are available in GKI.

Change-Id: I069b37f818d2e4401b3992f1f1e308858a7e29e6
Signed-off-by: Raviteja Tamatam <travitej@codeaurora.org>
This commit is contained in:
Raviteja Tamatam
2020-09-24 04:35:11 +05:30
parent 8f16ccc93b
commit 74dd4682cd
2 changed files with 36 additions and 2 deletions

View File

@@ -52,7 +52,7 @@
#define SDE_ROTATOR_ADD_REQUEST 1
#define SDE_ROTATOR_REMOVE_REQUEST 0
#ifndef CONFIG_MSM_SDE_ROTATOR_INIT_ONLY
static void sde_rotator_submit_handler(struct kthread_work *work);
static void sde_rotator_retire_handler(struct kthread_work *work);
#ifdef CONFIG_COMPAT
@@ -3373,6 +3373,7 @@ static struct v4l2_m2m_ops sde_rotator_m2m_ops = {
.job_abort = sde_rotator_job_abort,
.job_ready = sde_rotator_job_ready,
};
#endif
/* Device tree match struct */
static const struct of_device_id sde_rotator_dt_match[] = {
@@ -3383,6 +3384,7 @@ static const struct of_device_id sde_rotator_dt_match[] = {
{}
};
#ifndef CONFIG_MSM_SDE_ROTATOR_INIT_ONLY
/*
* sde_rotator_get_drv_data - rotator device driver data.
* @dev: Pointer to device.
@@ -3580,6 +3582,36 @@ static struct platform_driver rotator_driver = {
},
};
#else
/*
* sde_rotator_probe - rotator device probe method.
* @pdev: Pointer to rotator platform device.
*/
static int sde_rotator_probe(struct platform_device *pdev)
{
return 0;
}
/*
* sde_rotator_remove - rotator device remove method.
* @pdev: Pointer rotator platform device.
*/
static int sde_rotator_remove(struct platform_device *pdev)
{
return 0;
}
/* SDE Rotator platform driver definition */
static struct platform_driver rotator_driver = {
.probe = sde_rotator_probe,
.remove = sde_rotator_remove,
.driver = {
.name = SDE_ROTATOR_DRV_NAME,
.of_match_table = sde_rotator_dt_match,
},
};
#endif
void __init sde_rotator_register(void)
{
platform_driver_register(&rotator_driver);

View File

@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.
* Copyright (c) 2015-2020, The Linux Foundation. All rights reserved.
*/
#ifndef __SDE_ROTATOR_DEV_H__
@@ -215,7 +215,9 @@ struct sde_rotator_device {
struct device *dev;
struct v4l2_device v4l2_dev;
struct video_device *vdev;
#ifndef CONFIG_MSM_SDE_ROTATOR_INIT_ONLY
struct v4l2_m2m_dev *m2m_dev;
#endif
struct platform_device *pdev;
const void *drvdata;
u32 early_submit;