On Mon, 10 Mar 2014, Daniel Vetter <daniel.vetter@xxxxxxxx> wrote: > When adding new gunk, _always_ think of a good place. Start/end > usually just means that this didn't happen, and on top of that results > in needless conflicts with other patches doing the same. I'm a fan of unnamed structs within structs to group stuff. The .wm one in dev priv is a great example. BR, Jani. > > Introduced in > > commit 62d5d69b49b6fea9905e36e67cc6c4fc5a17d75f > Author: Mika Kuoppala <mika.kuoppala@xxxxxxxxxxxxxxx> > Date: Tue Feb 25 17:11:28 2014 +0200 > > drm/i915: Add suspend count to error state > > Cc: Mika Kuoppala <mika.kuoppala@xxxxxxxxxxxxxxx> > Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxx> > --- > drivers/gpu/drm/i915/i915_drv.h | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index bfb537942dbe..ba4f2b1d0c7f 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -1613,6 +1613,7 @@ typedef struct drm_i915_private { > > u32 fdi_rx_config; > > + u32 suspend_count; > struct i915_suspend_saved_registers regfile; > > struct { > @@ -1641,8 +1642,6 @@ typedef struct drm_i915_private { > struct i915_dri1_state dri1; > /* Old ums support infrastructure, same warning applies. */ > struct i915_ums_state ums; > - > - u32 suspend_count; > } drm_i915_private_t; > > static inline struct drm_i915_private *to_i915(const struct drm_device *dev) > -- > 1.8.5.2 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx