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. --- Android.mk | 1 - gralloc_drm_intel.c | 6 +- gralloc_drm_kms.c | 258 ++++++++++------------------------------------------ gralloc_drm_priv.h | 29 +----- 4 files changed, 56 insertions(+), 238 deletions(-) diff --git a/Android.mk b/Android.mk index e675a00..2a61b01 100644 --- a/Android.mk +++ b/Android.mk @@ -80,7 +80,6 @@ LOCAL_SHARED_LIBRARIES := \ libdrm \ liblog \ libcutils \ - libhardware_legacy \ # for glFlush/glFinish LOCAL_SHARED_LIBRARIES += \ diff --git a/gralloc_drm_intel.c b/gralloc_drm_intel.c index 6a0d7e0..519827f 100644 --- a/gralloc_drm_intel.c +++ b/gralloc_drm_intel.c @@ -497,12 +497,12 @@ static void intel_init_kms_features(struct gralloc_drm_drv_t *drv, struct drm_i915_getparam gp; int pageflipping, id; - switch (drm->primary.fb_format) { + switch (drm->fb_format) { case HAL_PIXEL_FORMAT_BGRA_8888: case HAL_PIXEL_FORMAT_RGB_565: break; default: - drm->primary.fb_format = HAL_PIXEL_FORMAT_BGRA_8888; + drm->fb_format = HAL_PIXEL_FORMAT_BGRA_8888; break; } @@ -545,7 +545,7 @@ static void intel_init_kms_features(struct gralloc_drm_drv_t *drv, int pipe; pipe = drm_intel_get_pipe_from_crtc_id(info->bufmgr, - drm->primary.crtc_id); + drm->crtc_id); drm->swap_interval = (pipe >= 0) ? 1 : 0; drm->vblank_secondary = (pipe > 0); } diff --git a/gralloc_drm_kms.c b/gralloc_drm_kms.c index 57870f7..8607285 100644 --- a/gralloc_drm_kms.c +++ b/gralloc_drm_kms.c @@ -30,10 +30,8 @@ #include #include #include -#include #include "gralloc_drm.h" #include "gralloc_drm_priv.h" -#include #include @@ -138,17 +136,14 @@ void gralloc_drm_bo_rm_fb(struct gralloc_drm_bo_t *bo) /* * Program CRTC. */ -static int drm_kms_set_crtc(struct gralloc_drm_t *drm, - struct gralloc_drm_output *output, int fb_id) +static int drm_kms_set_crtc(struct gralloc_drm_t *drm, int fb_id) { int ret; - ret = drmModeSetCrtc(drm->fd, output->crtc_id, fb_id, - 0, 0, &output->connector_id, 1, &output->mode); + ret = drmModeSetCrtc(drm->fd, drm->crtc_id, fb_id, + 0, 0, &drm->connector_id, 1, &drm->mode); if (ret) { - ALOGE("failed to set crtc (%s) (crtc_id %d, fb_id %d, conn %d, mode %dx%d)", - strerror(errno), output->crtc_id, fb_id, output->connector_id, - output->mode.hdisplay, output->mode.vdisplay); + ALOGE("failed to set crtc"); return ret; } @@ -196,23 +191,10 @@ static int drm_kms_page_flip(struct gralloc_drm_t *drm, if (!bo) return 0; - pthread_mutex_lock(&drm->hdmi_mutex); - if (drm->hdmi.active && drm->hdmi_mode == HDMI_CLONED) { - ret = drmModePageFlip(drm->fd, drm->hdmi.crtc_id, bo->fb_id, 0, NULL); - if (ret && errno != EBUSY) - ALOGE("failed to perform page flip for hdmi (%s) (crtc %d fb %d))", - strerror(errno), drm->hdmi.crtc_id, bo->fb_id); - } - pthread_mutex_unlock(&drm->hdmi_mutex); - - ret = drmModePageFlip(drm->fd, drm->primary.crtc_id, bo->fb_id, + ret = drmModePageFlip(drm->fd, drm->crtc_id, bo->fb_id, DRM_MODE_PAGE_FLIP_EVENT, (void *) drm); - if (ret) { - ALOGE("failed to perform page flip for primary (%s) (crtc %d fb %d))", - strerror(errno), drm->primary.crtc_id, bo->fb_id); - /* try to set mode for next frame */ - drm->first_post = 1; - } + if (ret) + ALOGE("failed to perform page flip"); else drm->next_front = bo; @@ -304,7 +286,7 @@ int gralloc_drm_bo_post(struct gralloc_drm_bo_t *bo) bo = dst; } - ret = drm_kms_set_crtc(drm, &drm->primary, bo->fb_id); + ret = drm_kms_set_crtc(drm, bo->fb_id); if (!ret) { drm->first_post = 0; drm->current_front = bo; @@ -312,11 +294,6 @@ int gralloc_drm_bo_post(struct gralloc_drm_bo_t *bo) drm->next_front = NULL; } - pthread_mutex_lock(&drm->hdmi_mutex); - if (drm->hdmi.active && drm->hdmi_mode == HDMI_CLONED) - drm_kms_set_crtc(drm, &drm->hdmi, bo->fb_id); - pthread_mutex_unlock(&drm->hdmi_mutex); - return ret; } @@ -348,13 +325,7 @@ int gralloc_drm_bo_post(struct gralloc_drm_bo_t *bo) break; case DRM_SWAP_SETCRTC: drm_kms_wait_for_post(drm, 0); - ret = drm_kms_set_crtc(drm, &drm->primary, bo->fb_id); - - pthread_mutex_lock(&drm->hdmi_mutex); - if (drm->hdmi.active && drm->hdmi_mode == HDMI_CLONED) - drm_kms_set_crtc(drm, &drm->hdmi, bo->fb_id); - pthread_mutex_unlock(&drm->hdmi_mutex); - + ret = drm_kms_set_crtc(drm, bo->fb_id); drm->current_front = bo; break; default: @@ -417,9 +388,9 @@ static void drm_kms_init_features(struct gralloc_drm_t *drm) /* create the real front buffer */ front = gralloc_drm_bo_create(drm, - drm->primary.mode.hdisplay, - drm->primary.mode.vdisplay, - drm->primary.fb_format, + drm->mode.hdisplay, + drm->mode.vdisplay, + drm->fb_format, GRALLOC_USAGE_HW_FB); if (front && gralloc_drm_bo_add_fb(front)) { gralloc_drm_bo_decref(front); @@ -513,7 +484,7 @@ static drmModeModeInfoPtr find_mode(drmModeConnectorPtr connector, int *bpp) * Initialize KMS with a connector. */ static int drm_kms_init_with_connector(struct gralloc_drm_t *drm, - struct gralloc_drm_output *output, drmModeConnectorPtr connector) + drmModeConnectorPtr connector) { drmModeEncoderPtr encoder; drmModeModeInfoPtr mode; @@ -526,18 +497,16 @@ static int drm_kms_init_with_connector(struct gralloc_drm_t *drm, if (!encoder) return -EINVAL; - /* find first possible crtc which is not used yet */ for (i = 0; i < drm->resources->count_crtcs; i++) { - if (encoder->possible_crtcs & (1 << i) && - i != drm->primary.crtc_id) + if (encoder->possible_crtcs & (1 << i)) break; } drmModeFreeEncoder(encoder); if (i == drm->resources->count_crtcs) return -EINVAL; - output->crtc_id = drm->resources->crtcs[i]; - output->connector_id = connector->connector_id; + drm->crtc_id = drm->resources->crtcs[i]; + drm->connector_id = connector->connector_id; /* print connector info */ if (connector->count_modes > 1) { @@ -557,143 +526,41 @@ static int drm_kms_init_with_connector(struct gralloc_drm_t *drm, ALOGI("the best mode is %s", mode->name); - output->mode = *mode; + drm->mode = *mode; switch (bpp) { case 2: - output->fb_format = HAL_PIXEL_FORMAT_RGB_565; + drm->fb_format = HAL_PIXEL_FORMAT_RGB_565; break; case 4: default: - output->fb_format = HAL_PIXEL_FORMAT_BGRA_8888; + drm->fb_format = HAL_PIXEL_FORMAT_BGRA_8888; break; } if (connector->mmWidth && connector->mmHeight) { - output->xdpi = (output->mode.hdisplay * 25.4 / connector->mmWidth); - output->ydpi = (output->mode.vdisplay * 25.4 / connector->mmHeight); + drm->xdpi = (drm->mode.hdisplay * 25.4 / connector->mmWidth); + drm->ydpi = (drm->mode.vdisplay * 25.4 / connector->mmHeight); } else { - output->xdpi = 75; - output->ydpi = 75; + drm->xdpi = 75; + drm->ydpi = 75; } #ifdef DRM_MODE_FEATURE_DIRTYFB drm->clip.x1 = 0; drm->clip.y1 = 0; - drm->clip.x2 = output->mode.hdisplay; - drm->clip.y2 = output->mode.vdisplay; + drm->clip.x2 = drm->mode.hdisplay; + drm->clip.y2 = drm->mode.vdisplay; #endif return 0; } - -/* - * Fetch a connector of particular type - */ -static drmModeConnectorPtr fetch_connector(struct gralloc_drm_t *drm, - uint32_t type) -{ - int i; - - if (!drm->resources) - return NULL; - - for (i = 0; i < drm->resources->count_connectors; i++) { - drmModeConnectorPtr connector = - connector = drmModeGetConnector(drm->fd, - drm->resources->connectors[i]); - if (connector) { - if (connector->connector_type == type && - connector->connection == DRM_MODE_CONNECTED) - return connector; - drmModeFreeConnector(connector); - } - } - return NULL; -} - - -/* - * Thread that listens to uevents and checks if hdmi state changes - */ -static void *hdmi_observer(void *data) -{ - static char uevent_desc[4096]; - drmModeConnectorPtr hdmi; - struct gralloc_drm_t *drm = - (struct gralloc_drm_t *) data; - - uevent_init(); - - memset(uevent_desc, 0, sizeof(uevent_desc)); - - while(1) { - - /* this polls */ - int len = uevent_next_event(uevent_desc, sizeof(uevent_desc) - 2); - - if(len && strstr(uevent_desc, "devices/virtual/switch/hdmi")) { - - /* check what changed */ - const char *prop = uevent_desc + strlen(uevent_desc) + 1; - - while (*prop) { - - const char *state = strstr(prop, "SWITCH_STATE="); - if (state) { - unsigned int value = 0; - state += strlen("SWITCH_STATE="); - value = atoi(state); - - pthread_mutex_lock(&drm->hdmi_mutex); - - if (value) { - hdmi = fetch_connector(drm, DRM_MODE_CONNECTOR_HDMIA); - if (hdmi) { - drm_kms_init_with_connector(drm, &drm->hdmi, hdmi); - drmModeFreeConnector(hdmi); - - /* will trigger modeset */ - drm->first_post = 1; - - /* HACK, assume same mode for now */ - memcpy(&drm->hdmi.mode, &drm->primary.mode, - sizeof(drmModeModeInfo)); - - drm->hdmi_mode = HDMI_CLONED; - drm->hdmi.active = 1; - pthread_mutex_unlock(&drm->hdmi_mutex); - } - break; - } else { - drm->hdmi.active = 0; - pthread_mutex_unlock(&drm->hdmi_mutex); - break; - } - - pthread_mutex_unlock(&drm->hdmi_mutex); - } - - /* next property/value pair */ - prop += strlen(prop) + 1; - if (prop - uevent_desc >= len) - break; - } - } - } - - pthread_exit(NULL); - return 0; -} - - /* * Initialize KMS. */ int gralloc_drm_init_kms(struct gralloc_drm_t *drm) { - drmModeConnectorPtr lvds, hdmi; int i, ret; if (drm->resources) @@ -732,58 +599,29 @@ int gralloc_drm_init_kms(struct gralloc_drm_t *drm) } /* find the crtc/connector/mode to use */ - lvds = fetch_connector(drm, DRM_MODE_CONNECTOR_LVDS); - if (lvds) { - drm_kms_init_with_connector(drm, &drm->primary, lvds); - drmModeFreeConnector(lvds); - drm->primary.active = 1; - } - - /* if still no connector, find first connected connector and try it */ - if (!drm->primary.active) { - - for (i = 0; i < drm->resources->count_connectors; i++) { - drmModeConnectorPtr connector; - - connector = drmModeGetConnector(drm->fd, - drm->resources->connectors[i]); - if (connector) { - if (connector->connection == DRM_MODE_CONNECTED) { - if (!drm_kms_init_with_connector(drm, - &drm->primary, connector)) - break; - } + for (i = 0; i < drm->resources->count_connectors; i++) { + drmModeConnectorPtr connector; - drmModeFreeConnector(connector); + connector = drmModeGetConnector(drm->fd, + drm->resources->connectors[i]); + if (connector) { + if (connector->connection == DRM_MODE_CONNECTED) { + if (!drm_kms_init_with_connector(drm, + connector)) + break; } - } - if (i == drm->resources->count_connectors) { - ALOGE("failed to find a valid crtc/connector/mode combination"); - drmModeFreeResources(drm->resources); - drm->resources = NULL; - return -EINVAL; + drmModeFreeConnector(connector); } } + if (i == drm->resources->count_connectors) { + ALOGE("failed to find a valid crtc/connector/mode combination"); + drmModeFreeResources(drm->resources); + drm->resources = NULL; - /* check if hdmi is connected already */ - hdmi = fetch_connector(drm, DRM_MODE_CONNECTOR_HDMIA); - if (hdmi) { - drm_kms_init_with_connector(drm, &drm->hdmi, hdmi); - drmModeFreeConnector(hdmi); - - /* HACK, assume same mode for now */ - memcpy(&drm->hdmi.mode, &drm->primary.mode, - sizeof(drmModeModeInfo)); - - drm->hdmi_mode = HDMI_CLONED; - drm->hdmi.active = 1; + return -EINVAL; } - /* launch hdmi observer thread */ - pthread_mutex_init(&drm->hdmi_mutex, NULL); - pthread_create(&drm->hdmi_hotplug_thread, NULL, hdmi_observer, drm); - drm_kms_init_features(drm); drm->first_post = 1; @@ -845,14 +683,14 @@ void gralloc_drm_get_kms_info(struct gralloc_drm_t *drm, struct framebuffer_device_t *fb) { *((uint32_t *) &fb->flags) = 0x0; - *((uint32_t *) &fb->width) = drm->primary.mode.hdisplay; - *((uint32_t *) &fb->height) = drm->primary.mode.vdisplay; - *((int *) &fb->stride) = drm->primary.mode.hdisplay; - *((float *) &fb->fps) = drm->primary.mode.vrefresh; - - *((int *) &fb->format) = drm->primary.fb_format; - *((float *) &fb->xdpi) = drm->primary.xdpi; - *((float *) &fb->ydpi) = drm->primary.ydpi; + *((uint32_t *) &fb->width) = drm->mode.hdisplay; + *((uint32_t *) &fb->height) = drm->mode.vdisplay; + *((int *) &fb->stride) = drm->mode.hdisplay; + *((float *) &fb->fps) = drm->mode.vrefresh; + + *((int *) &fb->format) = drm->fb_format; + *((float *) &fb->xdpi) = drm->xdpi; + *((float *) &fb->ydpi) = drm->ydpi; *((int *) &fb->minSwapInterval) = drm->swap_interval; *((int *) &fb->maxSwapInterval) = drm->swap_interval; } 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