From patchwork Thu Jul 26 18:48:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1245011 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 11A173FC33 for ; Thu, 26 Jul 2012 20:26:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C1FAF9E8F3 for ; Thu, 26 Jul 2012 13:26:10 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) by gabe.freedesktop.org (Postfix) with ESMTP id D3FAB9E737 for ; Thu, 26 Jul 2012 12:56:52 -0700 (PDT) Received: by mail-wg0-f43.google.com with SMTP id dr1so1724686wgb.12 for ; Thu, 26 Jul 2012 12:56:52 -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=EVfEywM496Pm2tScOjoUWO1EefxGpaqvh0Q0FTO+CVE=; b=D36l2gBxH12LEfzIKMe+hVuoq79OhKdzR5dzvYGCqKyjl6rLTh8e7ahtLgCtTV6nUk UFndekIKGIFDWENzq65whv4SkerGWVv0QEnWsk02A2KVImWb7hosLYib2y6tCV6EvNQC JVE0SWrw4Vbv+Ut3HlNrpf35yd9s+ymTQCG70= 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=EVfEywM496Pm2tScOjoUWO1EefxGpaqvh0Q0FTO+CVE=; b=esvJGjUaPrtO2xJKVz06ffvqQKBGnGWasPW8y/QYfuhGB0BTZ2li4yfOUjET/apla6 6pBF1xlia592u8eJC5FsZIWntVMggf8NQsRG09Bi+MJ8Zu2m2+D4ZAPNwIw8VNwKwC35 cM2BKddmMD7oVdFtW31Mmj476Zb2l+/+ZLF6iLeqXWupjX6iP+97LYZvJ7nK3gc+eCoL GNun0BmkXSKf4BiVrr3PfPdNg7+rRs0eXqYxHdfxYnLpK0WafI+UkzmNXfgy2zINmhSK Ii6nFYkhyCfa/97u+cvlLHCCYDom9T9uPasPsvHOIsDUEBF/3ffwjtmO7ql62BJViL6z pByw== Received: by 10.180.97.106 with SMTP id dz10mr53811wib.21.1343332612640; Thu, 26 Jul 2012 12:56:52 -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 fr4sm391403wib.8.2012.07.26.12.56.51 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 Jul 2012 12:56:51 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 26 Jul 2012 20:48:58 +0200 Message-Id: <1343328581-2324-34-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1343328581-2324-1-git-send-email-daniel.vetter@ffwll.ch> References: <1343328581-2324-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQks2QRdJWroWVoaV0J7+oTlvjuVBBV6EmxdFl3c9tVIHMqq3rZkJJBx//akN81nrM0g0Mvr Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 33/76] drm/i915/tv: 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_tv.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c index 0876782..7828583 100644 --- a/drivers/gpu/drm/i915/intel_tv.c +++ b/drivers/gpu/drm/i915/intel_tv.c @@ -836,6 +836,21 @@ static struct intel_tv *intel_attached_tv(struct drm_connector *connector) base); } +static bool +intel_tv_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 tmp = I915_READ(TV_CTL); + + if (!(tmp & TV_ENC_ENABLE)) + return false; + + *pipe = PORT_TO_PIPE(tmp); + + return true; +} + static void intel_enable_tv(struct intel_encoder *encoder) { @@ -1619,6 +1634,8 @@ intel_tv_init(struct drm_device *dev) intel_encoder->enable = intel_enable_tv; intel_encoder->disable = intel_disable_tv; + intel_encoder->get_hw_state = intel_tv_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_TVOUT;