* [PATCH] drm/i915: move dev_priv->suspend around
@ 2014-03-10 9:03 Daniel Vetter
2014-03-12 9:01 ` Jani Nikula
0 siblings, 1 reply; 3+ messages in thread
From: Daniel Vetter @ 2014-03-10 9:03 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter
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 62d5d69b49b6fea9905e36e67cc6c4fc5a17d75f
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>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] drm/i915: move dev_priv->suspend around
2014-03-10 9:03 [PATCH] drm/i915: move dev_priv->suspend around Daniel Vetter
@ 2014-03-12 9:01 ` Jani Nikula
2014-03-12 15:12 ` Daniel Vetter
0 siblings, 1 reply; 3+ messages in thread
From: Jani Nikula @ 2014-03-12 9:01 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter
On Mon, 10 Mar 2014, Daniel Vetter <daniel.vetter@ffwll.ch> 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@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>
> ---
> 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@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Jani Nikula, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] drm/i915: move dev_priv->suspend around
2014-03-12 9:01 ` Jani Nikula
@ 2014-03-12 15:12 ` Daniel Vetter
0 siblings, 0 replies; 3+ messages in thread
From: Daniel Vetter @ 2014-03-12 15:12 UTC (permalink / raw)
To: Jani Nikula; +Cc: Daniel Vetter, Intel Graphics Development
On Wed, Mar 12, 2014 at 11:01:35AM +0200, Jani Nikula wrote:
> On Mon, 10 Mar 2014, Daniel Vetter <daniel.vetter@ffwll.ch> 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.
Me too, but I haven't found a suitable companion yet for this stuff ...
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-03-12 15:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-10 9:03 [PATCH] drm/i915: move dev_priv->suspend around Daniel Vetter
2014-03-12 9:01 ` Jani Nikula
2014-03-12 15:12 ` Daniel Vetter
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.