From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesse Barnes Subject: Re: [PATCH 02/10] drm/i915: move dev_priv->(rps|ips) out of line Date: Fri, 2 Nov 2012 12:07:08 -0700 Message-ID: <20121102120708.73363c9a@jbarnes-desktop> References: <1351882511-21290-1-git-send-email-daniel.vetter@ffwll.ch> <1351882511-21290-3-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from oproxy12-pub.bluehost.com (oproxy12-pub.bluehost.com [50.87.16.10]) by gabe.freedesktop.org (Postfix) with SMTP id 489F7A10EA for ; Fri, 2 Nov 2012 12:06:56 -0700 (PDT) In-Reply-To: <1351882511-21290-3-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Daniel Vetter Cc: Intel Graphics Development List-Id: intel-gfx@lists.freedesktop.org On Fri, 2 Nov 2012 19:55:03 +0100 Daniel Vetter wrote: > And give the structs slightly more generic names. I've decided to keep > the short rps/ips prefix, since that's just easier and less churn. > > Signed-off-by: Daniel Vetter > --- > drivers/gpu/drm/i915/i915_drv.h | 67 ++++++++++++++++++++++------------------- > 1 file changed, 36 insertions(+), 31 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index ac7b831..b7d3933 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -549,6 +549,40 @@ struct i915_suspend_saved_registers { > u32 saveMCHBAR_RENDER_STANDBY; > u32 savePCH_PORT_HOTPLUG; > }; > + > +struct intel_gen6_power_mgmt { > + struct work_struct work; > + u32 pm_iir; > + /* lock - irqsave spinlock that protectects the work_struct and > + * pm_iir. */ > + spinlock_t lock; > + > + /* The below variables an all the rps hw state are protected by > + * dev->struct mutext. */ > + u8 cur_delay; > + u8 min_delay; > + u8 max_delay; > +}; > + > +struct intel_ilk_power_mgmt { > + u8 cur_delay; > + u8 min_delay; > + u8 max_delay; > + u8 fmax; > + u8 fstart; > + > + u64 last_count1; > + unsigned long last_time1; > + unsigned long chipset_power; > + u64 last_count2; > + struct timespec last_time2; > + unsigned long gfx_power; > + u8 corr; > + > + int c_m; > + int r_t; > +}; > + > typedef struct drm_i915_private { > struct drm_device *dev; > > @@ -833,40 +867,11 @@ typedef struct drm_i915_private { > bool mchbar_need_disable; > > /* gen6+ rps state */ > - struct { > - struct work_struct work; > - u32 pm_iir; > - /* lock - irqsave spinlock that protectects the work_struct and > - * pm_iir. */ > - spinlock_t lock; > - > - /* The below variables an all the rps hw state are protected by > - * dev->struct mutext. */ > - u8 cur_delay; > - u8 min_delay; > - u8 max_delay; > - } rps; > + struct intel_gen6_power_mgmt rps; > > /* ilk-only ips/rps state. Everything in here is protected by the global > * mchdev_lock in intel_pm.c */ > - struct { > - u8 cur_delay; > - u8 min_delay; > - u8 max_delay; > - u8 fmax; > - u8 fstart; > - > - u64 last_count1; > - unsigned long last_time1; > - unsigned long chipset_power; > - u64 last_count2; > - struct timespec last_time2; > - unsigned long gfx_power; > - u8 corr; > - > - int c_m; > - int r_t; > - } ips; > + struct intel_ilk_power_mgmt ips; > > enum no_fbc_reason no_fbc_reason; > Reviewed-by: Jesse Barnes -- Jesse Barnes, Intel Open Source Technology Center