From 5ab6f730635249181ab88bed889b13d6b81d6e6e Mon Sep 17 00:00:00 2001 From: "yifei.xue" Date: Tue, 7 Feb 2012 10:38:08 +0800 Subject: [PATCH] Graphics: add support for disable HDMI config BZ: 20871 While disable the CONFIG_MDFD_HDMI, add two MACRO to disable the hdmi_do_hotplug_wq and hdmi_do_audio_wq to make compiling successful. Change-Id: I09f4fc1bfcc3f6a0a8d6aaa7a2b3e90f7ff51ca9 Signed-off-by: yifei.xue Signed-off-by: Tong, Bo Reviewed-on: http://android.intel.com:8080/34261 Reviewed-by: buildbot Tested-by: buildbot --- drivers/staging/mrst/drv/psb_drv.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/staging/mrst/drv/psb_drv.c b/drivers/staging/mrst/drv/psb_drv.c index ff24d53..1912d14 100644 --- a/drivers/staging/mrst/drv/psb_drv.c +++ b/drivers/staging/mrst/drv/psb_drv.c @@ -1111,6 +1111,7 @@ bool mrst_get_vbt_data(struct drm_psb_private *dev_priv) return true; } +#ifdef CONFIG_MDFD_HDMI void hdmi_do_hotplug_wq(struct work_struct *work) { u8 data = 0; @@ -1208,6 +1209,7 @@ void hdmi_do_audio_wq(struct work_struct *work) } #endif } +#endif static int psb_do_init(struct drm_device *dev) { @@ -1798,9 +1800,11 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset) gl3_enable(); #endif +#ifdef CONFIG_MDFD_HDMI atomic_set(&dev_priv->hotplug_wq_done, 0); INIT_WORK(&dev_priv->hdmi_hotplug_wq, hdmi_do_hotplug_wq); INIT_WORK(&dev_priv->hdmi_audio_wq, hdmi_do_audio_wq); +#endif /*Intel drm driver load is done, continue doing pvr load*/ DRM_DEBUG("Pvr driver load\n"); -- 2.7.4