From patchwork Thu Dec 15 20:53:24 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 5788 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 329A023E19 for ; Thu, 15 Dec 2011 20:53:31 +0000 (UTC) Received: from mail-ey0-f180.google.com (mail-ey0-f180.google.com [209.85.215.180]) by fiordland.canonical.com (Postfix) with ESMTP id 27DAEA183F5 for ; Thu, 15 Dec 2011 20:53:31 +0000 (UTC) Received: by eaak10 with SMTP id k10so2813591eaa.11 for ; Thu, 15 Dec 2011 12:53:31 -0800 (PST) Received: by 10.204.131.74 with SMTP id w10mr2378588bks.36.1323982410630; Thu, 15 Dec 2011 12:53:30 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.205.129.2 with SMTP id hg2cs53060bkc; Thu, 15 Dec 2011 12:53:30 -0800 (PST) Received: by 10.236.193.70 with SMTP id j46mr6895088yhn.108.1323982408392; Thu, 15 Dec 2011 12:53:28 -0800 (PST) Received: from mail-gy0-f178.google.com (mail-gy0-f178.google.com [209.85.160.178]) by mx.google.com with ESMTPS id p12si1879954and.110.2011.12.15.12.53.27 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 15 Dec 2011 12:53:28 -0800 (PST) Received-SPF: pass (google.com: domain of robdclark@gmail.com designates 209.85.160.178 as permitted sender) client-ip=209.85.160.178; Authentication-Results: mx.google.com; spf=pass (google.com: domain of robdclark@gmail.com designates 209.85.160.178 as permitted sender) smtp.mail=robdclark@gmail.com; dkim=pass (test mode) header.i=@gmail.com Received: by ghbg21 with SMTP id g21so2088337ghb.37 for ; Thu, 15 Dec 2011 12:53:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer; bh=wBvTu01QvK5Wvk3rB3vcOcje4fdmCm6eOVRZwHvsGZQ=; b=JRC1EAKivNeE404f1todd5AuMCERDrxxh4n5XtKkRCKNsi4a1NeK2Id+b20PHlDm8g OEeSKfrLgjSFmhikypiDFqDBpodRYECKC6bTZRQ6nYfTNaWdxjIj4AXBIxie5mkJcNpw E6yefXW/QlZ5HM4hq3N6ajwZwwWY/3h2BYLUQ= Received: by 10.101.27.25 with SMTP id e25mr2056333anj.5.1323982407730; Thu, 15 Dec 2011 12:53:27 -0800 (PST) Received: from localhost (ppp-70-253-156-7.dsl.rcsntx.swbell.net. [70.253.156.7]) by mx.google.com with ESMTPS id i32sm13106957anm.6.2011.12.15.12.53.26 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 15 Dec 2011 12:53:27 -0800 (PST) Sender: Rob Clark From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: patches@linaro.org, Rob Clark Subject: [PATCH] drm: call connector dpms fxn, when setting config Date: Thu, 15 Dec 2011 14:53:24 -0600 Message-Id: <1323982404-22396-1-git-send-email-rob.clark@linaro.org> X-Mailer: git-send-email 1.7.5.4 From: Rob Clark Call connector->funcs->dpms(DPMS_ON) rather than just setting connector->dpms = DPMS_ON. This ensures that if the connector has something to do to enable the output (rather than just using drm_helper_connector_dpms helper directly), that this happens at bootup. This solves an issue with connectors not getting enabled from fbcon_init() when the driver is loaded. Signed-off-by: Rob Clark Reviewed-by: Adam Jackson --- drivers/gpu/drm/drm_crtc_helper.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c index d2619d7..2f1ec7c 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/drivers/gpu/drm/drm_crtc_helper.c @@ -710,7 +710,7 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set) for (i = 0; i < set->num_connectors; i++) { DRM_DEBUG_KMS("\t[CONNECTOR:%d:%s] set DPMS on\n", set->connectors[i]->base.id, drm_get_connector_name(set->connectors[i])); - set->connectors[i]->dpms = DRM_MODE_DPMS_ON; + set->connectors[i]->funcs->dpms(set->connectors[i], DRM_MODE_DPMS_ON); } } drm_helper_disable_unused_functions(dev);