Ver código fonte

disp: msm: sde: fix spacing of #defines

Defines should always have a single space between #define and
the keyword to allow for searching where these definitions are
located using grep.

Change-Id: I38778e789b12df8a7a22c22dd27152a5ab047405
Signed-off-by: Steve Cohen <[email protected]>
Steve Cohen 5 anos atrás
pai
commit
f303123d53
3 arquivos alterados com 68 adições e 68 exclusões
  1. 2 2
      msm/sde/sde_core_perf.h
  2. 43 43
      msm/sde/sde_hw_ctl.c
  3. 23 23
      msm/sde/sde_hw_intf.c

+ 2 - 2
msm/sde/sde_core_perf.h

@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
  */
 
 #ifndef _SDE_CORE_PERF_H_
@@ -14,7 +14,7 @@
 #include "sde_hw_catalog.h"
 #include "sde_power_handle.h"
 
-#define	SDE_PERF_DEFAULT_MAX_CORE_CLK_RATE	320000000
+#define SDE_PERF_DEFAULT_MAX_CORE_CLK_RATE	320000000
 
 /**
  *  uidle performance counters mode

+ 43 - 43
msm/sde/sde_hw_ctl.c

@@ -10,45 +10,45 @@
 #include "sde_kms.h"
 #include "sde_reg_dma.h"
 
-#define   CTL_LAYER(lm)                 \
+#define CTL_LAYER(lm)                 \
 	(((lm) == LM_5) ? (0x024) : (((lm) - LM_0) * 0x004))
-#define   CTL_LAYER_EXT(lm)             \
+#define CTL_LAYER_EXT(lm)             \
 	(0x40 + (((lm) - LM_0) * 0x004))
-#define   CTL_LAYER_EXT2(lm)             \
+#define CTL_LAYER_EXT2(lm)             \
 	(0x70 + (((lm) - LM_0) * 0x004))
-#define   CTL_LAYER_EXT3(lm)             \
+#define CTL_LAYER_EXT3(lm)             \
 	(0xA0 + (((lm) - LM_0) * 0x004))
-#define   CTL_TOP                       0x014
-#define   CTL_FLUSH                     0x018
-#define   CTL_START                     0x01C
-#define   CTL_PREPARE                   0x0d0
-#define   CTL_SW_RESET                  0x030
-#define   CTL_SW_RESET_OVERRIDE         0x060
-#define   CTL_STATUS                    0x064
-#define   CTL_LAYER_EXTN_OFFSET         0x40
-#define   CTL_ROT_TOP                   0x0C0
-#define   CTL_ROT_FLUSH                 0x0C4
-#define   CTL_ROT_START                 0x0CC
-
-#define   CTL_MERGE_3D_ACTIVE           0x0E4
-#define   CTL_DSC_ACTIVE                0x0E8
-#define   CTL_WB_ACTIVE                 0x0EC
-#define   CTL_CWB_ACTIVE                0x0F0
-#define   CTL_INTF_ACTIVE               0x0F4
-#define   CTL_CDM_ACTIVE                0x0F8
-#define   CTL_FETCH_PIPE_ACTIVE         0x0FC
-
-#define   CTL_MERGE_3D_FLUSH           0x100
-#define   CTL_DSC_FLUSH                0x104
-#define   CTL_WB_FLUSH                 0x108
-#define   CTL_CWB_FLUSH                0x10C
-#define   CTL_INTF_FLUSH               0x110
-#define   CTL_CDM_FLUSH                0x114
-#define   CTL_PERIPH_FLUSH             0x128
-#define   CTL_DSPP_0_FLUSH             0x13c
-
-#define  CTL_INTF_MASTER               0x134
-#define  CTL_UIDLE_ACTIVE              0x138
+#define CTL_TOP                       0x014
+#define CTL_FLUSH                     0x018
+#define CTL_START                     0x01C
+#define CTL_PREPARE                   0x0d0
+#define CTL_SW_RESET                  0x030
+#define CTL_SW_RESET_OVERRIDE         0x060
+#define CTL_STATUS                    0x064
+#define CTL_LAYER_EXTN_OFFSET         0x40
+#define CTL_ROT_TOP                   0x0C0
+#define CTL_ROT_FLUSH                 0x0C4
+#define CTL_ROT_START                 0x0CC
+
+#define CTL_MERGE_3D_ACTIVE           0x0E4
+#define CTL_DSC_ACTIVE                0x0E8
+#define CTL_WB_ACTIVE                 0x0EC
+#define CTL_CWB_ACTIVE                0x0F0
+#define CTL_INTF_ACTIVE               0x0F4
+#define CTL_CDM_ACTIVE                0x0F8
+#define CTL_FETCH_PIPE_ACTIVE         0x0FC
+
+#define CTL_MERGE_3D_FLUSH           0x100
+#define CTL_DSC_FLUSH                0x104
+#define CTL_WB_FLUSH                 0x108
+#define CTL_CWB_FLUSH                0x10C
+#define CTL_INTF_FLUSH               0x110
+#define CTL_CDM_FLUSH                0x114
+#define CTL_PERIPH_FLUSH             0x128
+#define CTL_DSPP_0_FLUSH             0x13c
+
+#define CTL_INTF_MASTER               0x134
+#define CTL_UIDLE_ACTIVE              0x138
 
 #define CTL_MIXER_BORDER_OUT            BIT(24)
 #define CTL_FLUSH_MASK_ROT              BIT(27)
@@ -213,14 +213,14 @@ sspp_reg_cfg_tbl[SSPP_MAX][CTL_SSPP_MAX_RECTS] = {
 /**
  * Individual flush bit in CTL_FLUSH
  */
