From patchwork Thu Oct 18 21:21:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 1613711 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 376FD40AF4 for ; Thu, 18 Oct 2012 21:27:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 310B5A0AD0 for ; Thu, 18 Oct 2012 14:27:21 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-gh0-f177.google.com (mail-gh0-f177.google.com [209.85.160.177]) by gabe.freedesktop.org (Postfix) with ESMTP id EFEDBA0AB1 for ; Thu, 18 Oct 2012 14:22:21 -0700 (PDT) Received: by mail-gh0-f177.google.com with SMTP id f20so2458142ghb.36 for ; Thu, 18 Oct 2012 14:22:21 -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=Fy7m3x0W8s5KPdpCaHEqugs6dRAuoAJdGdgyn7gz+FY=; b=rTNyQ5vsf5W9PjTvH8ESpizq3RAaU2wKqdfE4CYyY7/9II1uNDg8+njUhCrZIY2hlb W5PEnQpmyt2jps7LCmYLFZHwmUC4tWwl7Uasg8ZLJsyx+3feBg70yy2VrcvdNwvweg5D WXIv/71c3+NWUQhvV4hdrcrVfUTNFHKDjTz3l7UGAmsF9sF5ywE+lnGxoMaKtcePpTYp VCGJYMuM137pTz6xRfbhALJEtu0kGZg9Ntb7xrLhTVWxd1G+4Q15f47gnhkPewSsweoq m08xZdq/nkbxg7pEJ+52kkh7efiN9Luh1PjRMaPNPBwTEiArn4GqLlcs1Zs41aNFpku7 bD8g== Received: by 10.236.168.103 with SMTP id j67mr22474787yhl.62.1350595341746; Thu, 18 Oct 2012 14:22:21 -0700 (PDT) Received: from vicky.domain.invalid ([177.16.81.162]) by mx.google.com with ESMTPS id o13sm22450078ang.1.2012.10.18.14.22.19 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 18 Oct 2012 14:22:21 -0700 (PDT) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Thu, 18 Oct 2012 18:21:40 -0300 Message-Id: <1350595304-18237-11-git-send-email-przanoni@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1350595304-18237-1-git-send-email-przanoni@gmail.com> References: <1350595304-18237-1-git-send-email-przanoni@gmail.com> Cc: Paulo Zanoni Subject: [Intel-gfx] [PATCH 10/14] drm/i915: select the correct pipe when using TRANSCODER_EDP 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 Signed-off-by: Paulo Zanoni --- drivers/gpu/drm/i915/intel_ddi.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index c30cb14..08881f1 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c @@ -954,6 +954,23 @@ void intel_ddi_enable_pipe_func(struct drm_crtc *crtc) if (crtc->mode.flags & DRM_MODE_FLAG_PHSYNC) temp |= TRANS_DDI_PHSYNC; + if (cpu_transcoder == TRANSCODER_EDP) { + switch (pipe) { + case PIPE_A: + temp |= TRANS_DDI_EDP_INPUT_A_ONOFF; + break; + case PIPE_B: + temp |= TRANS_DDI_EDP_INPUT_B_ONOFF; + break; + case PIPE_C: + temp |= TRANS_DDI_EDP_INPUT_C_ONOFF; + break; + default: + BUG(); + break; + } + } + if (type == INTEL_OUTPUT_HDMI) { struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);