Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

Revert "msm: mdp: Move wfd state signalling into mdp driver"

Browse source 
This reverts commit b7d35468be026b0266bcb5217b72c6fbbf8b1bc0.

Change-Id: Iba80431f304dff64ba0427870dd857fc8729be28
Signed-off-by: Deva Ramasubramanian <dramasub@codeaurora.org>
This commit is contained in:
Deva Ramasubramanian 2013-02-11 17:29:13 -08:00 committed by Iliyan Malchev
parent 5fe00a30c9
commit e5cfb6035c
7 changed files with 14 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/media/video/msm_wfd/mdp-4-subdev.c
View file

@ -24,6 +24,7 @@ struct mdp_instance {
u32 width;
bool secure;
bool uses_iommu_split_domain;
struct switch_dev sdev;
};
int mdp_init(struct v4l2_subdev *sd, u32 val)
@ -55,7 +56,13 @@ int mdp_open(struct v4l2_subdev *sd, void *arg)
rc = -ENODEV;
goto mdp_open_fail;
}
inst->sdev.name = "wfd";
/* Register wfd node to switch driver */
rc = switch_dev_register(&inst->sdev);
if (rc) {
WFD_MSG_ERR("WFD switch registration failed\n");
goto mdp_open_fail;
}
msm_fb_writeback_init(fbi);
inst->mdp = fbi;
inst->secure = mops->secure;
@ -85,6 +92,8 @@ int mdp_start(struct v4l2_subdev *sd, void *arg)
rc = -ENODEV;
goto exit;
}
switch_set_state(&inst->sdev, true);
WFD_MSG_DBG("wfd state switched to %d\n", inst->sdev.state);
}
exit:
return rc;
@ -101,6 +110,8 @@ int mdp_stop(struct v4l2_subdev *sd, void *arg)
return rc;
}
fbi = (struct fb_info *)inst->mdp;
switch_set_state(&inst->sdev, false);
WFD_MSG_DBG("wfd state switched to %d\n", inst->sdev.state);
}
return 0;
}
@ -111,6 +122,8 @@ int mdp_close(struct v4l2_subdev *sd, void *arg)
if (inst) {
fbi = (struct fb_info *)inst->mdp;
msm_fb_writeback_terminate(fbi);
/* Unregister wfd node from switch driver */
switch_dev_unregister(&inst->sdev);
kfree(inst);
}
return 0;

1
drivers/video/msm/mdp4.h
View file

@ -906,7 +906,6 @@ int mdp4_writeback_queue_buffer(struct fb_info *info,
void mdp4_writeback_dma_stop(struct msm_fb_data_type *mfd);
int mdp4_writeback_init(struct fb_info *info);
int mdp4_writeback_terminate(struct fb_info *info);
int mdp4_writeback_set_mirroring_hint(struct fb_info *info, int hint);
uint32_t mdp_block2base(uint32_t block);
int mdp_hist_lut_config(struct mdp_hist_lut_data *data);

21
drivers/video/msm/mdp4_overlay_writeback.c
View file

@ -226,7 +226,6 @@ int mdp4_overlay_writeback_off(struct platform_device *pdev)
/* MDP_LAYERMIXER_WB_MUX_SEL to restore to default cfg*/
outpdw(MDP_BASE + 0x100F4, 0x0);
mdp_clk_ctrl(0);
pr_debug("%s-:\n", __func__);
return ret;
}
@ -860,23 +859,3 @@ static void mdp4_wfd_queue_wakeup(struct msm_fb_data_type *mfd,
mutex_unlock(&mfd->writeback_mutex);
wake_up(&mfd->wait_q);
}
int mdp4_writeback_set_mirroring_hint(struct fb_info *info, int hint)
{
struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;
if (mfd->panel.type != WRITEBACK_PANEL)
return -ENOTSUPP;
switch (hint) {
case MDP_WRITEBACK_MIRROR_ON:
case MDP_WRITEBACK_MIRROR_PAUSE:
case MDP_WRITEBACK_MIRROR_RESUME:
case MDP_WRITEBACK_MIRROR_OFF:
pr_info("wfd state switched to %d\n", hint);
switch_set_state(&mfd->writeback_sdev, hint);
return 0;
default:
return -EINVAL;
}
}

15
drivers/video/msm/mdp4_wfd_writeback.c
View file

