From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH v2] drm/i915: Restore rps/rc6 on reset Date: Fri, 7 Feb 2014 10:25:22 +0100 Message-ID: <20140207092522.GV17001@phenom.ffwll.local> References: <1383766838.2524.19.camel@jeffdesk> <1391535151-28067-1-git-send-email-jeff.mcgee@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ea0-f177.google.com (mail-ea0-f177.google.com [209.85.215.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 25582FB998 for ; Fri, 7 Feb 2014 01:25:35 -0800 (PST) Received: by mail-ea0-f177.google.com with SMTP id n15so1439482ead.36 for ; Fri, 07 Feb 2014 01:25:32 -0800 (PST) Content-Disposition: inline In-Reply-To: <1391535151-28067-1-git-send-email-jeff.mcgee@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: jeff.mcgee@intel.com Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Tue, Feb 04, 2014 at 11:32:31AM -0600, jeff.mcgee@intel.com wrote: > From: Jeff McGee > > A check of rps/rc6 state after i915_reset determined that the ring > MAX_IDLE registers were returned to their hardware defaults and that > the GEN6_PMIMR register was set to mask all interrupts. This change > restores those values to their pre-reset states by re-initializing > rps/rc6 in i915_reset. A full re-initialization was opted for versus > a targeted set of restore operations for simplicity and maintain- > ability. Note that the re-initialization is not done for Ironlake, > due to a past comment that it causes problems. > > Also updated the rps initialization sequence to preserve existing > min/max values in the case of a re-init. We assume the values were > validated upon being set and do not do further range checking. The > debugfs interface for changing min/max was updated with range > checking to ensure this condition (already present in sysfs > interface). > > v2: fix rps logging to output hw_max and hw_min, not rps.max_delay > and rps.min_delay which don't strictly represent hardware limits. > Add igt testcase to signed-off-by section. > > Testcase: igt/pm_rps/reset > Signed-off-by: Jeff McGee Queued for -next, thanks for the patch. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch