From patchwork Fri Oct 19 21:19:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 1619791 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 AD31FDF2AB for ; Fri, 19 Oct 2012 21:25:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 801AFA0E05 for ; Fri, 19 Oct 2012 14:25:11 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-yh0-f49.google.com (mail-yh0-f49.google.com [209.85.213.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 6410DA0DF2 for ; Fri, 19 Oct 2012 14:19:43 -0700 (PDT) Received: by mail-yh0-f49.google.com with SMTP id j52so166840yhj.36 for ; Fri, 19 Oct 2012 14:19:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=A1KVoBXsnTG9DV5J2zjhLIdGhpemlD6xhK0wODWJth4=; b=LIIh7PYjTAY2ZTm0Q7QhIh/IlV+e6YQdpWgI4b0U53JZrv9nsRJ8l9ADuYWet1DBNx SLLRUoJB3P19Lb/AMWt51VmbyVG7rUJci6jQSVMry4yf7UAx+Fc+OMhhWNcAlQzlD9iN /oLcbwwYM5tCnISBIc4JNTwWq8cAOSl+lOH0X/O32ynwo5+Env7owuEuHbBIgw5QgHbV jlrZlhDf9QE/MmEqSl8nOVtMwuKZiJ7e1ZpORV/U1iuDmNS9j7KuR19ProSHEARwCy7E MrADUHZ/eNh9Plo9641W8bAISy1dLJSsGTXP5MGMhJdGeDakbOxSM3+J4pDmZQd1nSTC nbew== Received: by 10.236.191.6 with SMTP id f6mr2296720yhn.126.1350681583008; Fri, 19 Oct 2012 14:19:43 -0700 (PDT) Received: from vicky.domain.invalid ([177.16.81.162]) by mx.google.com with ESMTPS id j8sm2233387ann.3.2012.10.19.14.19.41 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 19 Oct 2012 14:19:42 -0700 (PDT) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Fri, 19 Oct 2012 18:19:14 -0300 Message-Id: <1350681559-4553-5-git-send-email-przanoni@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1350681559-4553-1-git-send-email-przanoni@gmail.com> References: <1350681559-4553-1-git-send-email-przanoni@gmail.com> Cc: Paulo Zanoni Subject: [Intel-gfx] [PATCH 4/8] drm/i915: check TRANSCODER_EDP on intel_modeset_setup_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 From: Paulo Zanoni We need to check if any of the pipes is using TRANSCODER_EDP. Signed-off-by: Paulo Zanoni --- drivers/gpu/drm/i915/intel_display.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index a3228c1..8c3c131 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -8552,6 +8552,31 @@ void intel_modeset_setup_hw_state(struct drm_device *dev) struct intel_encoder *encoder; struct intel_connector *connector; + if (IS_HASWELL(dev)) { + tmp = I915_READ(DDI_FUNC_CTL(TRANSCODER_EDP)); + + if (tmp & TRANS_DDI_FUNC_ENABLE) { + switch (tmp & TRANS_DDI_EDP_INPUT_MASK) { + case TRANS_DDI_EDP_INPUT_A_ON: + case TRANS_DDI_EDP_INPUT_A_ONOFF: + pipe = PIPE_A; + break; + case TRANS_DDI_EDP_INPUT_B_ONOFF: + pipe = PIPE_B; + break; + case TRANS_DDI_EDP_INPUT_C_ONOFF: + pipe = PIPE_C; + break; + } + + crtc = to_intel_crtc(dev_priv->pipe_to_crtc_mapping[pipe]); + crtc->cpu_transcoder = TRANSCODER_EDP; + + DRM_DEBUG_KMS("Pipe %c using transcoder EDP\n", + pipe_name(pipe)); + } + } + for_each_pipe(pipe) { crtc = to_intel_crtc(dev_priv->pipe_to_crtc_mapping[pipe]);