@ -75,13 +75,6 @@ static int writeback_probe(struct platform_device *pdev)
platform_set_drvdata(mdp_dev, mfd);
mfd->writeback_sdev.name = "wfd";
rc = switch_dev_register(&mfd->writeback_sdev);
if (rc) {
pr_err("Failed to setup switch dev for writeback panel");
return rc;
}
rc = platform_device_add(mdp_dev);
if (rc) {
WRITEBACK_MSG_ERR("failed to add device");
@ -91,16 +84,8 @@ static int writeback_probe(struct platform_device *pdev)
return rc;
}
static int writeback_remove(struct platform_device *pdev)
{
struct msm_fb_data_type *mfd = platform_get_drvdata(pdev);
switch_dev_unregister(&mfd->writeback_sdev);
return 0;
}
static struct platform_driver writeback_driver = {
.probe = writeback_probe,
.remove = writeback_remove,
.driver = {
.name = "writeback",
},

33
drivers/video/msm/msm_fb.c
View file

@ -3349,29 +3349,6 @@ static int msmfb_overlay_ioctl_writeback_terminate(struct fb_info *info)
return mdp4_writeback_terminate(info);
}
static int msmfb_overlay_ioctl_writeback_set_mirr_hint(struct fb_info *
info, void *argp)
{
int ret = 0, hint;
if (!info) {
ret = -EINVAL;
goto error;
}
ret = copy_from_user(&hint, argp, sizeof(hint));
if (ret)
goto error;
ret = mdp4_writeback_set_mirroring_hint(info, hint);
if (ret)
goto error;
error:
if (ret)
pr_err("%s: ioctl failed\n", __func__);
return ret;
}
#else
static int msmfb_overlay_ioctl_writeback_init(struct fb_info *info)
{
@ -3404,12 +3381,6 @@ static int msmfb_overlay_ioctl_writeback_terminate(struct fb_info *info)
{
return -ENOTSUPP;
}
static int msmfb_overlay_ioctl_writeback_set_mirr_hint(struct fb_info *
info, void *argp)
{
return -ENOTSUPP;
}
#endif
static int msmfb_overlay_3d_sbys(struct fb_info *info, unsigned long *argp)
@ -3796,10 +3767,6 @@ static int msm_fb_ioctl(struct fb_info *info, unsigned int cmd,
case MSMFB_WRITEBACK_TERMINATE:
ret = msmfb_overlay_ioctl_writeback_terminate(info);
break;
case MSMFB_WRITEBACK_SET_MIRRORING_HINT:
ret = msmfb_overlay_ioctl_writeback_set_mirr_hint(
info, argp);
break;
#endif
case MSMFB_VSYNC_CTRL:
case MSMFB_OVERLAY_VSYNC_CTRL:

3
drivers/video/msm/msm_fb.h
View file

@ -37,9 +37,7 @@
#include <linux/fb.h>
#include <linux/list.h>
#include <linux/types.h>
#include <linux/switch.h>
#include <linux/msm_mdp.h>
#ifdef CONFIG_HAS_EARLYSUSPEND
#include <linux/earlysuspend.h>
#endif
@ -182,7 +180,6 @@ struct msm_fb_data_type {
struct list_head writeback_busy_queue;
struct list_head writeback_free_queue;
struct list_head writeback_register_queue;
struct switch_dev writeback_sdev;
wait_queue_head_t wait_q;
struct ion_client *iclient;
unsigned long display_iova;

9
include/linux/msm_mdp.h
View file

@ -73,8 +73,6 @@
#define MSMFB_BUFFER_SYNC _IOW(MSMFB_IOCTL_MAGIC, 162, struct mdp_buf_sync)
#define MSMFB_DISPLAY_COMMIT _IOW(MSMFB_IOCTL_MAGIC, 164, \
struct mdp_display_commit)
#define MSMFB_WRITEBACK_SET_MIRRORING_HINT _IOW(MSMFB_IOCTL_MAGIC, 165, \
unsigned int)
#define MSMFB_METADATA_GET _IOW(MSMFB_IOCTL_MAGIC, 166, struct msmfb_metadata)
#define FB_TYPE_3D_PANEL 0x10101010
@ -576,13 +574,6 @@ enum {
ROTATOR_SUBSYSTEM_ID,
};
enum {
MDP_WRITEBACK_MIRROR_OFF,
MDP_WRITEBACK_MIRROR_ON,
MDP_WRITEBACK_MIRROR_PAUSE,
MDP_WRITEBACK_MIRROR_RESUME,
};
#ifdef __KERNEL__
/* get the framebuffer physical address information */