]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/i915: Delete duplicate #defines added for DCx
authorChandra Konduru <chandra.konduru@intel.com>
Wed, 10 Jun 2015 23:16:12 +0000 (16:16 -0700)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 15 Jun 2015 15:52:29 +0000 (17:52 +0200)
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>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_reg.h

index c9f9d3d3adbad36e69bdc7cb1e30acba7feac552..a66967fd0197727a073182be8f24a942fc688fe9 100644 (file)
@@ -7282,12 +7282,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