From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:37927 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752215AbbJWQeb (ORCPT ); Fri, 23 Oct 2015 12:34:31 -0400 Subject: Patch "drm/amdgpu: fix num_crtc on CZ" has been added to the 4.2-stable tree To: alexander.deucher@amd.com, gregkh@linuxfoundation.org Cc: , From: Date: Fri, 23 Oct 2015 09:34:29 -0700 Message-ID: <1445618069214203@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled drm/amdgpu: fix num_crtc on CZ to the 4.2-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: drm-amdgpu-fix-num_crtc-on-cz.patch and it can be found in the queue-4.2 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 26d0c21db1fd1679fcf07863741c13ba5ce37a65 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Mon, 5 Oct 2015 10:15:14 -0400 Subject: drm/amdgpu: fix num_crtc on CZ From: Alex Deucher commit 26d0c21db1fd1679fcf07863741c13ba5ce37a65 upstream. Hw only has 3 crtcs. copy paste typo. Signed-off-by: Alex Deucher Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c @@ -2888,7 +2888,7 @@ static int dce_v11_0_early_init(void *ha switch (adev->asic_type) { case CHIP_CARRIZO: - adev->mode_info.num_crtc = 4; + adev->mode_info.num_crtc = 3; adev->mode_info.num_hpd = 6; adev->mode_info.num_dig = 9; break; Patches currently in stable-queue which might be from alexander.deucher@amd.com are queue-4.2/drm-amdgpu-keep-the-pflip-interrupts-always-enabled-v7.patch queue-4.2/drm-amdgpu-fix-num_crtc-on-cz.patch queue-4.2/drm-amdgpu-check-before-checking-pci-bridge-registers.patch queue-4.2/drm-radeon-add-pm-sysfs-files-late.patch queue-4.2/drm-amdgpu-add-pm-sysfs-files-late.patch