From patchwork Wed Dec 11 16:46:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 3327311 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E3FE2C0D4A for ; Wed, 11 Dec 2013 16:46:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E2463201BE for ; Wed, 11 Dec 2013 16:46:34 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id C43FF2018A for ; Wed, 11 Dec 2013 16:46:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A5AB2FB9A7 for ; Wed, 11 Dec 2013 08:46:33 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yh0-f48.google.com (mail-yh0-f48.google.com [209.85.213.48]) by gabe.freedesktop.org (Postfix) with ESMTP id E1A11FB961 for ; Wed, 11 Dec 2013 08:46:23 -0800 (PST) Received: by mail-yh0-f48.google.com with SMTP id f73so5146819yha.7 for ; Wed, 11 Dec 2013 08:46:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=LfX5M4rmHja6XB8XZ11BfOXF2ZGJTth4HXDgRi28xIE=; b=vjTXYsjzERIGd7BiC3etgA0VF3yCxTaL+kbFWr1uYRYUq8/WQ42p2BDRZ1xzAlFX+m OtuPXHiZsFU3PJwKdpBM4WfS/j8BOlReJDtg82cXLSshA5Er4J521inE03Pna9+0hrMm hs9C17uWFhi9v0F9p3MR/NP3Zhipyog4uZGWGx088GK356CM0pqYtxpOgXxqm+l8MAB4 V5w6sWs/BC/uDol69vZYZhA7F3aGn2KAa0wKKqWi+02GeQfHo8vK9NIAIGZJ+TNBWe0F JzeRa0PI0V0BsIPG7wL5rjiZ9LH99hGBdK+sFTnz50MhuriaL0/kb8xP6Ez5Xy53Wdfl 8HdQ== X-Received: by 10.236.121.9 with SMTP id q9mr1892402yhh.11.1386780383284; Wed, 11 Dec 2013 08:46:23 -0800 (PST) Received: from localhost.localdomain (static-74-96-105-49.washdc.fios.verizon.net. [74.96.105.49]) by mx.google.com with ESMTPSA id r64sm28981835yhc.23.2013.12.11.08.46.22 for (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128/128); Wed, 11 Dec 2013 08:46:22 -0800 (PST) From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon: add missing display tiling setup for oland Date: Wed, 11 Dec 2013 11:46:17 -0500 Message-Id: <1386780377-29581-1-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 1.8.3.1 Cc: Alex Deucher , stable@vger.kernel.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Fixes improperly set up display params for 2D tiling on oland. Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org --- drivers/gpu/drm/radeon/atombios_crtc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c index 80a2012..b197059 100644 --- a/drivers/gpu/drm/radeon/atombios_crtc.c +++ b/drivers/gpu/drm/radeon/atombios_crtc.c @@ -1196,7 +1196,9 @@ static int dce4_crtc_do_set_base(struct drm_crtc *crtc, } else if ((rdev->family == CHIP_TAHITI) || (rdev->family == CHIP_PITCAIRN)) fb_format |= SI_GRPH_PIPE_CONFIG(SI_ADDR_SURF_P8_32x32_8x16); - else if (rdev->family == CHIP_VERDE) + else if ((rdev->family == CHIP_VERDE) || + (rdev->family == CHIP_OLAND) || + (rdev->family == CHIP_HAINAN)) /* for completeness. HAINAN has no display hw */ fb_format |= SI_GRPH_PIPE_CONFIG(SI_ADDR_SURF_P4_8x16); switch (radeon_crtc->crtc_id) {