-#define  WB_IDX         16
-#define  DSC_IDX        22
-#define  MERGE_3D_IDX   23
-#define  CDM_IDX        26
-#define  CWB_IDX        28
-#define  DSPP_IDX       29
-#define  PERIPH_IDX     30
-#define  INTF_IDX       31
+#define WB_IDX         16
+#define DSC_IDX        22
+#define MERGE_3D_IDX   23
+#define CDM_IDX        26
+#define CWB_IDX        28
+#define DSPP_IDX       29
+#define PERIPH_IDX     30
+#define INTF_IDX       31
 
 static struct sde_ctl_cfg *_ctl_offset(enum sde_ctl ctl,
 		struct sde_mdss_cfg *m,

+ 23 - 23
msm/sde/sde_hw_intf.c

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2020, The Linux Foundation. All rights reserved.
  */
 #include <linux/iopoll.h>
 
@@ -38,28 +38,28 @@
 #define INTF_ACTIVE_DATA_HCTL           0x068
 #define INTF_FRAME_LINE_COUNT_EN        0x0A8
 #define INTF_FRAME_COUNT                0x0AC
-#define   INTF_LINE_COUNT               0x0B0
-
-#define   INTF_DEFLICKER_CONFIG         0x0F0
-#define   INTF_DEFLICKER_STRNG_COEFF    0x0F4
-#define   INTF_DEFLICKER_WEAK_COEFF     0x0F8
-
-#define   INTF_REG_SPLIT_LINK           0x080
-#define   INTF_DSI_CMD_MODE_TRIGGER_EN  0x084
-#define   INTF_PANEL_FORMAT             0x090
-#define   INTF_TPG_ENABLE               0x100
-#define   INTF_TPG_MAIN_CONTROL         0x104
-#define   INTF_TPG_VIDEO_CONFIG         0x108
-#define   INTF_TPG_COMPONENT_LIMITS     0x10C
-#define   INTF_TPG_RECTANGLE            0x110
-#define   INTF_TPG_INITIAL_VALUE        0x114
-#define   INTF_TPG_BLK_WHITE_PATTERN_FRAMES   0x118
-#define   INTF_TPG_RGB_MAPPING          0x11C
-#define   INTF_PROG_FETCH_START         0x170
-#define   INTF_PROG_ROT_START           0x174
-
-#define INTF_MISR_CTRL			0x180
-#define INTF_MISR_SIGNATURE		0x184
+#define INTF_LINE_COUNT                 0x0B0
+
+#define INTF_DEFLICKER_CONFIG           0x0F0
+#define INTF_DEFLICKER_STRNG_COEFF      0x0F4
+#define INTF_DEFLICKER_WEAK_COEFF       0x0F8
+
+#define INTF_REG_SPLIT_LINK             0x080
+#define INTF_DSI_CMD_MODE_TRIGGER_EN    0x084
+#define INTF_PANEL_FORMAT               0x090
+#define INTF_TPG_ENABLE                 0x100
+#define INTF_TPG_MAIN_CONTROL           0x104
+#define INTF_TPG_VIDEO_CONFIG           0x108
+#define INTF_TPG_COMPONENT_LIMITS       0x10C
+#define INTF_TPG_RECTANGLE              0x110
+#define INTF_TPG_INITIAL_VALUE          0x114
+#define INTF_TPG_BLK_WHITE_PATTERN_FRAMES   0x118
+#define INTF_TPG_RGB_MAPPING            0x11C
+#define INTF_PROG_FETCH_START           0x170
+#define INTF_PROG_ROT_START             0x174
+
+#define INTF_MISR_CTRL                  0x180
+#define INTF_MISR_SIGNATURE             0x184
 
 #define INTF_MUX                        0x25C
 #define INTF_STATUS                     0x26C