From patchwork Mon Feb 23 19:45:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 5867871 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8ACA29F37F for ; Mon, 23 Feb 2015 19:45:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B949D20637 for ; Mon, 23 Feb 2015 19:45:22 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 000BB20635 for ; Mon, 23 Feb 2015 19:45:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6FCAD6E4A3; Mon, 23 Feb 2015 11:45:19 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by gabe.freedesktop.org (Postfix) with ESMTP id D383E6E4A3 for ; Mon, 23 Feb 2015 11:45:17 -0800 (PST) Received: by mail-vc0-f179.google.com with SMTP id hy4so8331111vcb.10 for ; Mon, 23 Feb 2015 11:45:17 -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=vxnc/1t1IsAjwyJyBQavjN5p6A3uLtUGCzRd798woEI=; b=iRMo84FkV4RxdS8qdwtQL6ZV4DFOENcfRX0D7eM+H0xbvVf6ZZ4GUgFhgBmaBbWHly KfB0jQyKIWMu0WJn1I2JzXH15j1GH71USbtaTGGqi2/YnLidD/H/r0cEH/EyMIVCEJZh +QHC3ITH9DzNDkk+u/2NxIja/iWg72x4ESAM0+GDSdfaAxfwKUrzR2ANbO6behAaqror SqruRmlrloyHOGPhMqZmC3MXs0xEaaJbuqD7MlVwW9UHk6egMhsBzdyLv9FKqTn8OmNj qpsAtumi39PfdbQ+KKhFfSrhoykaReer0saIple68IJRp3bKqUf5cdCo11pxoXxB8ww+ 6ZtQ== X-Received: by 10.52.155.104 with SMTP id vv8mr11749316vdb.64.1424720717261; Mon, 23 Feb 2015 11:45:17 -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 ci3sm6842082vdd.3.2015.02.23.11.45.16 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Feb 2015 11:45:16 -0800 (PST) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon: fix interlaced modes Date: Mon, 23 Feb 2015 14:45:06 -0500 Message-Id: <1424720706-20190-1-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 1.8.3.1 Cc: Alex Deucher 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-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 The viewport needs the frame size, not the field size. Signed-off-by: Alex Deucher --- drivers/gpu/drm/radeon/atombios_crtc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c index 7d827cb..41b460a 100644 --- a/drivers/gpu/drm/radeon/atombios_crtc.c +++ b/drivers/gpu/drm/radeon/atombios_crtc.c @@ -1405,6 +1405,9 @@ static int dce4_crtc_do_set_base(struct drm_crtc *crtc, (x << 16) | y); viewport_w = crtc->mode.hdisplay; viewport_h = (crtc->mode.vdisplay + 1) & ~1; + /* viewport is frame size, not field */ + if (crtc->mode.flags & DRM_MODE_FLAG_INTERLACE) + viewport_h *= 2; WREG32(EVERGREEN_VIEWPORT_SIZE + radeon_crtc->crtc_offset, (viewport_w << 16) | viewport_h); @@ -1605,6 +1608,9 @@ static int avivo_crtc_do_set_base(struct drm_crtc *crtc, (x << 16) | y); viewport_w = crtc->mode.hdisplay; viewport_h = (crtc->mode.vdisplay + 1) & ~1; + /* viewport is frame size, not field */ + if (crtc->mode.flags & DRM_MODE_FLAG_INTERLACE) + viewport_h *= 2; WREG32(AVIVO_D1MODE_VIEWPORT_SIZE + radeon_crtc->crtc_offset, (viewport_w << 16) | viewport_h);