From 8075c812370fdc1aeb049322c6033d35eb4cd530 Mon Sep 17 00:00:00 2001 From: Daniel Leung Date: Tue, 23 Oct 2012 15:31:34 -0700 Subject: Revert "gralloc: hdmi cloned mode support" This reverts commit 2d2758bca0f962ef21673dbe29df4c042d7f3254. --- gralloc_drm_priv.h | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) (limited to 'gralloc_drm_priv.h') diff --git a/gralloc_drm_priv.h b/gralloc_drm_priv.h index a6dad10..d22fea0 100644 --- a/gralloc_drm_priv.h +++ b/gralloc_drm_priv.h @@ -37,26 +37,10 @@ enum drm_swap_mode { DRM_SWAP_SETCRTC, }; -enum hdmi_output_mode { - HDMI_CLONED, - HDMI_EXTENDED, -}; - struct gralloc_drm_plane_t { drmModePlane *drm_plane; }; -struct gralloc_drm_output -{ - uint32_t crtc_id; - uint32_t connector_id; - drmModeModeInfo mode; - int xdpi, ydpi; - int fb_format; - int bpp; - uint32_t active; -}; - struct gralloc_drm_t { /* initialized by gralloc_drm_create */ int fd; @@ -64,19 +48,16 @@ struct gralloc_drm_t { /* initialized by gralloc_drm_init_kms */ drmModeResPtr resources; - struct gralloc_drm_output primary; - struct gralloc_drm_output hdmi; - enum hdmi_output_mode hdmi_mode; - - /* hdmi hotplug */ - pthread_mutex_t hdmi_mutex; - pthread_t hdmi_hotplug_thread; - + uint32_t crtc_id; + uint32_t connector_id; + drmModeModeInfo mode; + int xdpi, ydpi; #ifdef DRM_MODE_FEATURE_DIRTYFB drmModeClip clip; #endif /* initialized by drv->init_kms_features */ + int fb_format; enum drm_swap_mode swap_mode; int swap_interval; int mode_quirk_vmwgfx; -- cgit v1.1