From patchwork Thu Oct 20 13:20:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Christian_K=C3=B6nig?= X-Patchwork-Id: 9386825 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CC4D060CF5 for ; Thu, 20 Oct 2016 13:20:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B974828978 for ; Thu, 20 Oct 2016 13:20:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AE8FE28A18; Thu, 20 Oct 2016 13:20:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E5E9F29C1E for ; Thu, 20 Oct 2016 13:20:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EDE936EB51; Thu, 20 Oct 2016 13:20:39 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from pegasos-out.vodafone.de (pegasos-out.vodafone.de [80.84.1.38]) by gabe.freedesktop.org (Postfix) with ESMTP id D89206EB37 for ; Thu, 20 Oct 2016 13:20:22 +0000 (UTC) Received: from localhost (localhost.localdomain [127.0.0.1]) by pegasos-out.vodafone.de (Rohrpostix1 Daemon) with ESMTP id 54785261D35; Thu, 20 Oct 2016 15:20:22 +0200 (CEST) X-Virus-Scanned: amavisd-new at vodafone.de Authentication-Results: rohrpostix1.prod.vfnet.de (amavisd-new); dkim=pass header.i=@vodafone.de Received: from pegasos-out.vodafone.de ([127.0.0.1]) by localhost (rohrpostix1.prod.vfnet.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id b6HDmUpWIlOM; Thu, 20 Oct 2016 15:20:17 +0200 (CEST) Received: from smtp-05.vodafone.de (smtp-05.vodafone.de [10.215.254.32]) by pegasos-out.vodafone.de (Rohrpostix1 Daemon) with ESMTP id 1CDC4261C4C; Thu, 20 Oct 2016 15:20:17 +0200 (CEST) X-DKIM: OpenDKIM Filter v2.6.8 pegasos-out.vodafone.de 1CDC4261C4C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vodafone.de; s=mail; t=1476969617; bh=7jJkbPyxxsiF2LioOoBazWACmOocZhRV8RWCKWIakKU=; h=From:To:Cc:Subject:Date; b=ESpbmabIwVOHfHUgcXjf6vHJyieiM9ShJkGdXqEiFwvoN1RxXORW04DZLwzP9af1A W89RCbNRMonmy2vgSJkkR75VhAWNLSuJHQCjrDLRWP+Y9mKRGlAHxdSSTkIHEJS9Fq MEdgO1RN/agCgagUlOaF9nI4KS+6oz+4eAEoLMSk= X-Virus-Scanned: amavisd-new at vodafone.de Received: from smtp-05.vodafone.de ([127.0.0.1]) by localhost (xsmail-dmz1.prod.vfnet.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IKGeAJTr9DZS; Thu, 20 Oct 2016 15:20:16 +0200 (CEST) From: =?UTF-8?q?Christian=20K=C3=B6nig?= To: dri-devel@lists.freedesktop.org Subject: [PATCH 1/5] Revert "drm/amd/dal: Fix underlay pipe and pipe count for Stoney" Date: Thu, 20 Oct 2016 15:20:11 +0200 Message-Id: <1476969615-4421-1-git-send-email-deathsimple@vodafone.de> X-Mailer: git-send-email 2.5.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP diff --git a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c index 0258aba..9187b34 100644 --- a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c +++ b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c @@ -1053,15 +1053,14 @@ static bool construct( *************************************************/ pool->base.pipe_count = 3; - pool->base.stream_enc_count = 3; pool->base.underlay_pipe_index = 3; if (ASIC_REV_IS_STONEY(asic_id.hw_internal_rev)) { pool->base.pipe_count = 2; - pool->base.stream_enc_count = 2; pool->base.underlay_pipe_index = 2; } + pool->base.stream_enc_count = 3; dc->public.caps.max_downscale_ratio = 150; dc->public.caps.i2c_speed_in_khz = 100;