From patchwork Tue Oct 23 20:30:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 1633471 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 C52E8DF283 for ; Tue, 23 Oct 2012 20:37:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A408C9F772 for ; Tue, 23 Oct 2012 13:37:47 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-gg0-f177.google.com (mail-gg0-f177.google.com [209.85.161.177]) by gabe.freedesktop.org (Postfix) with ESMTP id C936B9F73A for ; Tue, 23 Oct 2012 13:30:46 -0700 (PDT) Received: by mail-gg0-f177.google.com with SMTP id h1so813088gge.36 for ; Tue, 23 Oct 2012 13:30:46 -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=RVqs+9iqVYOBNzQ9zuTf2zvcI3By0XpusbmGyRVwZV4=; b=wMuQGyTLwxtADZQPW70puFkqFsilwqDiZ6kLoKZ8Cc62QpAD3SHVwSj7RkyqP7fZOy qmSb9fOicnNo8ib43Y9lkwRFp0IlaCFSLJUuUNITmv2fIvP2N0l7XEGmbzjaL+xRXdTq 5o3pUPPeaSgocabKo8gTSU6sRkzO3nc8EHtiMipmHRILjzuDvT5PKFW7euOWprnZ6d9a yxE7o948T2fwGfvaUF8fxsdaDYALM5fFCMzS3vVXqvcMOIrdFe0Hw2MXIH662g3eh5Ls j5hOqRcaH4BBNMoFxBndHXy4JkLxsunB/s+Gzj8UEDsCjMcPnEaoGI/RVq7wtJ9dwUMC krxA== Received: by 10.100.208.20 with SMTP id f20mr2333379ang.57.1351024246687; Tue, 23 Oct 2012 13:30:46 -0700 (PDT) Received: from vicky.domain.invalid ([177.40.46.113]) by mx.google.com with ESMTPS id a44sm12892049yhe.21.2012.10.23.13.30.45 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 23 Oct 2012 13:30:46 -0700 (PDT) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Tue, 23 Oct 2012 18:30:04 -0200 Message-Id: <1351024208-3489-15-git-send-email-przanoni@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1351024208-3489-1-git-send-email-przanoni@gmail.com> References: <1351024208-3489-1-git-send-email-przanoni@gmail.com> Cc: Paulo Zanoni Subject: [Intel-gfx] [PATCH 14/18] 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 Reviewed-by: Rodrigo Vivi --- 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 3283f6f..106c375 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);