From 3b0a6686ce9abefc29ad8e878f0089bf00c1dc24 Mon Sep 17 00:00:00 2001 From: Ying Gao Date: Thu, 29 Mar 2012 19:43:26 -0700 Subject: [PATCH] gfx: change HDMI modes from Android application Enable standalone Android application to change HDMI modes. This is used for compliance testing, towards ANDROID-167. Signed-off-by: Mohan Kandra Signed-off-by: Artem Bityutskiy --- drivers/staging/mrst/Makefile | 2 ++ drivers/staging/mrst/drv/psb_drm.h | 9 ++++++++- drivers/staging/mrst/imgv/psb_msvdx.c | 7 +++++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/drivers/staging/mrst/Makefile b/drivers/staging/mrst/Makefile index 530a340..248bc8e 100644 --- a/drivers/staging/mrst/Makefile +++ b/drivers/staging/mrst/Makefile @@ -75,6 +75,8 @@ ccflags-$(CONFIG_PVR_DEBUG) += -DDEBUG ccflags-$(CONFIG_PCI_MSI) += -DCONFIG_PCI_MSI ccflags-$(CONFIG_MDFD_GL3) += -DSUPPORT_EXTERNAL_SYSTEM_CACHE +ccflags-$(CONFIG_MDFD_HDMI) += -DHDMI_MODE_SETTING + PVRSRV_RESOURCE_PROFILING = PERPROC_LIST = RES_MAN_EXTEND = diff --git a/drivers/staging/mrst/drv/psb_drm.h b/drivers/staging/mrst/drv/psb_drm.h index 13f20b8..dabaf3c 100644 --- a/drivers/staging/mrst/drv/psb_drm.h +++ b/drivers/staging/mrst/drv/psb_drm.h @@ -282,7 +282,14 @@ typedef enum { IMG_VIDEO_DECODE_STATUS, IMG_VIDEO_NEW_CONTEXT, IMG_VIDEO_RM_CONTEXT, - IMG_VIDEO_MB_ERROR + IMG_VIDEO_MB_ERROR, + IMG_VIDEO_SET_DISPLAYING_FRAME, + IMG_VIDEO_GET_DISPLAYING_FRAME, + IMG_VIDEO_GET_HDMI_STATE, + IMG_VIDEO_SET_HDMI_STATE, +#ifdef HDMI_MODE_SETTING + OTM_HDMI_SET_HDMI_MODE_VIC +#endif } lnc_getparam_key_t; struct drm_lnc_video_getparam_arg { diff --git a/drivers/staging/mrst/imgv/psb_msvdx.c b/drivers/staging/mrst/imgv/psb_msvdx.c index dd5536a..afe2785 100644 --- a/drivers/staging/mrst/imgv/psb_msvdx.c +++ b/drivers/staging/mrst/imgv/psb_msvdx.c @@ -1392,8 +1392,11 @@ int lnc_video_getparam(struct drm_device *dev, void *data, return -EFAULT; } break; - - +#ifdef HDMI_MODE_SETTING + case OTM_HDMI_SET_HDMI_MODE_VIC: + otm_cmdline_set_vic_option((int)arg->value); + break; +#endif default: ret = -EFAULT; break; -- 2.7.4