From 9a200d7559f936e1f9334f4f2ad9c9e7d0f41e04 Mon Sep 17 00:00:00 2001 From: "Ucan, Emre (ADITG/SW1)" Date: Thu, 2 Feb 2017 14:06:56 +0000 Subject: [PATCH] compositor-drm: don't pass option_connector to create_outputs The connector option is a part of drm_backend struct. Therefore, it is not needed to pass it as an argument to create_outputs function. Signed-off-by: Emre Ucan Reviewed-by: Pekka Paalanen Acked-by: Daniel Stone --- libweston/compositor-drm.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c index 073dc194..7f1eeda9 100644 --- a/libweston/compositor-drm.c +++ b/libweston/compositor-drm.c @@ -2664,8 +2664,7 @@ destroy_sprites(struct drm_backend *backend) } static int -create_outputs(struct drm_backend *b, uint32_t option_connector, - struct udev_device *drm_device) +create_outputs(struct drm_backend *b, struct udev_device *drm_device) { drmModeConnector *connector; drmModeRes *resources; @@ -2689,8 +2688,8 @@ create_outputs(struct drm_backend *b, uint32_t option_connector, continue; if (connector->connection == DRM_MODE_CONNECTED && - (option_connector == 0 || - connector->connector_id == option_connector)) { + (b->connector == 0 || + connector->connector_id == b->connector)) { if (create_output_for_connector(b, resources, connector, drm_device) < 0) { drmModeFreeConnector(connector); @@ -3228,7 +3227,7 @@ drm_backend_create(struct weston_compositor *compositor, b->connector = config->connector; - if (create_outputs(b, config->connector, drm_device) < 0) { + if (create_outputs(b, drm_device) < 0) { weston_log("failed to create output for %s\n", path); goto err_udev_input; }