From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752350AbdH1JLw (ORCPT ); Mon, 28 Aug 2017 05:11:52 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:33074 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752052AbdH1IIR (ORCPT ); Mon, 28 Aug 2017 04:08:17 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alex Deucher Subject: [PATCH 4.12 60/99] Revert "drm/amdgpu: fix vblank_time when displays are off" Date: Mon, 28 Aug 2017 10:04:58 +0200 Message-Id: <20170828080458.651419640@linuxfoundation.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170828080455.968552605@linuxfoundation.org> References: <20170828080455.968552605@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alex Deucher This reverts commit 2dc1889ebf8501b0edf125e89a30e1cf3744a2a7. Fixes a suspend and resume regression. bug: https://bugzilla.kernel.org/show_bug.cgi?id=196615 Signed-off-by: Alex Deucher Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 2 -- 1 file changed, 2 deletions(-) --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c @@ -839,8 +839,6 @@ static int amdgpu_cgs_get_active_display mode_info = info->mode_info; if (mode_info) { - /* if the displays are off, vblank time is max */ - mode_info->vblank_time_us = 0xffffffff; /* always set the reference clock */ mode_info->ref_clock = adev->clock.spll.reference_freq; }