From patchwork Wed Mar 23 17:42:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 8652711 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 8EAFE9FB32 for ; Wed, 23 Mar 2016 17:44:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CC26C203E5 for ; Wed, 23 Mar 2016 17:44:43 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 15314203E3 for ; Wed, 23 Mar 2016 17:44:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 448446E8EF; Wed, 23 Mar 2016 17:44:07 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk0-x231.google.com (mail-qk0-x231.google.com [IPv6:2607:f8b0:400d:c09::231]) by gabe.freedesktop.org (Postfix) with ESMTPS id ED4F26E8E0 for ; Wed, 23 Mar 2016 17:43:34 +0000 (UTC) Received: by mail-qk0-x231.google.com with SMTP id p130so9889312qke.1 for ; Wed, 23 Mar 2016 10:43:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yU0HVxH42+EgQnc44LNISUB1wXaVMr98D4aj2tRde9M=; b=stqIx7cytSrAWjrFhsGS61+sQfJb2ztEST8x807DZ0Q/LNkOcnz6NrflJ3BU2BELVP TQoQwJSgNUui7W/LPXPfklApldqw7l9VutccQehjtlkvXRv/gFCrXUd0/cbOzbSiF44g fjb2H00mdY57wdQtbVJngGKINA86JBKBQEuGSmOCU0ayQAnMrH9WcMWh79vXuviuhCQ6 /OzHOh30hywkZ8HBkbVcEb9yW8K+DQuY99x3IeEIBYPFKtyOPRimWrgOZdyZMCBm4IZx WeV4ZafxKH+KdBONKf95L4maBYpRieuUw03Rjv/amBXFgzQaefMh3KnxRSlErU2TZfTX YsIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yU0HVxH42+EgQnc44LNISUB1wXaVMr98D4aj2tRde9M=; b=ISntD/GCL5aH7MVlcln6eqUhhL4HQCugNs+7jmf/RD+QEKUWOJ1ta0RzIhb+9SQ+rd 5QK2M6j/g9eWvRgfJAn+jL1o5HzDkzh5jkx1Tf5apkLDKiQLbO5VxFI7+UsOA6XOyyAr RmJKbqXCUdsdVHi1VcWnNYLKvM1lSSxcbzWqSeRrM/jheeHKY6VE4kaQQc5GbzDLPOYA VXNhOyNLwZETEpz1/u4TwCz2cIBt5Bme+W+IN+6I7AdWMufrYXgjPz2oOsqVOde+4BhZ a1egjdHrC0dk5DdTkbOjfvZJZAbUY2yc77dTInjp93Owzqkb6DyZ0ooVDOUHJgFl76hw YqWw== X-Gm-Message-State: AD7BkJIRxlH0QQHrTLsFztI9RXQJ6hAusZZUQWQ8LyrhbhwxJ6DUiIzgL2FQ8WeA8TTjxg== X-Received: by 10.55.52.211 with SMTP id b202mr5342653qka.27.1458755012902; Wed, 23 Mar 2016 10:43:32 -0700 (PDT) Received: from cm.localdomain (static-74-96-105-49.washdc.fios.verizon.net. [74.96.105.49]) by smtp.gmail.com with ESMTPSA id v190sm1486878qka.46.2016.03.23.10.43.32 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 23 Mar 2016 10:43:32 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH 11/52] drm/amdgpu/dce11: add dce clock setting for ELM/BAF Date: Wed, 23 Mar 2016 13:42:27 -0400 Message-Id: <1458754988-16222-12-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1458754988-16222-1-git-send-email-alexander.deucher@amd.com> References: <1458754988-16222-1-git-send-email-alexander.deucher@amd.com> MIME-Version: 1.0 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: , 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 Setup the disp clock and dp reference clock. This is now a separate command table on elm/baf compared to older asics. Reviewed-by: Christian König Signed-off-by: Alex Deucher Reviewed-by: Jammy Zhou --- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c index 5217bdf..0d38c4c 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c @@ -3063,7 +3063,15 @@ static int dce_v11_0_hw_init(void *handle) /* init dig PHYs, disp eng pll */ amdgpu_atombios_crtc_powergate_init(adev); amdgpu_atombios_encoder_init_dig(adev); - amdgpu_atombios_crtc_set_disp_eng_pll(adev, adev->clock.default_dispclk); + if ((adev->asic_type == CHIP_ELLESMERE) || + (adev->asic_type == CHIP_BAFFIN)) { + amdgpu_atombios_crtc_set_dce_clock(adev, adev->clock.default_dispclk, + DCE_CLOCK_TYPE_DISPCLK, ATOM_GCK_DFS); + amdgpu_atombios_crtc_set_dce_clock(adev, 0, + DCE_CLOCK_TYPE_DPREFCLK, ATOM_GCK_DFS); + } else { + amdgpu_atombios_crtc_set_disp_eng_pll(adev, adev->clock.default_dispclk); + } /* initialize hpd */ dce_v11_0_hpd_init(adev);