* [PATCH] drm/i915: Delete duplicate #defines added for DCx
@ 2015-06-10 23:16 Chandra Konduru
2015-06-11 13:20 ` Damien Lespiau
2015-06-14 13:59 ` shuang.he
0 siblings, 2 replies; 4+ messages in thread
From: Chandra Konduru @ 2015-06-10 23:16 UTC (permalink / raw)
To: intel-gfx
Delete the duplicate #defines introduced by:
commit 6b457d31ea0465fcadcf6d5044f5f71398954727
Author: A.Sunil Kamath <sunil.kamath@intel.com>
Date: Thu Apr 16 14:22:09 2015 +0530
drm/i915/skl: Implement enable/disable for Display C5 state.
Signed-off-by: Chandra Konduru <chandra.konduru@intel.com>
---
drivers/gpu/drm/i915/i915_reg.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 40a3a64..741cd32 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -7281,12 +7281,6 @@ enum skl_disp_power_wells {
#define DC_STATE_EN 0x45504
#define DC_STATE_EN_UPTO_DC5 (1<<0)
#define DC_STATE_EN_DC9 (1<<3)
-
-/*
-* SKL DC
-*/
-#define DC_STATE_EN 0x45504
-#define DC_STATE_EN_UPTO_DC5 (1<<0)
#define DC_STATE_EN_UPTO_DC6 (2<<0)
#define DC_STATE_EN_UPTO_DC5_DC6_MASK 0x3
--
1.7.9.5
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: Delete duplicate #defines added for DCx
2015-06-10 23:16 [PATCH] drm/i915: Delete duplicate #defines added for DCx Chandra Konduru
@ 2015-06-11 13:20 ` Damien Lespiau
2015-06-15 15:52 ` Daniel Vetter
2015-06-14 13:59 ` shuang.he
1 sibling, 1 reply; 4+ messages in thread
From: Damien Lespiau @ 2015-06-11 13:20 UTC (permalink / raw)
To: Chandra Konduru; +Cc: intel-gfx
On Wed, Jun 10, 2015 at 04:16:12PM -0700, Chandra Konduru wrote:
> Delete the duplicate #defines introduced by:
>
> commit 6b457d31ea0465fcadcf6d5044f5f71398954727
> Author: A.Sunil Kamath <sunil.kamath@intel.com>
> Date: Thu Apr 16 14:22:09 2015 +0530
>
> drm/i915/skl: Implement enable/disable for Display C5 state.
>
> Signed-off-by: Chandra Konduru <chandra.konduru@intel.com>
> ---
> drivers/gpu/drm/i915/i915_reg.h | 6 ------
> 1 file changed, 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index 40a3a64..741cd32 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -7281,12 +7281,6 @@ enum skl_disp_power_wells {
> #define DC_STATE_EN 0x45504
> #define DC_STATE_EN_UPTO_DC5 (1<<0)
> #define DC_STATE_EN_DC9 (1<<3)
> -
> -/*
> -* SKL DC
> -*/
> -#define DC_STATE_EN 0x45504
> -#define DC_STATE_EN_UPTO_DC5 (1<<0)
> #define DC_STATE_EN_UPTO_DC6 (2<<0)
> #define DC_STATE_EN_UPTO_DC5_DC6_MASK 0x3
And now we have DC9 define in the middle of the DC5/6 field. Oh well,
still somewhat better.
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
--
Damien
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: Delete duplicate #defines added for DCx
2015-06-10 23:16 [PATCH] drm/i915: Delete duplicate #defines added for DCx Chandra Konduru
2015-06-11 13:20 ` Damien Lespiau
@ 2015-06-14 13:59 ` shuang.he
1 sibling, 0 replies; 4+ messages in thread
From: shuang.he @ 2015-06-14 13:59 UTC (permalink / raw)
To: shuang.he, lei.a.liu, intel-gfx, chandra.konduru
Tested-By: Intel Graphics QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
Task id: 6565
-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 276/276 276/276
ILK 303/303 303/303
SNB 312/312 312/312
IVB 343/343 343/343
BYT 287/287 287/287
BDW 321/321 321/321
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: Delete duplicate #defines added for DCx
2015-06-11 13:20 ` Damien Lespiau
@ 2015-06-15 15:52 ` Daniel Vetter
0 siblings, 0 replies; 4+ messages in thread
From: Daniel Vetter @ 2015-06-15 15:52 UTC (permalink / raw)
To: Damien Lespiau; +Cc: intel-gfx
On Thu, Jun 11, 2015 at 02:20:22PM +0100, Damien Lespiau wrote:
> On Wed, Jun 10, 2015 at 04:16:12PM -0700, Chandra Konduru wrote:
> > Delete the duplicate #defines introduced by:
> >
> > commit 6b457d31ea0465fcadcf6d5044f5f71398954727
> > Author: A.Sunil Kamath <sunil.kamath@intel.com>
> > Date: Thu Apr 16 14:22:09 2015 +0530
> >
> > drm/i915/skl: Implement enable/disable for Display C5 state.
> >
> > Signed-off-by: Chandra Konduru <chandra.konduru@intel.com>
> > ---
> > drivers/gpu/drm/i915/i915_reg.h | 6 ------
> > 1 file changed, 6 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> > index 40a3a64..741cd32 100644
> > --- a/drivers/gpu/drm/i915/i915_reg.h
> > +++ b/drivers/gpu/drm/i915/i915_reg.h
> > @@ -7281,12 +7281,6 @@ enum skl_disp_power_wells {
> > #define DC_STATE_EN 0x45504
> > #define DC_STATE_EN_UPTO_DC5 (1<<0)
> > #define DC_STATE_EN_DC9 (1<<3)
> > -
> > -/*
> > -* SKL DC
> > -*/
> > -#define DC_STATE_EN 0x45504
> > -#define DC_STATE_EN_UPTO_DC5 (1<<0)
> > #define DC_STATE_EN_UPTO_DC6 (2<<0)
> > #define DC_STATE_EN_UPTO_DC5_DC6_MASK 0x3
>
> And now we have DC9 define in the middle of the DC5/6 field. Oh well,
> still somewhat better.
>
> Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Queued for -next, thanks for the patch.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-06-15 15:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-10 23:16 [PATCH] drm/i915: Delete duplicate #defines added for DCx Chandra Konduru
2015-06-11 13:20 ` Damien Lespiau
2015-06-15 15:52 ` Daniel Vetter
2015-06-14 13:59 ` shuang.he
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox