Commit 842f1c8b authored Mar 10, 2014 by Daniel Vetter

drm/i915: move dev_priv->suspend around



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.

Introduced in

commit 62d5d69b
Author: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Date:   Tue Feb 25 17:11:28 2014 +0200

    drm/i915: Add suspend count to error state

Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent ff2652ea

drivers/gpu/drm/i915/i915_drv.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -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)