Skip to contentSkip to conversation

drm/i915: Delete duplicate #defines added for DCx

PATCH Applied Chandra Konduru 4 participants 4 messages Jun 10, 2015 – Jun 15, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: Delete duplicate #defines added for DCx

Delete the duplicate #defines introduced by:

	commit 6b457d31ea0465fcadcf6d5044f5f71398954727
	Author: A.Sunil Kamath <[email protected]>
	Date:   Thu Apr 16 14:22:09 2015 +0530

		drm/i915/skl: Implement enable/disable for Display C5 state.
---
 drivers/gpu/drm/i915/i915_reg.h |    6 ------
 1 file changed, 6 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +0 -6
index 40a3a64..741cd32 100644
@@ -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
 
Signature · 6 lines
1.7.9.5

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 1/1
#1 lore raw
Quoted 19 lines · Chandra Konduru

Delete the duplicate #defines introduced by:

	commit 6b457d31ea0465fcadcf6d5044f5f71398954727
	Author: A.Sunil Kamath <[email protected]>
	Date:   Thu Apr 16 14:22:09 2015 +0530

		drm/i915/skl: Implement enable/disable for Display C5 state.
---
 drivers/gpu/drm/i915/i915_reg.h |    6 ------
 1 file changed, 6 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +0 -0
index 40a3a64..741cd32 100644
@@ -7281,12 +7281,6 @@ enum skl_disp_power_wells {
 #define DC_STATE_EN			0x45504

drivers/gpu/drm/i915/i915_reg.h enum skl_disp_power_wells { · line 7285

Quoted 10 lines
drivers/gpu/drm/i915/i915_reg.h +0 -6
 #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.

Signature · 5 lines
Damien
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw
Quoted 34 lines · Damien Lespiau
Quoted 19 lines · Chandra Konduru

Delete the duplicate #defines introduced by:

	commit 6b457d31ea0465fcadcf6d5044f5f71398954727
	Author: A.Sunil Kamath <[email protected]>
	Date:   Thu Apr 16 14:22:09 2015 +0530

		drm/i915/skl: Implement enable/disable for Display C5 state.
---
 drivers/gpu/drm/i915/i915_reg.h |    6 ------
 1 file changed, 6 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +0 -0
index 40a3a64..741cd32 100644
@@ -7281,12 +7281,6 @@ enum skl_disp_power_wells {
 #define DC_STATE_EN			0x45504

drivers/gpu/drm/i915/i915_reg.h enum skl_disp_power_wells { · line 7285

Quoted 10 lines
drivers/gpu/drm/i915/i915_reg.h +0 -6
 #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.

Quoted 1 line

Queued for -next, thanks for the patch.
-Daniel

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Tested-by on v1 1/1
#3 lore raw
In reply to Chandra Konduru

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
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx