From patchwork Wed Jul 11 14:28:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1183901 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id C54C3DF25A for ; Wed, 11 Jul 2012 16:07:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7D5D8A0EB9 for ; Wed, 11 Jul 2012 09:07:00 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by gabe.freedesktop.org (Postfix) with ESMTP id 9693A9ED8F for ; Wed, 11 Jul 2012 08:36:01 -0700 (PDT) Received: by mail-wi0-f171.google.com with SMTP id hq4so3953871wib.12 for ; Wed, 11 Jul 2012 08:36:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=MyIY4F6CC8PH3/qyY1Lr8KNkpeaahUuYSU2S5Zm+ooI=; b=MXxLgelCb/8OJDlQnbBO7ORF/AyBUSG4n5YQVysd38hmbgK1GcCS8Dq3xHju4Bd/iu TfYXOq+Cmw61NR1WUJOwHPRaczm6ixOzXQFy44FqH+anL0IuslMT8kmqicN0lKLt4rNI 93FfdGVq7mTxGvjeAunTLd+iaysOgPmE0YRmc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=MyIY4F6CC8PH3/qyY1Lr8KNkpeaahUuYSU2S5Zm+ooI=; b=JlT9fJ/6sxinpw4o4BpX453Pzto1ubYEZ4KMhAsBip6zHQrCIB1UsuQ21ECTOkugAO gp8EGv9cvN3mfUoxdjK4MuztAJuBDf3dZBgDKoTZBF4OWK1WpfsULETTweh21GTUgraq fLFdh/4KbquQhTGvB29K34GBQshftwMXdSFN917M6UWwXrHQO2p1+tz5CXXY7pB4tFxw FwW28NzDnbbbIEB0R7OQ3/3HtmIqUMvWLfQnviqB49F2trJrYxWV+lc7MqVeowCYtEO7 CqQIAjcCyX8D3UjQx8qljwlpB4BBCbdxmKobaAjHh5jsBzBmWLuXN7s7mvLL3ScAlAmT IpPg== Received: by 10.216.180.197 with SMTP id j47mr8266029wem.35.1342020961327; Wed, 11 Jul 2012 08:36:01 -0700 (PDT) Received: from wespe.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id bc2sm5777080wib.0.2012.07.11.08.35.59 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 11 Jul 2012 08:36:00 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Wed, 11 Jul 2012 16:28:22 +0200 Message-Id: <1342016944-23395-40-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1342016944-23395-1-git-send-email-daniel.vetter@ffwll.ch> References: <1342016944-23395-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQnKtP+/aLf+7JGFUSNaJOMobLfphIc2Y+hKAQd96gRV8+GgwyszFezMjfMMZfhwP625HLeo Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 39/81] drm/i915/crt: implement get_hw_state X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Note that even though this connector is cloneable we still can use the exact same test to check whether the connector is on or whether the encoder is enabled - both the dpms code and the encoder disable/enable frob the exact same hw state. For dvo/sdvo outputs, this will be different. Signed-Off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_crt.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c index 7ea986c..0a5b61a 100644 --- a/drivers/gpu/drm/i915/intel_crt.c +++ b/drivers/gpu/drm/i915/intel_crt.c @@ -61,6 +61,27 @@ static struct intel_crt *intel_encoder_to_crt(struct intel_encoder *encoder) return container_of(encoder, struct intel_crt, base); } +static bool intel_crt_get_hw_state(struct intel_encoder *encoder, + enum pipe *pipe) +{ + struct drm_device *dev = encoder->base.dev; + struct drm_i915_private *dev_priv = dev->dev_private; + struct intel_crt *crt = intel_encoder_to_crt(encoder); + u32 tmp; + + tmp = I915_READ(crt->adpa_reg); + + if (!(tmp & ADPA_DAC_ENABLE)) + return false; + + if (HAS_PCH_CPT(dev)) + *pipe = PORT_TO_PIPE_CPT(tmp); + else + *pipe = PORT_TO_PIPE(tmp); + + return true; +} + static void intel_disable_crt(struct intel_encoder *encoder) { struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; @@ -717,6 +738,8 @@ void intel_crt_init(struct drm_device *dev) crt->base.disable = intel_disable_crt; crt->base.enable = intel_enable_crt; + crt->base.get_hw_state = intel_crt_get_hw_state; + intel_connector->get_hw_state = intel_connector_get_hw_state; drm_encoder_helper_add(&crt->base.base, &crt_encoder_funcs); drm_connector_helper_add(connector, &intel_crt_connector_helper_funcs);