From patchwork Tue Jul 3 09:28:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1150481 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 ED80BDFF72 for ; Tue, 3 Jul 2012 11:04:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D62CDA01FF for ; Tue, 3 Jul 2012 04:04:20 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-we0-f177.google.com (mail-we0-f177.google.com [74.125.82.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 45D389F61B for ; Tue, 3 Jul 2012 03:35:16 -0700 (PDT) Received: by mail-we0-f177.google.com with SMTP id b13so1638092wer.36 for ; Tue, 03 Jul 2012 03:35:16 -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=xWB0POvDwfs/6Kz/0Mh+Qt+f15bUdUCnumc8VyL5MY8=; b=lpqmX+9TnEmQmlnlS2RwuiWyaqg7mMj/eid77D74iiK9FFcQYQTzyXmEQ4KCeaqtok 1H8+WqdeHO1v6tz/pJNuz5AXdRi1m+ramKnXIdi+7/wWM4HfzidjXFhXwk/6Pe+7kLKM BcnrX4ZVg6CxSW3wp3VQYRni7hXEpunUAu7Yk= 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=xWB0POvDwfs/6Kz/0Mh+Qt+f15bUdUCnumc8VyL5MY8=; b=j7zThW8RqJsy75xjLRX0gR9VbEn2gqlZht4ripWVyyfR15nvIq8pbzcN07dD+bYCnG HgaPoSa6FJqMOUWpbq/advlytguB9UAyeH4pussb6y/H1Rko0NN036xYJg7w30j+uUFB zHtq9CA7NjZvS9xDkiCfeCp4MhER20tY4Sx88IAHuC0BrU95rXz8RheOjr8uzLxylPSE WAOeJgWP3eYMUL95O3a0+kRK1SCiFmumfZN2mMpA9bWx8S3B4yBK08jun+0FstlIrDmM 06gGtR7FX8TRi1nnJQ+VOPNgxB+8fD+NhJ0Nc7BQhANOmtnG7JF7hr+J5IGVZzvgA9bt PNCQ== Received: by 10.180.86.106 with SMTP id o10mr4509875wiz.22.1341311715992; Tue, 03 Jul 2012 03:35:15 -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 e9sm14845138wiw.10.2012.07.03.03.35.14 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 03 Jul 2012 03:35:15 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Tue, 3 Jul 2012 11:28:30 +0200 Message-Id: <1341307715-3886-39-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1341307715-3886-1-git-send-email-daniel.vetter@ffwll.ch> References: <1341307715-3886-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQmypeilj22zJuC7mj+L32BeG3DZB5gyZ84v36/xh1e97+o6uAClS/+ofve+FH6yTCbKBI6G Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 38/43] drm/i915/lvds: 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 Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_lvds.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c index 7fb4bc1..7bcd4b2 100644 --- a/drivers/gpu/drm/i915/intel_lvds.c +++ b/drivers/gpu/drm/i915/intel_lvds.c @@ -65,6 +65,32 @@ static struct intel_lvds *intel_attached_lvds(struct drm_connector *connector) struct intel_lvds, base); } +static bool intel_lvds_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; + u32 lvds_reg, tmp; + + if (HAS_PCH_SPLIT(dev)) { + lvds_reg = PCH_LVDS; + } else { + lvds_reg = LVDS; + } + + tmp = I915_READ(lvds_reg); + + if (!(tmp & LVDS_PORT_EN)) + return false; + + if (HAS_PCH_CPT(dev)) + *pipe = PORT_TO_PIPE_CPT(tmp); + else + *pipe = PORT_TO_PIPE(tmp); + + return true; +} + /** * Sets the power state for the panel. */ @@ -938,6 +964,8 @@ bool intel_lvds_init(struct drm_device *dev) intel_encoder->enable = intel_enable_lvds; intel_encoder->disable = intel_disable_lvds; + intel_encoder->get_hw_state = intel_lvds_get_hw_state; + intel_connector->get_hw_state = intel_connector_get_hw_state; intel_connector_attach_encoder(intel_connector, intel_encoder); intel_encoder->type = INTEL_OUTPUT_LVDS;