From patchwork Thu Apr 18 13:46:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 2460831 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 3D6B03FCA5 for ; Thu, 18 Apr 2013 13:49:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 52887E5F0C for ; Thu, 18 Apr 2013 06:49:50 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-vb0-f53.google.com (mail-vb0-f53.google.com [209.85.212.53]) by gabe.freedesktop.org (Postfix) with ESMTP id B0626E6429 for ; Thu, 18 Apr 2013 06:46:14 -0700 (PDT) Received: by mail-vb0-f53.google.com with SMTP id i3so2363327vbh.40 for ; Thu, 18 Apr 2013 06:46:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; bh=bRsg8vu7h6FrHSgLNVkXdL2Zc4gjyuyWZRa2FxKYKaM=; b=KhhN187/EiaR5m5+jWtoYAzbX4GLTIg9H5eTDUal/P0nx9b96N9kraIGqSMsX8gk04 XNoMwrlwha+UuBUMe8X6xSMq62uiXjqZGo74Ph4crgPe0GL6ns0DjWUrZYZGg0sLx4Fv khXlvGWQhqKys9kKfBLQaVUkC+BB8/xh8+aV5bKEfO8DDWIWAO/js/sQ44ZXPtAW3TWy RtK2M3kisyXhy6dt+QSqN/qFvaLKIdDg5ud6wNLwLy2+hOK82l8Ft1/yLUjJlxRs7fDf lW0xtJSTLNAXUUV4OXnLt4wOT3AS0P7RDhvvS7xiZLfHrDs3RNQMca+LszhUWaBoKjAY nYyA== MIME-Version: 1.0 X-Received: by 10.220.188.70 with SMTP id cz6mr8246776vcb.20.1366292773796; Thu, 18 Apr 2013 06:46:13 -0700 (PDT) Received: by 10.59.4.180 with HTTP; Thu, 18 Apr 2013 06:46:13 -0700 (PDT) In-Reply-To: <1365895584-20999-1-git-send-email-zajec5@gmail.com> References: <1365895584-20999-1-git-send-email-zajec5@gmail.com> Date: Thu, 18 Apr 2013 09:46:13 -0400 Message-ID: Subject: Re: [PATCH 0/6] drm/radeon: minor HDMI improvements From: Alex Deucher To: =?ISO-8859-2?Q?Rafa=B3_Mi=B3ecki?= Cc: dri-devel@lists.freedesktop.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: , 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 On Sat, Apr 13, 2013 at 7:26 PM, Rafa? Mi?ecki wrote: > I've managed to track fglrx operations on HDMI regs, so we can finally setup > everything in (hopefully) the correct way and order. > > This changes HDMI setup on Evergreen to mostly match fglrx and was tested on: > 1) AMD Radeon HD 6320 (PALM == DCE41) > 2) AMD Radeon HD 6970M (BARTS == DCE5) > No regressions noticed, I can still play audio, including LPCM, AC3 and DTS. > > Unfortunately I don't have any DCE4 hardware to test this, but that changes > shouldn't cause any regressions. I hope that with such improvements we will > finally able to enable audio by default. I've applied patches 1, 4, 5, 6. For patch 2, I'd prefer we just not enable the interrupts rather than removing the code altogether at this point. See the attached patch. For patch 3, none of the registers mentioned are directly related to audio setup. Alex > > Rafa? Mi?ecki (6): > drm/radeon: add helpers for masking and setting bits in regs > drm/radeon: remove HDMI interrupts on Evergreen > drm/radeon: add some HDMI comments > drm/radeon/evergreen: setup HDMI before enabling it > drm/radeon/evergreen: reorder HDMI setup > drm/radeon/evergreen: write default channel numbers > > drivers/gpu/drm/radeon/evergreen.c | 127 +------------------------------ > drivers/gpu/drm/radeon/evergreen_hdmi.c | 77 +++++++++++++++---- > drivers/gpu/drm/radeon/evergreend.h | 1 + > drivers/gpu/drm/radeon/r600_hdmi.c | 16 ++-- > drivers/gpu/drm/radeon/radeon.h | 2 + > drivers/gpu/drm/radeon/radeon_display.c | 5 ++ > 6 files changed, 76 insertions(+), 152 deletions(-) > > -- > 1.7.10.4 > From 2a011eb7d763257e75b08c98adfb70a8d35ec6ae Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Thu, 18 Apr 2013 09:42:13 -0400 Subject: [PATCH] drm/radeon: disable audio format interrupts on Evergreen The audio format change interrupts are an aid in debugging, but not required for operation. Signed-off-by: Alex Deucher --- drivers/gpu/drm/radeon/r600_hdmi.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/radeon/r600_hdmi.c b/drivers/gpu/drm/radeon/r600_hdmi.c index e419b98..95397b2 100644 --- a/drivers/gpu/drm/radeon/r600_hdmi.c +++ b/drivers/gpu/drm/radeon/r600_hdmi.c @@ -461,7 +461,9 @@ void r600_hdmi_enable(struct drm_encoder *encoder) if (rdev->irq.installed) { /* if irq is available use it */ - radeon_irq_kms_enable_afmt(rdev, dig->afmt->id); + /* XXX: shouldn't need this on any asics. Double check DCE2/3 */ + if (!ASIC_IS_DCE4(rdev)) + radeon_irq_kms_enable_afmt(rdev, dig->afmt->id); } dig->afmt->enabled = true; -- 1.7.7.5