From patchwork Mon Sep 24 23:45:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWFyZWsgT2zFocOhaw==?= X-Patchwork-Id: 1501221 Return-Path: X-Original-To: patchwork-dri-devel@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 0FA82DF280 for ; Mon, 24 Sep 2012 23:45:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 00405A0882 for ; Mon, 24 Sep 2012 16:45:56 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-we0-f177.google.com (mail-we0-f177.google.com [74.125.82.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 346BD9E937 for ; Mon, 24 Sep 2012 16:45:45 -0700 (PDT) Received: by weyu50 with SMTP id u50so294975wey.36 for ; Mon, 24 Sep 2012 16:45:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer:mime-version:content-type :content-transfer-encoding; bh=+PkEFkVBsrygM3/sM7uoO9LP2ZnrkPiOk025UHquhoE=; b=JHa4cFUja9+XjKLU2LUYPuxR/SMYGotaVUmH7ozXFdQD6DMvGSBiXOh6BAMIEraNMu 72hvdZGIZUPy6N2Cc9UcY73E2Onv7XanqqEkr0P8elJn8Etu0A6Y2gQ4V9phVGUByFz0 uxsHmV83/j8MRZGcyOFA0PsTrppxQ1jsCpOpKjOHmMO1ZeKKL9T/7anmY+Jr77Njy+T2 8uWdmU03URAzwqGa/Q2x+rQu5dLAzW1GGypCcKknUY/r/rgQ8uVmr+yVA2EcVJrbak+H VSKpUbcqY2szmvi1QBYnHUjdnc5B9hiFXuelFxGYsIEu8FK5r9xdawuVDkzMz8U450hU X8vA== Received: by 10.216.199.30 with SMTP id w30mr2408262wen.25.1348530344192; Mon, 24 Sep 2012 16:45:44 -0700 (PDT) Received: from localhost.localdomain (static-84-242-70-218.net.upcbroadband.cz. [84.242.70.218]) by mx.google.com with ESMTPS id k20sm17210381wiv.11.2012.09.24.16.45.42 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 24 Sep 2012 16:45:43 -0700 (PDT) From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon/kms: allow STRMOUT_BASE_UPDATE on RS780 and RS880 Date: Tue, 25 Sep 2012 01:45:33 +0200 Message-Id: <1348530333-4541-1-git-send-email-maraeo@gmail.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 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: , 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 This is required to make streamout work there. Signed-off-by: Marek Olšák --- drivers/gpu/drm/radeon/r600_cs.c | 3 ++- drivers/gpu/drm/radeon/radeon_drv.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c index f37676d..dfa2448 100644 --- a/drivers/gpu/drm/radeon/r600_cs.c +++ b/drivers/gpu/drm/radeon/r600_cs.c @@ -2180,7 +2180,8 @@ static int r600_packet3_check(struct radeon_cs_parser *p, } break; case PACKET3_STRMOUT_BASE_UPDATE: - if (p->family < CHIP_RV770) { + /* RS780 and RS880 also need this */ + if (p->family < CHIP_RS780) { DRM_ERROR("STRMOUT_BASE_UPDATE only supported on 7xx\n"); return -EINVAL; } diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index 8c593ea..2c8b0f8 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -64,9 +64,10 @@ * 2.20.0 - r600-si: RADEON_INFO_TIMESTAMP query * 2.21.0 - r600-r700: FMASK and CMASK * 2.22.0 - r600 only: RESOLVE_BOX allowed + * 2.23.0 - allow STRMOUT_BASE_UPDATE on RS780 and RS880 */ #define KMS_DRIVER_MAJOR 2 -#define KMS_DRIVER_MINOR 22 +#define KMS_DRIVER_MINOR 23 #define KMS_DRIVER_PATCHLEVEL 0 int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags); int radeon_driver_unload_kms(struct drm_device *dev);