[PATCH] drm/amd/pm: open brace '{' following struct go on the same line
ERROR: open brace '{' following struct go on the same line
Signed-off-by: Ran Sun
---
.../amd/pm/swsmu/inc/smu_v13_0_7_pptable.h| 21 +++
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0_7_pptable.h
b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0_7_pptable.h
index eadbe0149cae..eb694f9f556d 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0_7_pptable.h
+++ b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0_7_pptable.h
@@ -41,8 +41,7 @@
#define SMU_13_0_7_PP_OVERDRIVE_VERSION 0x83// OverDrive 8
Table Version 0.2
#define SMU_13_0_7_PP_POWERSAVINGCLOCK_VERSION 0x01 // Power Saving
Clock Table Version 1.00
-enum SMU_13_0_7_ODFEATURE_CAP
-{
+enum SMU_13_0_7_ODFEATURE_CAP {
SMU_13_0_7_ODCAP_GFXCLK_LIMITS = 0,
SMU_13_0_7_ODCAP_UCLK_LIMITS,
SMU_13_0_7_ODCAP_POWER_LIMIT,
@@ -62,8 +61,7 @@ enum SMU_13_0_7_ODFEATURE_CAP
SMU_13_0_7_ODCAP_COUNT,
};
-enum SMU_13_0_7_ODFEATURE_ID
-{
+enum SMU_13_0_7_ODFEATURE_ID {
SMU_13_0_7_ODFEATURE_GFXCLK_LIMITS = 1 <<
SMU_13_0_7_ODCAP_GFXCLK_LIMITS, //GFXCLK Limit feature
SMU_13_0_7_ODFEATURE_UCLK_LIMITS = 1 <<
SMU_13_0_7_ODCAP_UCLK_LIMITS, //UCLK Limit feature
SMU_13_0_7_ODFEATURE_POWER_LIMIT = 1 <<
SMU_13_0_7_ODCAP_POWER_LIMIT, //Power Limit feature
@@ -85,8 +83,7 @@ enum SMU_13_0_7_ODFEATURE_ID
#define SMU_13_0_7_MAX_ODFEATURE 32 //Maximum Number of OD Features
-enum SMU_13_0_7_ODSETTING_ID
-{
+enum SMU_13_0_7_ODSETTING_ID {
SMU_13_0_7_ODSETTING_GFXCLKFMAX = 0,
SMU_13_0_7_ODSETTING_GFXCLKFMIN,
SMU_13_0_7_ODSETTING_UCLKFMIN,
@@ -123,8 +120,7 @@ enum SMU_13_0_7_ODSETTING_ID
};
#define SMU_13_0_7_MAX_ODSETTING 64 //Maximum Number of ODSettings
-enum SMU_13_0_7_PWRMODE_SETTING
-{
+enum SMU_13_0_7_PWRMODE_SETTING {
SMU_13_0_7_PMSETTING_POWER_LIMIT_QUIET = 0,
SMU_13_0_7_PMSETTING_POWER_LIMIT_BALANCE,
SMU_13_0_7_PMSETTING_POWER_LIMIT_TURBO,
@@ -144,8 +140,7 @@ enum SMU_13_0_7_PWRMODE_SETTING
};
#define SMU_13_0_7_MAX_PMSETTING 32 //Maximum Number of PowerMode
Settings
-struct smu_13_0_7_overdrive_table
-{
+struct smu_13_0_7_overdrive_table {
uint8_t revision; //Revision =
SMU_13_0_7_PP_OVERDRIVE_VERSION
uint8_t reserve[3]; //Zero filled field
reserved for future use
uint32_t feature_count; //Total number of
supported features
@@ -156,8 +151,7 @@ struct smu_13_0_7_overdrive_table
int16_t pm_setting[SMU_13_0_7_MAX_PMSETTING]; //Optimized power
mode feature settings
};
-enum SMU_13_0_7_PPCLOCK_ID
-{
+enum SMU_13_0_7_PPCLOCK_ID {
SMU_13_0_7_PPCLOCK_GFXCLK = 0,
SMU_13_0_7_PPCLOCK_SOCCLK,
SMU_13_0_7_PPCLOCK_UCLK,
@@ -175,8 +169,7 @@ enum SMU_13_0_7_PPCLOCK_ID
};
#define SMU_13_0_7_MAX_PPCLOCK 16 //Maximum Number of PP Clocks
-struct smu_13_0_7_powerplay_table
-{
+struct smu_13_0_7_powerplay_table {
struct atom_common_table_header header; //For PLUM_BONITO,
header.format_revision = 15, header.content_revision = 0
uint8_t table_revision; //For PLUM_BONITO,
table_revision = 2
uint8_t padding;
[PATCH] drm/amd/pm: Clean up errors in smu_v13_0_1_pmfw.h
Fix the following errors reported by checkpatch:
ERROR: trailing whitespace
Signed-off-by: Ran Sun
---
drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_1_pmfw.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_1_pmfw.h
b/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_1_pmfw.h
index c5e26d619bf0..8ec588248aac 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_1_pmfw.h
+++ b/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_1_pmfw.h
@@ -30,7 +30,7 @@
#define ENABLE_DEBUG_FEATURES
-// Firmware features
+// Firmware features
// Feature Control Defines
#define FEATURE_CCLK_DPM_BIT 0
#define FEATURE_FAN_CONTROLLER_BIT 1
@@ -92,7 +92,7 @@
#define FEATURE_ZSTATES_ECO_BIT 57
#define FEATURE_CC6_BIT 58
#define FEATURE_DS_UMCCLK_BIT 59
-#define FEATURE_DS_HSPCLK_BIT 60
+#define FEATURE_DS_HSPCLK_BIT 60
#define NUM_FEATURES61
typedef struct {
[PATCH] drm/amd/pm: Clean up errors in smu_v11_0_7_pptable.h
Fix the following errors reported by checkpatch:
ERROR: trailing whitespace
ERROR: open brace '{' following struct go on the same line
Signed-off-by: Ran Sun
---
.../amd/pm/swsmu/inc/smu_v11_0_7_pptable.h| 41 +--
1 file changed, 19 insertions(+), 22 deletions(-)
diff --git a/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0_7_pptable.h
b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0_7_pptable.h
index 1cb399dbc7cc..64d60d48846a 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0_7_pptable.h
+++ b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0_7_pptable.h
@@ -42,23 +42,23 @@
#define SMU_11_0_7_PP_POWERSAVINGCLOCK_VERSION0x01
// Power Saving Clock Table Version 1.00
enum SMU_11_0_7_ODFEATURE_CAP {
-SMU_11_0_7_ODCAP_GFXCLK_LIMITS = 0,
-SMU_11_0_7_ODCAP_GFXCLK_CURVE,
-SMU_11_0_7_ODCAP_UCLK_LIMITS,
-SMU_11_0_7_ODCAP_POWER_LIMIT,
-SMU_11_0_7_ODCAP_FAN_ACOUSTIC_LIMIT,
-SMU_11_0_7_ODCAP_FAN_SPEED_MIN,
-SMU_11_0_7_ODCAP_TEMPERATURE_FAN,
-SMU_11_0_7_ODCAP_TEMPERATURE_SYSTEM,
-SMU_11_0_7_ODCAP_MEMORY_TIMING_TUNE,
-SMU_11_0_7_ODCAP_FAN_ZERO_RPM_CONTROL,
-SMU_11_0_7_ODCAP_AUTO_UV_ENGINE,
-SMU_11_0_7_ODCAP_AUTO_OC_ENGINE,
-SMU_11_0_7_ODCAP_AUTO_OC_MEMORY,
+SMU_11_0_7_ODCAP_GFXCLK_LIMITS = 0,
+SMU_11_0_7_ODCAP_GFXCLK_CURVE,
+SMU_11_0_7_ODCAP_UCLK_LIMITS,
+SMU_11_0_7_ODCAP_POWER_LIMIT,
+SMU_11_0_7_ODCAP_FAN_ACOUSTIC_LIMIT,
+SMU_11_0_7_ODCAP_FAN_SPEED_MIN,
+SMU_11_0_7_ODCAP_TEMPERATURE_FAN,
+SMU_11_0_7_ODCAP_TEMPERATURE_SYSTEM,
+SMU_11_0_7_ODCAP_MEMORY_TIMING_TUNE,
+SMU_11_0_7_ODCAP_FAN_ZERO_RPM_CONTROL,
+SMU_11_0_7_ODCAP_AUTO_UV_ENGINE,
+SMU_11_0_7_ODCAP_AUTO_OC_ENGINE,
+SMU_11_0_7_ODCAP_AUTO_OC_MEMORY,
SMU_11_0_7_ODCAP_FAN_CURVE,
SMU_11_0_ODCAP_AUTO_FAN_ACOUSTIC_LIMIT,
-SMU_11_0_7_ODCAP_POWER_MODE,
-SMU_11_0_7_ODCAP_COUNT,
+SMU_11_0_7_ODCAP_POWER_MODE,
+SMU_11_0_7_ODCAP_COUNT,
};
enum SMU_11_0_7_ODFEATURE_ID {
@@ -130,8 +130,7 @@ enum SMU_11_0_7_PWRMODE_SETTING {
};
#define SMU_11_0_7_MAX_PMSETTING 32//Maximum Number of
PowerMode Settings
-struct smu_11_0_7_overdrive_table
-{
+struct smu_11_0_7_overdrive_table {
uint8_t revision;
//Revision = SMU_11_0_7_PP_OVERDRIVE_VERSION
uint8_t reserve[3]; //Zero
filled field reserved for future use
uint32_t feature_count; //Total
number of supported features
@@ -160,8 +159,7 @@ enum SMU_11_0_7_PPCLOCK_ID {
};
#define SMU_11_0_7_MAX_PPCLOCK 16 //Maximum Number of PP
Clocks
-struct smu_11_0_7_power_saving_clock_table
-{
+struct smu_11_0_7_power_saving_clock_table {
uint8_t revision;
//Revision = SMU_11_0_7_PP_POWERSAVINGCLOCK_VERSION
uint8_t reserve[3]; //Zero
filled field reserved for future use
uint32_t count;
//power_saving_clock_count = SMU_11_0_7_PPCLOCK_COUNT
@@ -169,8 +167,7 @@ struct smu_11_0_7_power_saving_clock_table
uint32_t min[SMU_11_0_7_MAX_PPCLOCK];
//PowerSavingClock Mode Clock Minimum array In MHz
};
-struct smu_11_0_7_powerplay_table
-{
+struct smu_11_0_7_powerplay_table {
struct atom_common_table_header header; //For
sienna_cichlid, header.format_revision = 15, header.content_revision = 0
uint8_t table_revision; //For
sienna_cichlid, table_revision = 2
uint16_t table_size; //Driver portion
table size. The offset to smc_pptable including header size
@@ -178,7 +175,7 @@ struct smu_11_0_7_powerplay_table
uint32_t golden_revision; //PPGen use only:
PP Table Revision on the Golden Data Base
uint16_t format_id; //PPGen use only:
PPTable for different ASICs. For sienna_cichlid this should be 0x80
uint32_t platform_caps;
//POWERPLAYABLE::ulPlatformCaps
-
+
uint8_t thermal_controller_type; //one of
SMU_11_0_7_PP_THERMALCONTROLLER
uint16_t small_power_limit1;
[PATCH] drm/amd/pm: open brace '{' following function definitions go on the next line
ERROR: open brace '{' following function definitions go on the next line
Signed-off-by: Ran Sun
---
drivers/gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c
b/drivers/gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c
index c788aa7a99a9..5e408a195860 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c
@@ -205,7 +205,8 @@ int smu_v12_0_set_default_dpm_tables(struct
smu_context *smu)
return smu_cmn_update_table(smu, SMU_TABLE_DPMCLOCKS, 0,
smu_table->clocks_table, false);
}
-int smu_v12_0_mode2_reset(struct smu_context *smu){
+int smu_v12_0_mode2_reset(struct smu_context *smu)
+{
return smu_cmn_send_smc_msg_with_param(smu,
SMU_MSG_GfxDeviceDriverReset, SMU_RESET_MODE_2, NULL);
}
[PATCH] drm/amd/pm: that open brace { should be on the previous line
ERROR: that open brace { should be on the previous line
Signed-off-by: Ran Sun
---
drivers/gpu/drm/amd/pm/swsmu/inc/smu_11_0_cdr_table.h | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/amd/pm/swsmu/inc/smu_11_0_cdr_table.h
b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_11_0_cdr_table.h
index beab6d7b28b7..630132c4a76b 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/inc/smu_11_0_cdr_table.h
+++ b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_11_0_cdr_table.h
@@ -52,8 +52,7 @@ static unsigned int DbiPrbs7[] =
//4096 bytes, 256 byte aligned
-static unsigned int NoDbiPrbs7[] =
-{
+static unsigned int NoDbiPrbs7[] = {
0x0f0f0f0f, 0x0f0f0f0f, 0x0f0f0f0f, 0xf0f00f0f, 0x0f0f0f0f,
0x0f0f0f0f, 0xf0f0f0f0, 0x0f0f0f0f, 0x0f0f0f0f, 0xf0f00f0f, 0xf0f00f0f,
0x0f0f0f0f, 0xf0f0f0f0, 0xf0f0f0f0, 0x0f0f0f0f, 0xf0f00f0f,
0x0f0f0f0f, 0xf0f00f0f, 0xf0f0f0f0, 0x0f0f0f0f, 0xf0f0f0f0,
0xf0f00f0f, 0xf0f00f0f, 0xf0f00f0f, 0x0f0ff0f0, 0xf0f0f0f0, 0xf0f0f0f0,
0x0f0ff0f0, 0x0f0f0f0f, 0x0f0f0f0f, 0xf0f0f0f0, 0xf0f00f0f,
0x0f0f0f0f, 0xf0f00f0f, 0x0f0ff0f0, 0x0f0f0f0f, 0xf0f0f0f0,
0x0f0ff0f0, 0xf0f00f0f, 0xf0f00f0f, 0xf0f0f0f0, 0x0f0ff0f0, 0xf0f0f0f0,
0xf0f00f0f, 0xf0f0f0f0, 0x0f0f0f0f, 0x0f0ff0f0, 0xf0f00f0f,
@@ -121,8 +120,7 @@ static unsigned int NoDbiPrbs7[] =
};
// 4096 bytes, 256 byte aligned
-static unsigned int DbiPrbs7[] =
-{
+static unsigned int DbiPrbs7[] = {
0x, 0x, 0x, 0x, 0x,
0x, 0x, 0x, 0x, 0x, 0x,
0x, 0x, 0x, 0x, 0x,
0x, 0x, 0x, 0x, 0x,
0x, 0x, 0x, 0x, 0x, 0x,
0x, 0x, 0x, 0x, 0x,
0x, 0x, 0x, 0x, 0x,
0x, 0x, 0x, 0x, 0x, 0x,
0x, 0x, 0x, 0x, 0x,
[PATCH] drm/amd/pm: Clean up errors in smu11_driver_if_sienna_cichlid.h
Fix the following errors reported by checkpatch:
ERROR: trailing whitespace
Signed-off-by: Ran Sun
---
drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_1_pmfw.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_1_pmfw.h
b/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_1_pmfw.h
index c5e26d619bf0..8ec588248aac 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_1_pmfw.h
+++ b/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_1_pmfw.h
@@ -30,7 +30,7 @@
#define ENABLE_DEBUG_FEATURES
-// Firmware features
+// Firmware features
// Feature Control Defines
#define FEATURE_CCLK_DPM_BIT 0
#define FEATURE_FAN_CONTROLLER_BIT 1
@@ -92,7 +92,7 @@
#define FEATURE_ZSTATES_ECO_BIT 57
#define FEATURE_CC6_BIT 58
#define FEATURE_DS_UMCCLK_BIT 59
-#define FEATURE_DS_HSPCLK_BIT 60
+#define FEATURE_DS_HSPCLK_BIT 60
#define NUM_FEATURES61
typedef struct {
[PATCH] drm/amd/pm: Clean up errors in smu11_driver_if_sienna_cichlid.h
Fix the following errors reported by checkpatch:
ERROR: trailing whitespace
ERROR: space prohibited before open square bracket '['
ERROR: space prohibited before that close square bracket ']'
Signed-off-by: Ran Sun
---
.../pmfw_if/smu11_driver_if_sienna_cichlid.h | 386 +-
1 file changed, 193 insertions(+), 193 deletions(-)
diff --git
a/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu11_driver_if_sienna_cichlid.h
b/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu11_driver_if_sienna_cichlid.h
index aa6d29de4002..703ade13d9f4 100644
---
a/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu11_driver_if_sienna_cichlid.h
+++
b/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu11_driver_if_sienna_cichlid.h
@@ -225,33 +225,33 @@ typedef enum {
#define FW_DSTATE_MP1_WHISPER_MODE_BIT 6
#define FW_DSTATE_SOC_LIV_MIN_BIT 7
#define FW_DSTATE_SOC_PLL_PWRDN_BIT 8
-#define FW_DSTATE_MEM_PLL_PWRDN_BIT 9
+#define FW_DSTATE_MEM_PLL_PWRDN_BIT 9
#define FW_DSTATE_OPTIMIZE_MALL_REFRESH_BIT 10
#define FW_DSTATE_MEM_PSI_BIT 11
#define FW_DSTATE_HSR_NON_STROBE_BIT12
#define FW_DSTATE_MP0_ENTER_WFI_BIT 13
-#define FW_DSTATE_SOC_ULV_MASK(1 <<
FW_DSTATE_SOC_ULV_BIT )
-#define FW_DSTATE_G6_HSR_MASK (1 <<
FW_DSTATE_G6_HSR_BIT )
-#define FW_DSTATE_G6_PHY_VDDCI_OFF_MASK (1 <<
FW_DSTATE_G6_PHY_VDDCI_OFF_BIT )
-#define FW_DSTATE_MP1_DS_MASK (1 <<
FW_DSTATE_MP1_DS_BIT )
-#define FW_DSTATE_MP0_DS_MASK (1 <<
FW_DSTATE_MP0_DS_BIT )
-#define FW_DSTATE_SMN_DS_MASK (1 <<
FW_DSTATE_SMN_DS_BIT )
-#define FW_DSTATE_MP1_WHISPER_MODE_MASK (1 <<
FW_DSTATE_MP1_WHISPER_MODE_BIT )
-#define FW_DSTATE_SOC_LIV_MIN_MASK(1 <<
FW_DSTATE_SOC_LIV_MIN_BIT )
-#define FW_DSTATE_SOC_PLL_PWRDN_MASK (1 <<
FW_DSTATE_SOC_PLL_PWRDN_BIT)
-#define FW_DSTATE_MEM_PLL_PWRDN_MASK (1 <<
FW_DSTATE_MEM_PLL_PWRDN_BIT)
-#define FW_DSTATE_OPTIMIZE_MALL_REFRESH_MASK (1 <<
FW_DSTATE_OPTIMIZE_MALL_REFRESH_BIT)
-#define FW_DSTATE_MEM_PSI_MASK(1 <<
FW_DSTATE_MEM_PSI_BIT)
-#define FW_DSTATE_HSR_NON_STROBE_MASK (1 <<
FW_DSTATE_HSR_NON_STROBE_BIT)
-#define FW_DSTATE_MP0_ENTER_WFI_MASK (1 <<
FW_DSTATE_MP0_ENTER_WFI_BIT)
+#define FW_DSTATE_SOC_ULV_MASK(1 <<
FW_DSTATE_SOC_ULV_BIT)
+#define FW_DSTATE_G6_HSR_MASK (1 <<
FW_DSTATE_G6_HSR_BIT)
+#define FW_DSTATE_G6_PHY_VDDCI_OFF_MASK (1 <<
FW_DSTATE_G6_PHY_VDDCI_OFF_BIT)
+#define FW_DSTATE_MP1_DS_MASK (1 <<
FW_DSTATE_MP1_DS_BIT)
+#define FW_DSTATE_MP0_DS_MASK (1 <<
FW_DSTATE_MP0_DS_BIT)
+#define FW_DSTATE_SMN_DS_MASK (1 <<
FW_DSTATE_SMN_DS_BIT)
+#define FW_DSTATE_MP1_WHISPER_MODE_MASK (1 <<
FW_DSTATE_MP1_WHISPER_MODE_BIT)
+#define FW_DSTATE_SOC_LIV_MIN_MASK(1 <<
FW_DSTATE_SOC_LIV_MIN_BIT)
+#define FW_DSTATE_SOC_PLL_PWRDN_MASK (1 <<
FW_DSTATE_SOC_PLL_PWRDN_BIT)
+#define FW_DSTATE_MEM_PLL_PWRDN_MASK (1 <<
FW_DSTATE_MEM_PLL_PWRDN_BIT)
+#define FW_DSTATE_OPTIMIZE_MALL_REFRESH_MASK (1 <<
FW_DSTATE_OPTIMIZE_MALL_REFRESH_BIT)
+#define FW_DSTATE_MEM_PSI_MASK(1 <<
FW_DSTATE_MEM_PSI_BIT)
+#define FW_DSTATE_HSR_NON_STROBE_MASK (1 <<
FW_DSTATE_HSR_NON_STROBE_BIT)
+#define FW_DSTATE_MP0_ENTER_WFI_MASK (1 <<
FW_DSTATE_MP0_ENTER_WFI_BIT)
// GFX GPO Feature Contains PACE and DEM sub features
#define GFX_GPO_PACE_BIT 0
#define GFX_GPO_DEM_BIT1
#define GFX_GPO_PACE_MASK (1 << GFX_GPO_PACE_BIT)
-#define GFX_GPO_DEM_MASK (1 << GFX_GPO_DEM_BIT )
+#define GFX_GPO_DEM_MASK (1 << GFX_GPO_DEM_BIT)
#define GPO_UPDATE_REQ_UCLKDPM_MASK 0x1
#define GPO_UPDATE_REQ_FCLKDPM_MASK 0x2
@@ -312,10 +312,10 @@ typedef enum {
I2C_CONTROLLER_NAME_VR_VDDCI,
I2C_CONTROLLER_NAME_VR_MVDD,
I2C_CONTROLLER_NAME_LIQUID0,
- I2C_CONTROLLER_NAME_LIQUID1,
+ I2C_CONTROLLER_NAME_LIQUID1,
I2C_CONTROLLER_NAME_PLX,
I2C_CONTROLLER_NAME_OTHER,
- I2C_CONTROLLER_NAME_COUNT,
+ I2C_CONTROLLER_NAME_COUNT,
} I2cControllerName_e;
typedef enum {
@@ -325,10 +325,10 @@ typedef enum {
I2C_CONTROLLER_THROTTLER_VR_VDDCI,
I2C_CONTROLLER_THROTTLER_VR_MVDD,
I2C_CONTROLLER_THROTTLER_LIQUID0,
- I2C_CONTROLLER_THROTTLER_LIQUID1,
+ I2C_CONTROLLER_THROTTLER_LIQUID1,
I2C_CONTROLLER_THROTTLER_PLX,
I2C_CONTROLLER_THROTTLER_INA3221,
- I2C_CONTROLLER_THROTTLER_COUNT,
+ I2C_CONTROLLER_THROTTLER_COUNT,
} I2cControllerThrottler_e;
typedef enum {
@@ -336,24 +336,24 @@ typedef enum {
I2C_CONTROLLER_PROTOCOL_VR_IR35217,
I2C_CONTROLLER_PROTOCOL_TMP_TMP102A,
[PATCH] drm/amd/pm: Clean up errors in arcturus_ppt.c
Fix the following errors reported by checkpatch:
ERROR: "foo* bar" should be "foo *bar"
ERROR: spaces required around that '=' (ctx:VxW)
ERROR: space prohibited before that close parenthesis ')'
Signed-off-by: Ran Sun
---
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c
b/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c
index 3ecb900e6ecd..b26e9ac1ac30 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c
@@ -691,7 +691,7 @@ int smu_cmn_feature_set_enabled(struct smu_context
*smu,
#undef __SMU_DUMMY_MAP
#define __SMU_DUMMY_MAP(fea) #fea
-static const char* __smu_feature_names[] = {
+static const char *__smu_feature_names[] = {
SMU_FEATURE_MASKS
};
@@ -927,7 +927,7 @@ int smu_cmn_get_metrics_table(struct smu_context
*smu,
void *metrics_table,
bool bypass_cache)
{
- struct smu_table_context *smu_table= >smu_table;
+ struct smu_table_context *smu_table = >smu_table;
uint32_t table_size =
smu_table->tables[SMU_TABLE_SMU_METRICS].size;
int ret = 0;
@@ -969,7 +969,7 @@ void smu_cmn_init_soft_gpu_metrics(void *table,
uint8_t frev, uint8_t crev)
struct metrics_table_header *header = (struct metrics_table_header
*)table;
uint16_t structure_size;
-#define METRICS_VERSION(a, b) ((a << 16) | b )
+#define METRICS_VERSION(a, b) ((a << 16) | b)
switch (METRICS_VERSION(frev, crev)) {
case METRICS_VERSION(1, 0):
[PATCH] drm/amd/pm: Clean up errors in arcturus_ppt.c
Fix the following errors reported by checkpatch:
ERROR: spaces required around that '=' (ctx:VxW)
ERROR: spaces required around that '>=' (ctx:WxV)
Signed-off-by: Ran Sun
---
drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
index 3bb18396d2f9..c49f770c97b3 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
@@ -598,7 +598,7 @@ static int arcturus_get_smu_metrics_data(struct
smu_context *smu,
MetricsMember_t member,
uint32_t *value)
{
- struct smu_table_context *smu_table= >smu_table;
+ struct smu_table_context *smu_table = >smu_table;
SmuMetrics_t *metrics = (SmuMetrics_t *)smu_table->metrics_table;
int ret = 0;
@@ -1482,7 +1482,7 @@ static int arcturus_set_power_profile_mode(struct
smu_context *smu,
return ret;
if ((profile_mode == PP_SMC_POWER_PROFILE_CUSTOM) &&
-(smu_version >=0x360d00)) {
+(smu_version >= 0x360d00)) {
ret = smu_cmn_update_table(smu,
SMU_TABLE_ACTIVITY_MONITOR_COEFF,
WORKLOAD_PPLIB_CUSTOM_BIT,
[PATCH] drm/amd/pm: Clean up errors in sienna_cichlid_ppt.c
Fix the following errors reported by checkpatch:
ERROR: space required after that ',' (ctx:VxV)
ERROR: space required before the open parenthesis '('
ERROR: spaces required around that '=' (ctx:VxW)
Signed-off-by: Ran Sun
---
.../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c
b/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c
index 0cda3b276f61..5c233eda09ee 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c
@@ -78,7 +78,7 @@
(*member) = (smu->smu_table.driver_pptable +
offsetof(PPTable_beige_goby_t, field));\
else\
(*member) = (smu->smu_table.driver_pptable + offsetof(PPTable_t,
field));\
-} while(0)
+} while (0)
/* STB FIFO depth is in 64bit units */
#define SIENNA_CICHLID_STB_DEPTH_UNIT_BYTES 8
@@ -590,7 +590,7 @@ static int sienna_cichlid_tables_init(struct
smu_context *smu)
static uint32_t sienna_cichlid_get_throttler_status_locked(struct
smu_context *smu)
{
- struct smu_table_context *smu_table= >smu_table;
+ struct smu_table_context *smu_tabl = >smu_table;
SmuMetricsExternal_t *metrics_ext =
(SmuMetricsExternal_t *)(smu_table->metrics_table);
uint32_t throttler_status = 0;
@@ -711,7 +711,7 @@ static int
sienna_cichlid_get_smu_metrics_data(struct smu_context *smu,
MetricsMember_t member,
uint32_t *value)
{
- struct smu_table_context *smu_table= >smu_table;
+ struct smu_table_context *smu_table = >smu_table;
SmuMetrics_t *metrics =
&(((SmuMetricsExternal_t
*)(smu_table->metrics_table))->SmuMetrics);
SmuMetrics_V2_t *metrics_v2 =
@@ -1461,7 +1461,7 @@ static int sienna_cichlid_force_clk_levels(struct
smu_context *smu,
goto forec_level_out;
break;
case SMU_DCEFCLK:
- dev_info(smu->adev->dev,"Setting DCEFCLK min/max dpm level is not
supported!\n");
+ dev_info(smu->adev->dev, "Setting DCEFCLK min/max dpm level is not
supported!\n");
break;
default:
break;
@@ -1881,7 +1881,7 @@ static int sienna_cichlid_read_sensor(struct
smu_context *smu,
uint16_t *temp;
struct amdgpu_device *adev = smu->adev;
- if(!data || !size)
+ if (!data || !size)
return -EINVAL;
switch (sensor) {
@@ -2067,15 +2067,15 @@ static int
sienna_cichlid_display_disable_memory_clock_switch(struct smu_context
uint32_t min_memory_clock = smu->hard_min_uclk_req_from_dal;
uint32_t max_memory_clock = max_sustainable_clocks->uclock;
- if(smu->disable_uclk_switch == disable_memory_clock_switch)
+ if (smu->disable_uclk_switch == disable_memory_clock_switch)
return 0;
- if(disable_memory_clock_switch)
+ if (disable_memory_clock_switch)
ret = smu_v11_0_set_hard_freq_limited_range(smu, SMU_UCLK,
max_memory_clock, 0);
else
ret = smu_v11_0_set_hard_freq_limited_range(smu, SMU_UCLK,
min_memory_clock, 0);
- if(!ret)
+ if (!ret)
smu->disable_uclk_switch = disable_memory_clock_switch;
return ret;
[PATCH] drm/amd/pm: Clean up errors in navi10_ppt.c
Fix the following errors reported by checkpatch:
ERROR: open brace '{' following function definitions go on the next line
ERROR: space required before the open parenthesis '('
ERROR: space required after that ',' (ctx:VxV)
ERROR: spaces required around that '=' (ctx:VxW)
Signed-off-by: Ran Sun
---
.../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 25 ++-
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
index 95f6d821bacb..e655071516b7 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
@@ -136,7 +136,7 @@ static struct cmn2asic_msg_mapping
navi10_message_map[SMU_MSG_MAX_COUNT] = {
MSG_MAP(PowerDownJpeg, PPSMC_MSG_PowerDownJpeg,
0),
MSG_MAP(BacoAudioD3PME, PPSMC_MSG_BacoAudioD3PME,
0),
MSG_MAP(ArmD3, PPSMC_MSG_ArmD3,
0),
-
MSG_MAP(DAL_DISABLE_DUMMY_PSTATE_CHANGE,PPSMC_MSG_DALDisableDummyPstateChange,
0),
+ MSG_MAP(DAL_DISABLE_DUMMY_PSTATE_CHANGE,
PPSMC_MSG_DALDisableDummyPstateChange, 0),
MSG_MAP(DAL_ENABLE_DUMMY_PSTATE_CHANGE, PPSMC_MSG_DALEnableDummyPstateChange, 0),
MSG_MAP(GetVoltageByDpm,PPSMC_MSG_GetVoltageByDpm,
0),
MSG_MAP(GetVoltageByDpmOverdrive, PPSMC_MSG_GetVoltageByDpmOverdrive, 0),
@@ -556,7 +556,7 @@ static int navi10_get_legacy_smu_metrics_data(struct
smu_context *smu,
MetricsMember_t member,
uint32_t *value)
{
- struct smu_table_context *smu_table= >smu_table;
+ struct smu_table_context *smu_table = >smu_table;
SmuMetrics_legacy_t *metrics =
(SmuMetrics_legacy_t *)smu_table->metrics_table;
int ret = 0;
@@ -642,7 +642,7 @@ static int navi10_get_smu_metrics_data(struct
smu_context *smu,
MetricsMember_t member,
uint32_t *value)
{
- struct smu_table_context *smu_table= >smu_table;
+ struct smu_table_context *smu_table = >smu_table;
SmuMetrics_t *metrics =
(SmuMetrics_t *)smu_table->metrics_table;
int ret = 0;
@@ -731,7 +731,7 @@ static int navi12_get_legacy_smu_metrics_data(struct
smu_context *smu,
MetricsMember_t member,
uint32_t *value)
{
- struct smu_table_context *smu_table= >smu_table;
+ struct smu_table_context *smu_table = >smu_table;
SmuMetrics_NV12_legacy_t *metrics =
(SmuMetrics_NV12_legacy_t *)smu_table->metrics_table;
int ret = 0;
@@ -817,7 +817,7 @@ static int navi12_get_smu_metrics_data(struct
smu_context *smu,
MetricsMember_t member,
uint32_t *value)
{
- struct smu_table_context *smu_table= >smu_table;
+ struct smu_table_context *smu_table = >smu_table;
SmuMetrics_NV12_t *metrics =
(SmuMetrics_NV12_t *)smu_table->metrics_table;
int ret = 0;
@@ -1686,7 +1686,7 @@ static int navi10_force_clk_levels(struct
smu_context *smu,
return 0;
break;
case SMU_DCEFCLK:
- dev_info(smu->adev->dev,"Setting DCEFCLK min/max dpm level is not
supported!\n");
+ dev_info(smu->adev->dev, "Setting DCEFCLK min/max dpm level is not
supported!\n");
break;
default:
@@ -2182,7 +2182,7 @@ static int navi10_read_sensor(struct smu_context
*smu,
struct smu_table_context *table_context = >smu_table;
PPTable_t *pptable = table_context->driver_pptable;
- if(!data || !size)
+ if (!data || !size)
return -EINVAL;
switch (sensor) {
@@ -2317,15 +2317,15 @@ static int
navi10_display_disable_memory_clock_switch(struct smu_context *smu,
uint32_t min_memory_clock = smu->hard_min_uclk_req_from_dal;
uint32_t max_memory_clock = max_sustainable_clocks->uclock;
- if(smu->disable_uclk_switch == disable_memory_clock_switch)
+ if (smu->disable_uclk_switch == disable_memory_clock_switch)
return 0;
- if(disable_memory_clock_switch)
+ if (disable_memory_clock_switch)
ret = smu_v11_0_set_hard_freq_limited_range(smu, SMU_UCLK,
max_memory_clock, 0);
else
ret = smu_v11_0_set_hard_freq_limited_range(smu, SMU_UCLK,
min_memory_clock, 0);
- if(!ret)
+ if (!ret)
smu->disable_uclk_switch = disable_memory_clock_switch;
return ret;
@@ -2559,7 +2559,8 @@ static int navi10_set_default_od_settings(struct
smu_context *smu)
return 0;
}
-static int navi10_od_edit_dpm_table(struct smu_context
[PATCH] drm/amd/pm:open brace '{' following function definitions go on the next line
ERROR: open brace '{' following function definitions go on the next line
Signed-off-by: Ran Sun
---
drivers/gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c
b/drivers/gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c
index c788aa7a99a9..5e408a195860 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c
@@ -205,7 +205,8 @@ int smu_v12_0_set_default_dpm_tables(struct
smu_context *smu)
return smu_cmn_update_table(smu, SMU_TABLE_DPMCLOCKS, 0,
smu_table->clocks_table, false);
}
-int smu_v12_0_mode2_reset(struct smu_context *smu){
+int smu_v12_0_mode2_reset(struct smu_context *smu)
+{
return smu_cmn_send_smc_msg_with_param(smu,
SMU_MSG_GfxDeviceDriverReset, SMU_RESET_MODE_2, NULL);
}
[PATCH] drm/amd/pm: add missing spaces before '('
ERROR: space required before the open parenthesis '('
Signed-off-by: Ran Sun
---
drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c
b/drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c
index 8a8ba25c9ad7..a7569354229d 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c
@@ -262,15 +262,15 @@ static int renoir_get_profiling_clk_mask(struct
smu_context *smu,
/* mclk levels are in reverse order */
*mclk_mask = NUM_MEMCLK_DPM_LEVELS - 1;
} else if (level == AMD_DPM_FORCED_LEVEL_PROFILE_PEAK) {
- if(sclk_mask)
+ if (sclk_mask)
/* The sclk as gfxclk and has three level about
max/min/current */
*sclk_mask = 3 - 1;
- if(mclk_mask)
+ if (mclk_mask)
/* mclk levels are in reverse order */
*mclk_mask = 0;
- if(soc_mask)
+ if (soc_mask)
*soc_mask = NUM_SOCCLK_DPM_LEVELS - 1;
}
[PATCH] drm: "foo * bar" should be "foo *bar"
ERROR: "foo * bar" should be "foo *bar"
Signed-off-by: Ran Sun
---
drivers/gpu/drm/drm_legacy.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/drm_legacy.h b/drivers/gpu/drm/drm_legacy.h
index 70c9dba114a6..f098a48cbdf4 100644
--- a/drivers/gpu/drm/drm_legacy.h
+++ b/drivers/gpu/drm/drm_legacy.h
@@ -231,7 +231,7 @@ static inline int drm_legacy_dma_setup(struct
drm_device *dev)
#endif
void drm_legacy_free_buffer(struct drm_device *dev,
- struct drm_buf * buf);
+ struct drm_buf *buf);
#if IS_ENABLED(CONFIG_DRM_LEGACY)
void drm_legacy_reclaim_buffers(struct drm_device *dev,
struct drm_file *filp);
@@ -253,12 +253,12 @@ int drm_legacy_sg_free(struct drm_device *dev,
void *data,
void drm_legacy_init_members(struct drm_device *dev);
void drm_legacy_destroy_members(struct drm_device *dev);
void drm_legacy_dev_reinit(struct drm_device *dev);
-int drm_legacy_setup(struct drm_device * dev);
+int drm_legacy_setup(struct drm_device *dev);
#else
static inline void drm_legacy_init_members(struct drm_device *dev) {}
static inline void drm_legacy_destroy_members(struct drm_device *dev)
{}
static inline void drm_legacy_dev_reinit(struct drm_device *dev) {}
-static inline int drm_legacy_setup(struct drm_device * dev) { return 0;
}
+static inline int drm_legacy_setup(struct drm_device *dev) { return 0;
}
#endif
#if IS_ENABLED(CONFIG_DRM_LEGACY)
[PATCH] drm/radeon: Move assignment outside if condition
Fixes the following checkpatch errors:
ERROR: do not use assignment in if condition
Signed-off-by: Ran Sun
---
drivers/gpu/drm/radeon/radeon_legacy_tv.c | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_tv.c
b/drivers/gpu/drm/radeon/radeon_legacy_tv.c
index 12e180b119ac..7883e9ec0bae 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_tv.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_tv.c
@@ -724,12 +724,14 @@ void radeon_legacy_tv_mode_set(struct drm_encoder
*encoder,
}
for (i = 0; i < MAX_H_CODE_TIMING_LEN; i++) {
- if ((tv_dac->tv.h_code_timing[i] = hor_timing[i]) == 0)
+ tv_dac->tv.h_code_timing[i] = hor_timing[i];
+ if (tv_dac->tv.h_code_timing[i] == 0)
break;
}
for (i = 0; i < MAX_V_CODE_TIMING_LEN; i++) {
- if ((tv_dac->tv.v_code_timing[i] = vert_timing[i]) == 0)
+ tv_dac->tv.v_code_timing[i] = vert_timing[i];
+ if (tv_dac->tv.v_code_timing[i] == 0)
break;
}
[PATCH] drm/radeon: that open brace { should be on the previous line
ERROR: that open brace { should be on the previous line
Signed-off-by: Ran Sun
---
drivers/gpu/drm/radeon/rv770_smc.c | 36 ++
1 file changed, 12 insertions(+), 24 deletions(-)
diff --git a/drivers/gpu/drm/radeon/rv770_smc.c
b/drivers/gpu/drm/radeon/rv770_smc.c
index 45575c0d0a1d..09fa7f5e7c41 100644
--- a/drivers/gpu/drm/radeon/rv770_smc.c
+++ b/drivers/gpu/drm/radeon/rv770_smc.c
@@ -34,8 +34,7 @@
#define FIRST_SMC_INT_VECT_REG 0xFFD8
#define FIRST_INT_VECT_S19 0xFFC0
-static const u8 rv770_smc_int_vectors[] =
-{
+static const u8 rv770_smc_int_vectors[] = {
0x08, 0x10, 0x08, 0x10,
0x08, 0x10, 0x08, 0x10,
0x08, 0x10, 0x08, 0x10,
@@ -54,8 +53,7 @@ static const u8 rv770_smc_int_vectors[] =
0x03, 0x51, 0x03, 0x51
};
-static const u8 rv730_smc_int_vectors[] =
-{
+static const u8 rv730_smc_int_vectors[] = {
0x08, 0x15, 0x08, 0x15,
0x08, 0x15, 0x08, 0x15,
0x08, 0x15, 0x08, 0x15,
@@ -74,8 +72,7 @@ static const u8 rv730_smc_int_vectors[] =
0x03, 0x56, 0x03, 0x56
};
-static const u8 rv710_smc_int_vectors[] =
-{
+static const u8 rv710_smc_int_vectors[] = {
0x08, 0x04, 0x08, 0x04,
0x08, 0x04, 0x08, 0x04,
0x08, 0x04, 0x08, 0x04,
@@ -94,8 +91,7 @@ static const u8 rv710_smc_int_vectors[] =
0x03, 0x51, 0x03, 0x51
};
-static const u8 rv740_smc_int_vectors[] =
-{
+static const u8 rv740_smc_int_vectors[] = {
0x08, 0x10, 0x08, 0x10,
0x08, 0x10, 0x08, 0x10,
0x08, 0x10, 0x08, 0x10,
@@ -114,8 +110,7 @@ static const u8 rv740_smc_int_vectors[] =
0x03, 0x51, 0x03, 0x51
};
-static const u8 cedar_smc_int_vectors[] =
-{
+static const u8 cedar_smc_int_vectors[] = {
0x0B, 0x05, 0x0B, 0x05,
0x0B, 0x05, 0x0B, 0x05,
0x0B, 0x05, 0x0B, 0x05,
@@ -134,8 +129,7 @@ static const u8 cedar_smc_int_vectors[] =
0x04, 0xF6, 0x04, 0xF6
};
-static const u8 redwood_smc_int_vectors[] =
-{
+static const u8 redwood_smc_int_vectors[] = {
0x0B, 0x05, 0x0B, 0x05,
0x0B, 0x05, 0x0B, 0x05,
0x0B, 0x05, 0x0B, 0x05,
@@ -154,8 +148,7 @@ static const u8 redwood_smc_int_vectors[] =
0x04, 0xF6, 0x04, 0xF6
};
-static const u8 juniper_smc_int_vectors[] =
-{
+static const u8 juniper_smc_int_vectors[] = {
0x0B, 0x05, 0x0B, 0x05,
0x0B, 0x05, 0x0B, 0x05,
0x0B, 0x05, 0x0B, 0x05,
@@ -174,8 +167,7 @@ static const u8 juniper_smc_int_vectors[] =
0x04, 0xF6, 0x04, 0xF6
};
-static const u8 cypress_smc_int_vectors[] =
-{
+static const u8 cypress_smc_int_vectors[] = {
0x0B, 0x05, 0x0B, 0x05,
0x0B, 0x05, 0x0B, 0x05,
0x0B, 0x05, 0x0B, 0x05,
@@ -194,8 +186,7 @@ static const u8 cypress_smc_int_vectors[] =
0x04, 0xF6, 0x04, 0xF6
};
-static const u8 barts_smc_int_vectors[] =
-{
+static const u8 barts_smc_int_vectors[] = {
0x0C, 0x14, 0x0C, 0x14,
0x0C, 0x14, 0x0C, 0x14,
0x0C, 0x14, 0x0C, 0x14,
@@ -214,8 +205,7 @@ static const u8 barts_smc_int_vectors[] =
0x05, 0x0A, 0x05, 0x0A
};
-static const u8 turks_smc_int_vectors[] =
-{
+static const u8 turks_smc_int_vectors[] = {
0x0C, 0x14, 0x0C, 0x14,
0x0C, 0x14, 0x0C, 0x14,
0x0C, 0x14, 0x0C, 0x14,
@@ -234,8 +224,7 @@ static const u8 turks_smc_int_vectors[] =
0x05, 0x0A, 0x05, 0x0A
};
-static const u8 caicos_smc_int_vectors[] =
-{
+static const u8 caicos_smc_int_vectors[] = {
0x0C, 0x14, 0x0C, 0x14,
0x0C, 0x14, 0x0C, 0x14,
0x0C, 0x14, 0x0C, 0x14,
@@ -254,8 +243,7 @@ static const u8 caicos_smc_int_vectors[] =
0x05, 0x0A, 0x05, 0x0A
};
-static const u8 cayman_smc_int_vectors[] =
-{
+static const u8 cayman_smc_int_vectors[] = {
0x12, 0x05, 0x12, 0x05,
0x12, 0x05, 0x12, 0x05,
0x12, 0x05, 0x12, 0x05,
[PATCH] drm/radeon: that open brace { should be on the previous line
ERROR: that open brace { should be on the previous line
Signed-off-by: Ran Sun
---
drivers/gpu/drm/radeon/clearstate_si.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/radeon/clearstate_si.h
b/drivers/gpu/drm/radeon/clearstate_si.h
index 356219c6c7f2..7da8418704fe 100644
--- a/drivers/gpu/drm/radeon/clearstate_si.h
+++ b/drivers/gpu/drm/radeon/clearstate_si.h
@@ -23,8 +23,7 @@
#include "clearstate_defs.h"
-static const u32 si_SECT_CONTEXT_def_1[] =
-{
+static const u32 si_SECT_CONTEXT_def_1[] = {
0x, // DB_RENDER_CONTROL
0x, // DB_COUNT_CONTROL
0x, // DB_DEPTH_VIEW
[PATCH] drm/radeon: add missing spaces after ',' and else should follow close brace '}'
ERROR: else should follow close brace '}'
ERROR: space required after that ',' (ctx:VxV)
Signed-off-by: Ran Sun
---
drivers/gpu/drm/radeon/radeon_connectors.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c
b/drivers/gpu/drm/radeon/radeon_connectors.c
index 07193cd0c417..4ceceb972e8d 100644
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -198,8 +198,7 @@ int radeon_get_monitor_bpc(struct drm_connector
*connector)
DRM_DEBUG("%s: HDMI deep color 10 bpc exceeds max tmds clock. Using
%d bpc.\n",
connector->name, bpc);
}
- }
- else if (bpc > 8) {
+ } else if (bpc > 8) {
/* max_tmds_clock missing, but hdmi spec mandates it for deep color.
*/
DRM_DEBUG("%s: Required max tmds clock for HDMI deep color missing.
Using 8 bpc.\n",
connector->name);
@@ -1372,7 +1371,7 @@ radeon_dvi_detect(struct drm_connector *connector,
bool force)
/* assume digital unless load detected
otherwise */
radeon_connector->use_digital = true;
lret = encoder_funcs->detect(encoder,
connector);
- DRM_DEBUG_KMS("load_detect %x returned:
%x\n",encoder->encoder_type,lret);
+ DRM_DEBUG_KMS("load_detect %x returned: %x\n",
encoder->encoder_type, lret);
if (lret == connector_status_connected)
radeon_connector->use_digital =
false;
}
[PATCH] drm/radeon: that open brace { should be on the previous line
ERROR: that open brace { should be on the previous line
Signed-off-by: Ran Sun
---
drivers/gpu/drm/radeon/ni_dpm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/radeon/ni_dpm.c
b/drivers/gpu/drm/radeon/ni_dpm.c
index a101ba00ea30..1cf4de4cda23 100644
--- a/drivers/gpu/drm/radeon/ni_dpm.c
+++ b/drivers/gpu/drm/radeon/ni_dpm.c
@@ -625,7 +625,7 @@ static const u32 cayman_mgcg_disable[] =
};
#define CAYMAN_MGCG_DISABLE_LENGTH sizeof(cayman_mgcg_disable) / (3 *
sizeof(u32))
-static const u32 cayman_mgcg_enable[] = :621 {
+static const u32 cayman_mgcg_enable[] = : 621 {
0x802c, 0xc000, 0x,
0x08f8, 0x, 0x,
0x08fc, 0x, 0x,
[PATCH] drm/radeon: add missing spaces before ';'
ERROR: space required after that ';' (ctx:BxV) Signed-off-by: Ran Sun --- drivers/gpu/drm/radeon/radeon_vce.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_vce.c b/drivers/gpu/drm/radeon/radeon_vce.c index ca4a36464340..d1871af967d4 100644 --- a/drivers/gpu/drm/radeon/radeon_vce.c +++ b/drivers/gpu/drm/radeon/radeon_vce.c @@ -95,7 +95,7 @@ int radeon_vce_init(struct radeon_device *rdev) size = rdev->vce_fw->size - strlen(fw_version) - 9; c = rdev->vce_fw->data; - for (;size > 0; --size, ++c) + for (; size > 0; --size, ++c) if (strncmp(c, fw_version, strlen(fw_version)) == 0) break; @@ -110,7 +110,7 @@ int radeon_vce_init(struct radeon_device *rdev) size = rdev->vce_fw->size - strlen(fb_version) - 3; c = rdev->vce_fw->data; - for (;size > 0; --size, ++c) + for (; size > 0; --size, ++c) if (strncmp(c, fb_version, strlen(fb_version)) == 0) break;
[PATCH] drm/radeon/si_dpm: open brace '{' following struct go on the same line
ERROR: open brace '{' following struct go on the same line
Signed-off-by: Ran Sun
---
drivers/gpu/drm/radeon/sislands_smc.h | 51 +--
1 file changed, 17 insertions(+), 34 deletions(-)
diff --git a/drivers/gpu/drm/radeon/sislands_smc.h
b/drivers/gpu/drm/radeon/sislands_smc.h
index 4ea1cb2e45a3..4b7dee3cf58b 100644
--- a/drivers/gpu/drm/radeon/sislands_smc.h
+++ b/drivers/gpu/drm/radeon/sislands_smc.h
@@ -89,8 +89,7 @@ struct PP_SIslands_PAPMStatus
};
typedef struct PP_SIslands_PAPMStatus PP_SIslands_PAPMStatus;
-struct PP_SIslands_PAPMParameters
-{
+struct PP_SIslands_PAPMParameters {
uint32_tNearTDPLimitTherm;
uint32_tNearTDPLimitPAPM;
uint32_tPlatformPowerLimit;
@@ -100,8 +99,7 @@ struct PP_SIslands_PAPMParameters
};
typedef struct PP_SIslands_PAPMParameters PP_SIslands_PAPMParameters;
-struct SISLANDS_SMC_SCLK_VALUE
-{
+struct SISLANDS_SMC_SCLK_VALUE {
uint32_tvCG_SPLL_FUNC_CNTL;
uint32_tvCG_SPLL_FUNC_CNTL_2;
uint32_tvCG_SPLL_FUNC_CNTL_3;
@@ -113,8 +111,7 @@ struct SISLANDS_SMC_SCLK_VALUE
typedef struct SISLANDS_SMC_SCLK_VALUE SISLANDS_SMC_SCLK_VALUE;
-struct SISLANDS_SMC_MCLK_VALUE
-{
+struct SISLANDS_SMC_MCLK_VALUE {
uint32_tvMPLL_FUNC_CNTL;
uint32_tvMPLL_FUNC_CNTL_1;
uint32_tvMPLL_FUNC_CNTL_2;
@@ -129,8 +126,7 @@ struct SISLANDS_SMC_MCLK_VALUE
typedef struct SISLANDS_SMC_MCLK_VALUE SISLANDS_SMC_MCLK_VALUE;
-struct SISLANDS_SMC_VOLTAGE_VALUE
-{
+struct SISLANDS_SMC_VOLTAGE_VALUE {
uint16_tvalue;
uint8_t index;
uint8_t phase_settings;
@@ -138,8 +134,7 @@ struct SISLANDS_SMC_VOLTAGE_VALUE
typedef struct SISLANDS_SMC_VOLTAGE_VALUE SISLANDS_SMC_VOLTAGE_VALUE;
-struct SISLANDS_SMC_HW_PERFORMANCE_LEVEL
-{
+struct SISLANDS_SMC_HW_PERFORMANCE_LEVEL {
uint8_t ACIndex;
uint8_t displayWatermark;
uint8_t gen2PCIE;
@@ -180,8 +175,7 @@ struct SISLANDS_SMC_HW_PERFORMANCE_LEVEL
typedef struct SISLANDS_SMC_HW_PERFORMANCE_LEVEL
SISLANDS_SMC_HW_PERFORMANCE_LEVEL;
-struct SISLANDS_SMC_SWSTATE
-{
+struct SISLANDS_SMC_SWSTATE {
uint8_t flags;
uint8_t levelCount;
uint8_t padding2;
@@ -205,8 +199,7 @@ struct SISLANDS_SMC_SWSTATE_SINGLE {
#define SISLANDS_SMC_VOLTAGEMASK_VDDC_PHASE_SHEDDING 3
#define SISLANDS_SMC_VOLTAGEMASK_MAX 4
-struct SISLANDS_SMC_VOLTAGEMASKTABLE
-{
+struct SISLANDS_SMC_VOLTAGEMASKTABLE {
uint32_t lowMask[SISLANDS_SMC_VOLTAGEMASK_MAX];
};
@@ -214,8 +207,7 @@ typedef struct SISLANDS_SMC_VOLTAGEMASKTABLE
SISLANDS_SMC_VOLTAGEMASKTABLE;
#define SISLANDS_MAX_NO_VREG_STEPS 32
-struct SISLANDS_SMC_STATETABLE
-{
+struct SISLANDS_SMC_STATETABLE {
uint8_t thermalProtectType;
uint8_t systemFlags;
uint8_t maxVDDCIndexInPPTable;
@@ -254,8 +246,7 @@ typedef struct SISLANDS_SMC_STATETABLE
SISLANDS_SMC_STATETABLE;
#define SI_SMC_SOFT_REGISTER_svi_rework_gpio_id_svd 0x11c
#define SI_SMC_SOFT_REGISTER_svi_rework_gpio_id_svc 0x120
-struct PP_SIslands_FanTable
-{
+struct PP_SIslands_FanTable {
uint8_t fdo_mode;
uint8_t padding;
int16_t temp_min;
@@ -285,8 +276,7 @@ typedef struct PP_SIslands_FanTable
PP_SIslands_FanTable;
#define SMC_SISLANDS_SCALE_I 7
#define SMC_SISLANDS_SCALE_R 12
-struct PP_SIslands_CacConfig
-{
+struct PP_SIslands_CacConfig {
uint16_t
cac_lkge_lut[SMC_SISLANDS_LKGE_LUT_NUM_OF_TEMP_ENTRIES][SMC_SISLANDS_LKGE_LUT_NUM_OF_VOLT_ENTRIES];
uint32_t lkge_lut_V0;
uint32_t lkge_lut_Vstep;
@@ -308,23 +298,20 @@ typedef struct PP_SIslands_CacConfig
PP_SIslands_CacConfig;
#define SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE 16
#define SMC_SISLANDS_MC_REGISTER_ARRAY_SET_COUNT 20
-struct SMC_SIslands_MCRegisterAddress
-{
+struct SMC_SIslands_MCRegisterAddress {
uint16_t s0;
uint16_t s1;
};
typedef struct SMC_SIslands_MCRegisterAddress
SMC_SIslands_MCRegisterAddress;
-struct SMC_SIslands_MCRegisterSet
-{
+struct SMC_SIslands_MCRegisterSet {
uint32_t value[SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE];
};
typedef struct SMC_SIslands_MCRegisterSet SMC_SIslands_MCRegisterSet;
-struct SMC_SIslands_MCRegisters
-{
+struct SMC_SIslands_MCRegisters {
uint8_t last;
uint8_t reserved[3];
SMC_SIslands_MCRegisterAddress
address[SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE];
@@ -333,8 +320,7 @@ struct SMC_SIslands_MCRegisters
typedef struct SMC_SIslands_MCRegisters SMC_SIslands_MCRegisters;
-struct SMC_SIslands_MCArbDramTimingRegisterSet
-{
+struct SMC_SIslands_MCArbDramTimingRegisterSet {
uint32_t mc_arb_dram_timing;
uint32_t mc_arb_dram_timing2;
uint8_t mc_arb_rfsh_rate;
@@ -344,8 +330,7 @@ struct
[PATCH] drm/radeon: ERROR: "foo * bar" should be "foo *bar"
Fix two occurrences of the checkpatch.pl error:
ERROR: "foo * bar" should be "foo *bar"
Signed-off-by: Jianghui Xu
---
drivers/gpu/drm/radeon/atom.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/radeon/atom.c
b/drivers/gpu/drm/radeon/atom.c
index 11a1940bb26d..93acb0e42bd6 100644
--- a/drivers/gpu/drm/radeon/atom.c
+++ b/drivers/gpu/drm/radeon/atom.c
@@ -68,8 +68,8 @@ typedef struct {
} atom_exec_context;
int atom_debug = 0;
-static int atom_execute_table_locked(struct atom_context *ctx, int
index, uint32_t * params);
-int atom_execute_table(struct atom_context *ctx, int index, uint32_t *
params);
+static int atom_execute_table_locked(struct atom_context *ctx, int
index, uint32_t *params);
+int atom_execute_table(struct atom_context *ctx, int index, uint32_t
*params);
static uint32_t atom_arg_mask[8] = {
0x, 0x, 0x0000, 0x,
[PATCH] drm/radeon: ERROR: "foo * bar" should be "foo *bar"
Fix two occurrences of the checkpatch.pl error:
ERROR: "foo * bar" should be "foo *bar"
Signed-off-by: Ran Sun
---
drivers/gpu/drm/radeon/atom.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/radeon/atom.c
b/drivers/gpu/drm/radeon/atom.c
index 11a1940bb26d..93acb0e42bd6 100644
--- a/drivers/gpu/drm/radeon/atom.c
+++ b/drivers/gpu/drm/radeon/atom.c
@@ -68,8 +68,8 @@ typedef struct {
} atom_exec_context;
int atom_debug = 0;
-static int atom_execute_table_locked(struct atom_context *ctx, int
index, uint32_t * params);
-int atom_execute_table(struct atom_context *ctx, int index, uint32_t *
params);
+static int atom_execute_table_locked(struct atom_context *ctx, int
index, uint32_t *params);
+int atom_execute_table(struct atom_context *ctx, int index, uint32_t
*params);
static uint32_t atom_arg_mask[8] = {
0x, 0x, 0x0000, 0x,
[PATCH] drm/radeon: ERROR: "foo * bar" should be "foo *bar"
Fix nine occurrences of the checkpatch.pl error:
ERROR: "foo * bar" should be "foo *bar"
Signed-off-by: Ran Sun
---
drivers/gpu/drm/radeon/atom.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/radeon/atom.c
b/drivers/gpu/drm/radeon/atom.c
index 11a1940bb26d..93acb0e42bd6 100644
--- a/drivers/gpu/drm/radeon/atom.c
+++ b/drivers/gpu/drm/radeon/atom.c
@@ -68,8 +68,8 @@ typedef struct {
} atom_exec_context;
int atom_debug = 0;
-static int atom_execute_table_locked(struct atom_context *ctx, int
index, uint32_t * params);
-int atom_execute_table(struct atom_context *ctx, int index, uint32_t *
params);
+static int atom_execute_table_locked(struct atom_context *ctx, int
index, uint32_t *params);
+int atom_execute_table(struct atom_context *ctx, int index, uint32_t
*params);
static uint32_t atom_arg_mask[8] = {
0x, 0x, 0x0000, 0x,
[PATCH] drm/amd/pm: open brace '{' following struct go on the same line
ERROR: open brace '{' following struct go on the same line
Signed-off-by: Ran Sun
---
drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h
b/drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h
index ddc488251313..0cf564ea1ed8 100644
--- a/drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h
+++ b/drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h
@@ -429,10 +429,10 @@ int amdgpu_pm_load_smu_firmware(struct
amdgpu_device *adev, uint32_t *smu_versio
int amdgpu_dpm_handle_passthrough_sbr(struct amdgpu_device *adev, bool
enable);
int amdgpu_dpm_send_hbm_bad_pages_num(struct amdgpu_device *adev,
uint32_t size);
int amdgpu_dpm_send_hbm_bad_channel_flag(struct amdgpu_device *adev,
uint32_t size);
-int amdgpu_dpm_get_dpm_freq_range(struct amdgpu_device *adev,enum
pp_clock_type type,
- uint32_t *min,uint32_t *max);
-int amdgpu_dpm_set_soft_freq_range(struct amdgpu_device *adev,enum
pp_clock_type type,
- uint32_t min,uint32_t max);
+int amdgpu_dpm_get_dpm_freq_range(struct amdgpu_device *adev, enum
pp_clock_type type,
+ uint32_t *min, uint32_t *max);
+int amdgpu_dpm_set_soft_freq_range(struct amdgpu_device *adev, enum
pp_clock_type type,
+ uint32_t min, uint32_t max);
int amdgpu_dpm_write_watermarks_table(struct amdgpu_device *adev);
int amdgpu_dpm_wait_for_event(struct amdgpu_device *adev, enum
smu_event_type event,
uint64_t event_arg);
[PATCH] drm/amdgpu: open brace '{' following struct go on the same line
ERROR: open brace '{' following struct go on the same line
Signed-off-by: Ran Sun
---
drivers/gpu/drm/amd/pm/inc/amdgpu_pm.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/pm/inc/amdgpu_pm.h
b/drivers/gpu/drm/amd/pm/inc/amdgpu_pm.h
index 52045ad59bed..eec816f0cbf9 100644
--- a/drivers/gpu/drm/amd/pm/inc/amdgpu_pm.h
+++ b/drivers/gpu/drm/amd/pm/inc/amdgpu_pm.h
@@ -24,8 +24,7 @@
#ifndef __AMDGPU_PM_H__
#define __AMDGPU_PM_H__
-struct cg_flag_name
-{
+struct cg_flag_name {
u64 flag;
const char *name;
};
[PATCH] drm/amd/pm: open brace '{' following struct go on the same line
ERROR: open brace '{' following struct go on the same line
Signed-off-by: Ran Sun
---
.../gpu/drm/amd/pm/inc/smu_v13_0_0_pptable.h | 21 +++
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/drivers/gpu/drm/amd/pm/inc/smu_v13_0_0_pptable.h
b/drivers/gpu/drm/amd/pm/inc/smu_v13_0_0_pptable.h
index 1dc7a065a6d4..251ed011b3b0 100644
--- a/drivers/gpu/drm/amd/pm/inc/smu_v13_0_0_pptable.h
+++ b/drivers/gpu/drm/amd/pm/inc/smu_v13_0_0_pptable.h
@@ -41,8 +41,7 @@
#define SMU_13_0_0_PP_OVERDRIVE_VERSION 0x83// OverDrive 8
Table Version 0.2
#define SMU_13_0_0_PP_POWERSAVINGCLOCK_VERSION 0x01 // Power Saving
Clock Table Version 1.00
-enum SMU_13_0_0_ODFEATURE_CAP
-{
+enum SMU_13_0_0_ODFEATURE_CAP {
SMU_13_0_0_ODCAP_GFXCLK_LIMITS = 0,
SMU_13_0_0_ODCAP_UCLK_LIMITS,
SMU_13_0_0_ODCAP_POWER_LIMIT,
@@ -62,8 +61,7 @@ enum SMU_13_0_0_ODFEATURE_CAP
SMU_13_0_0_ODCAP_COUNT,
};
-enum SMU_13_0_0_ODFEATURE_ID
-{
+enum SMU_13_0_0_ODFEATURE_ID {
SMU_13_0_0_ODFEATURE_GFXCLK_LIMITS = 1 <<
SMU_13_0_0_ODCAP_GFXCLK_LIMITS, //GFXCLK Limit feature
SMU_13_0_0_ODFEATURE_UCLK_LIMITS = 1 <<
SMU_13_0_0_ODCAP_UCLK_LIMITS, //UCLK Limit feature
SMU_13_0_0_ODFEATURE_POWER_LIMIT = 1 <<
SMU_13_0_0_ODCAP_POWER_LIMIT, //Power Limit feature
@@ -85,8 +83,7 @@ enum SMU_13_0_0_ODFEATURE_ID
#define SMU_13_0_0_MAX_ODFEATURE 32 //Maximum Number of OD Features
-enum SMU_13_0_0_ODSETTING_ID
-{
+enum SMU_13_0_0_ODSETTING_ID {
SMU_13_0_0_ODSETTING_GFXCLKFMAX = 0,
SMU_13_0_0_ODSETTING_GFXCLKFMIN,
SMU_13_0_0_ODSETTING_UCLKFMIN,
@@ -123,8 +120,7 @@ enum SMU_13_0_0_ODSETTING_ID
};
#define SMU_13_0_0_MAX_ODSETTING 64 //Maximum Number of ODSettings
-enum SMU_13_0_0_PWRMODE_SETTING
-{
+enum SMU_13_0_0_PWRMODE_SETTING {
SMU_13_0_0_PMSETTING_POWER_LIMIT_QUIET = 0,
SMU_13_0_0_PMSETTING_POWER_LIMIT_BALANCE,
SMU_13_0_0_PMSETTING_POWER_LIMIT_TURBO,
@@ -144,8 +140,7 @@ enum SMU_13_0_0_PWRMODE_SETTING
};
#define SMU_13_0_0_MAX_PMSETTING 32 //Maximum Number of PowerMode
Settings
-struct smu_13_0_0_overdrive_table
-{
+struct smu_13_0_0_overdrive_table {
uint8_t revision; //Revision =
SMU_13_0_0_PP_OVERDRIVE_VERSION
uint8_t reserve[3]; //Zero filled field
reserved for future use
uint32_t feature_count; //Total number of
supported features
@@ -156,8 +151,7 @@ struct smu_13_0_0_overdrive_table
int16_t pm_setting[SMU_13_0_0_MAX_PMSETTING]; //Optimized power
mode feature settings
};
-enum SMU_13_0_0_PPCLOCK_ID
-{
+enum SMU_13_0_0_PPCLOCK_ID {
SMU_13_0_0_PPCLOCK_GFXCLK = 0,
SMU_13_0_0_PPCLOCK_SOCCLK,
SMU_13_0_0_PPCLOCK_UCLK,
@@ -175,8 +169,7 @@ enum SMU_13_0_0_PPCLOCK_ID
};
#define SMU_13_0_0_MAX_PPCLOCK 16 //Maximum Number of PP Clocks
-struct smu_13_0_0_powerplay_table
-{
+struct smu_13_0_0_powerplay_table {
struct atom_common_table_header header; //For SMU13,
header.format_revision = 15, header.content_revision = 0
uint8_t table_revision; //For SMU13, table_revision
= 2
uint8_t padding;
[PATCH] drm/amd: open brace '{' following struct go on the same line
Fix the checkpatch error as open brace '{' following struct should
go on the same line.
Signed-off-by: Ran Sun
---
drivers/gpu/drm/amd/include/yellow_carp_offset.h | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/amd/include/yellow_carp_offset.h
b/drivers/gpu/drm/amd/include/yellow_carp_offset.h
index 0fea6a746611..a2c8dca2425e 100644
--- a/drivers/gpu/drm/amd/include/yellow_carp_offset.h
+++ b/drivers/gpu/drm/amd/include/yellow_carp_offset.h
@@ -7,13 +7,11 @@
#define MAX_SEGMENT 6
-struct IP_BASE_INSTANCE
-{
+struct IP_BASE_INSTANCE {
unsigned int segment[MAX_SEGMENT];
} __maybe_unused;
-struct IP_BASE
-{
+struct IP_BASE {
struct IP_BASE_INSTANCE instance[MAX_INSTANCE];
} __maybe_unused;
[PATCH] drm/i915: fix application of sizeof to pointer
The coccinelle check report: ./drivers/scsi/csiostor/csio_mb.c:1554:46-52: ERROR: application of sizeof to pointer Signed-off-by: Ran Sun --- drivers/gpu/drm/i915/i915_syncmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_syncmap.c b/drivers/gpu/drm/i915/i915_syncmap.c index 60404dbb2e9f..4eeaf12be72d 100644 --- a/drivers/gpu/drm/i915/i915_syncmap.c +++ b/drivers/gpu/drm/i915/i915_syncmap.c @@ -282,7 +282,7 @@ static noinline int __sync_set(struct i915_syncmap **root, u64 id, u32 seqno) unsigned int above; /* Insert a join above the current layer */ - next = kzalloc(sizeof(*next) + KSYNCMAP * sizeof(next), + next = kzalloc(sizeof(*next) + KSYNCMAP * sizeof(*next), GFP_KERNEL); if (unlikely(!next)) return -ENOMEM;
[PATCH] vt: remove spaces after '*'
remove redundant spaces to clear checkpatch errors.
ERROR: "foo * bar" should be "foo *bar"
Signed-off-by: Ran Sun
---
include/linux/kbd_kern.h | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/include/linux/kbd_kern.h b/include/linux/kbd_kern.h
index c40811d79769..6cb4ab685a84 100644
--- a/include/linux/kbd_kern.h
+++ b/include/linux/kbd_kern.h
@@ -69,52 +69,52 @@ extern void (*kbd_ledfunc)(unsigned int led);
extern int set_console(int nr);
extern void schedule_console_callback(void);
-static inline int vc_kbd_mode(struct kbd_struct * kbd, int flag)
+static inline int vc_kbd_mode(struct kbd_struct *kbd, int flag)
{
return ((kbd->modeflags >> flag) & 1);
}
-static inline int vc_kbd_led(struct kbd_struct * kbd, int flag)
+static inline int vc_kbd_led(struct kbd_struct *kbd, int flag)
{
return ((kbd->ledflagstate >> flag) & 1);
}
-static inline void set_vc_kbd_mode(struct kbd_struct * kbd, int flag)
+static inline void set_vc_kbd_mode(struct kbd_struct *kbd, int flag)
{
kbd->modeflags |= 1 << flag;
}
-static inline void set_vc_kbd_led(struct kbd_struct * kbd, int flag)
+static inline void set_vc_kbd_led(struct kbd_struct *kbd, int flag)
{
kbd->ledflagstate |= 1 << flag;
}
-static inline void clr_vc_kbd_mode(struct kbd_struct * kbd, int flag)
+static inline void clr_vc_kbd_mode(struct kbd_struct *kbd, int flag)
{
kbd->modeflags &= ~(1 << flag);
}
-static inline void clr_vc_kbd_led(struct kbd_struct * kbd, int flag)
+static inline void clr_vc_kbd_led(struct kbd_struct *kbd, int flag)
{
kbd->ledflagstate &= ~(1 << flag);
}
-static inline void chg_vc_kbd_lock(struct kbd_struct * kbd, int flag)
+static inline void chg_vc_kbd_lock(struct kbd_struct *kbd, int flag)
{
kbd->lockstate ^= 1 << flag;
}
-static inline void chg_vc_kbd_slock(struct kbd_struct * kbd, int flag)
+static inline void chg_vc_kbd_slock(struct kbd_struct *kbd, int flag)
{
kbd->slockstate ^= 1 << flag;
}
-static inline void chg_vc_kbd_mode(struct kbd_struct * kbd, int flag)
+static inline void chg_vc_kbd_mode(struct kbd_struct *kbd, int flag)
{
kbd->modeflags ^= 1 << flag;
}
-static inline void chg_vc_kbd_led(struct kbd_struct * kbd, int flag)
+static inline void chg_vc_kbd_led(struct kbd_struct *kbd, int flag)
{
kbd->ledflagstate ^= 1 << flag;
}
[PATCH] drm/msm/dsi: add missing put_device()
The of_find_device_by_node() takes a reference to the underlying device structure, we should release that reference. Detected by coccinelle with the following ERROR: ./drivers/gpu/drm/msm/dsi/dsi.c:50:1-7: ERROR: missing put_device; call of_find_device_by_node on line 32, but without a corresponding object release within this function. Signed-off-by: Ran Sun --- drivers/gpu/drm/msm/dsi/dsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c index 81461e8852a7..5e3cc287f0d3 100644 --- a/drivers/gpu/drm/msm/dsi/dsi.c +++ b/drivers/gpu/drm/msm/dsi/dsi.c @@ -46,7 +46,7 @@ static int dsi_get_phy(struct msm_dsi *msm_dsi) DRM_DEV_ERROR(>dev, "%s: phy driver is not ready\n", __func__); return -EPROBE_DEFER; } -put_device(>dev); +put_device(_pdev->dev); return 0; }
[PATCH] drm/msm/dsi: add missing put_device()
The of_find_device_by_node() takes a reference to the underlying device structure, we should release that reference. Detected by coccinelle with the following ERROR: ./drivers/gpu/drm/msm/dsi/dsi.c:50:1-7: ERROR: missing put_device; call of_find_device_by_node on line 32, but without a corresponding object release within this function. Signed-off-by: Ran Sun --- drivers/gpu/drm/msm/dsi/dsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c index baab79ab6e74..81461e8852a7 100644 --- a/drivers/gpu/drm/msm/dsi/dsi.c +++ b/drivers/gpu/drm/msm/dsi/dsi.c @@ -46,7 +46,7 @@ static int dsi_get_phy(struct msm_dsi *msm_dsi) DRM_DEV_ERROR(>dev, "%s: phy driver is not ready\n", __func__); return -EPROBE_DEFER; } - +put_device(>dev); return 0; }
[PATCH] drm/amdgpu/discovery: open brace '{' following struct go on the same line
Fix the checkpatch error as open brace '{' following struct should
go on the same line.
Signed-off-by: Ran Sun
---
drivers/gpu/drm/amd/include/discovery.h | 33 +
1 file changed, 11 insertions(+), 22 deletions(-)
diff --git a/drivers/gpu/drm/amd/include/discovery.h
b/drivers/gpu/drm/amd/include/discovery.h
index f43e29722ef7..eed394df36d5 100644
--- a/drivers/gpu/drm/amd/include/discovery.h
+++ b/drivers/gpu/drm/amd/include/discovery.h
@@ -32,8 +32,7 @@
#define VCN_INFO_TABLE_ID 0x004E4356
#define MALL_INFO_TABLE_ID 0x4D414C4C
-typedef enum
-{
+typedef enum {
IP_DISCOVERY = 0,
GC,
HARVEST_INFO,
@@ -45,16 +44,14 @@ typedef enum
#pragma pack(1)
-typedef struct table_info
-{
+typedef struct table_info {
uint16_t offset; /* Byte offset */
uint16_t checksum; /* Byte sum of the table */
uint16_t size; /* Table size */
uint16_t padding;
} table_info;
-typedef struct binary_header
-{
+typedef struct binary_header {
/* psp structure should go at the top of this structure */
uint32_t binary_signature; /* 0x7, 0x14, 0x21, 0x28 */
uint16_t version_major;
@@ -64,15 +61,13 @@ typedef struct binary_header
table_info table_list[TOTAL_TABLES];
} binary_header;
-typedef struct die_info
-{
+typedef struct die_info {
uint16_t die_id;
uint16_t die_offset; /* Points to the corresponding die_header
structure */
} die_info;
-typedef struct ip_discovery_header
-{
+typedef struct ip_discovery_header {
uint32_t signature;/* Table Signature */
uint16_t version; /* Table Version */
uint16_t size; /* Table Size */
@@ -89,8 +84,7 @@ typedef struct ip_discovery_header
};
} ip_discovery_header;
-typedef struct ip
-{
+typedef struct ip {
uint16_t hw_id; /* Hardware ID */
uint8_t number_instance; /* instance of the IP */
uint8_t num_base_address; /* Number of Base Addresses */
@@ -107,8 +101,7 @@ typedef struct ip
uint32_t base_address[]; /* variable number of Addresses */
} ip;
-typedef struct ip_v3
-{
+typedef struct ip_v3 {
uint16_t hw_id; /* Hardware ID */
uint8_t instance_number;/* Instance number for the
IP */
uint8_t num_base_address; /* Number of base
addresses*/
@@ -145,20 +138,16 @@ typedef struct ip_v4 {
} __packed;
} ip_v4;
-typedef struct die_header
-{
+typedef struct die_header {
uint16_t die_id;
uint16_t num_ips;
} die_header;
-typedef struct ip_structure
-{
+typedef struct ip_structure {
ip_discovery_header* header;
-struct die
-{
+struct die {
die_header *die_header;
-union
-{
+union {
ip *ip_list;
ip_v3 *ip_v3_list;
ip_v4 *ip_v4_list;
[PATCH] drm/amd/amd_shared.h: remove spaces after '*'
Fix four occurrences of the checkpatch.pl error:
ERROR: trailing whitespace
Signed-off-by: Ran Sun
---
drivers/gpu/drm/amd/include/amd_shared.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/include/amd_shared.h
b/drivers/gpu/drm/amd/include/amd_shared.h
index f175e65b853a..46ed216f04bf 100644
--- a/drivers/gpu/drm/amd/include/amd_shared.h
+++ b/drivers/gpu/drm/amd/include/amd_shared.h
@@ -60,7 +60,7 @@ enum amd_apu_flags {
* acquires the list of IP blocks for the GPU in use on initialization.
* It can then operate on this list to perform standard driver
operations
* such as: init, fini, suspend, resume, etc.
-*
+*
*
* IP block implementations are named using the following convention:
* _v (E.g.: gfx_v6_0).
[PATCH] drm/amd: open brace '{' following struct go on the same line
Fix the checkpatch error as open brace '{' following struct should
go on the same line.
Signed-off-by: Ran Sun
---
drivers/gpu/drm/amd/include/atomfirmwareid.h | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/amd/include/atomfirmwareid.h
b/drivers/gpu/drm/amd/include/atomfirmwareid.h
index e6256efd03ae..1ca5fe7b131b 100644
--- a/drivers/gpu/drm/amd/include/atomfirmwareid.h
+++ b/drivers/gpu/drm/amd/include/atomfirmwareid.h
@@ -28,8 +28,7 @@
#ifndef _ATOMFIRMWAREID_H_
#define _ATOMFIRMWAREID_H_
-enum atom_master_data_table_id
-{
+enum atom_master_data_table_id {
VBIOS_DATA_TBL_ID__UTILITY_PIPELINE,
VBIOS_DATA_TBL_ID__MULTIMEDIA_INF,
VBIOS_DATA_TBL_ID__FIRMWARE_INF,
@@ -51,8 +50,7 @@ enum atom_master_data_table_id
VBIOS_DATA_TBL_ID__UNDEFINED,
};
-enum atom_master_command_table_id
-{
+enum atom_master_command_table_id {
VBIOS_CMD_TBL_ID__ASIC_INIT,
VBIOS_CMD_TBL_ID__DIGX_ENCODER_CONTROL,
VBIOS_CMD_TBL_ID__SET_ENGINE_CLOCK,
[PATCH] drm/amd: add missing spaces after ',' and remove spaces before ','
Add missing spaces and remove spaces to clear checkpatch errors.
ERROR: space prohibited before that ',' (ctx:WxV)
ERROR: space required after that ',' (ctx:VxV)
Signed-off-by: Ran Sun
---
drivers/gpu/drm/amd/include/atom-bits.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/include/atom-bits.h
b/drivers/gpu/drm/amd/include/atom-bits.h
index e8fae5c77514..2bfd6d0ff050 100644
--- a/drivers/gpu/drm/amd/include/atom-bits.h
+++ b/drivers/gpu/drm/amd/include/atom-bits.h
@@ -33,7 +33,7 @@ static inline uint8_t get_u8(void *bios, int ptr)
#define CU8(ptr) get_u8(ctx->bios, (ptr))
static inline uint16_t get_u16(void *bios, int ptr)
{
-return get_u8(bios ,ptr)|(((uint16_t)get_u8(bios, ptr+1))<<8);
+return get_u8(bios, ptr)|(((uint16_t)get_u8(bios, ptr+1))<<8);
}
#define U16(ptr) get_u16(ctx->ctx->bios, (ptr))
#define CU16(ptr) get_u16(ctx->bios, (ptr))
[PATCH] drm/amd: open brace '{' following struct go on the same line
Fix the checkpatch error as open brace '{' following struct should
go on the same line.
Signed-off-by: Ran Sun
---
drivers/gpu/drm/amd/include/yellow_carp_offset.h | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/amd/include/yellow_carp_offset.h
b/drivers/gpu/drm/amd/include/yellow_carp_offset.h
index 0fea6a746611..a2c8dca2425e 100644
--- a/drivers/gpu/drm/amd/include/yellow_carp_offset.h
+++ b/drivers/gpu/drm/amd/include/yellow_carp_offset.h
@@ -7,13 +7,11 @@
#define MAX_SEGMENT 6
-struct IP_BASE_INSTANCE
-{
+struct IP_BASE_INSTANCE {
unsigned int segment[MAX_SEGMENT];
} __maybe_unused;
-struct IP_BASE
-{
+struct IP_BASE {
struct IP_BASE_INSTANCE instance[MAX_INSTANCE];
} __maybe_unused;
[PATCH] drm/nouveau: add missing spaces after ','
Add missing spaces to clear checkpatch errors. ERROR: space required after that ',' (ctx:VxV) Signed-off-by: Ran Sun --- drivers/gpu/drm/nouveau/include/nvhw/drf.h | 80 +++--- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/drivers/gpu/drm/nouveau/include/nvhw/drf.h b/drivers/gpu/drm/nouveau/include/nvhw/drf.h index d6969c0e2f29..a14f8d5663bb 100644 --- a/drivers/gpu/drm/nouveau/include/nvhw/drf.h +++ b/drivers/gpu/drm/nouveau/include/nvhw/drf.h @@ -33,58 +33,58 @@ #define DRF_MX_MW(drf) drf #define DRF_MX(drf) DRF_MX_##drf #define DRF_MW(drf) DRF_MX(drf) -#define DRF_MW_SPANS(o,drf) (DRF_LW_IDX((o),drf) != DRF_HW_IDX((o),drf)) +#define DRF_MW_SPANS(o, drf) (DRF_LW_IDX((o), drf) != DRF_HW_IDX((o), drf)) #define DRF_MW_SIZE(o) (sizeof((o)[0]) * 8) -#define DRF_LW_IDX(o,drf) (DRF_LO(DRF_MW(drf)) / DRF_MW_SIZE(o)) -#define DRF_LW_LO(o,drf)(DRF_LO(DRF_MW(drf)) % DRF_MW_SIZE(o)) -#define DRF_LW_HI(o,drf)(DRF_MW_SPANS((o),drf) ? (DRF_MW_SIZE(o) - 1) : DRF_HW_HI((o),drf)) -#define DRF_LW_BITS(o,drf) (DRF_LW_HI((o),drf) - DRF_LW_LO((o),drf) + 1) -#define DRF_LW_MASK(o,drf) (~0ULL >> (64 - DRF_LW_BITS((o),drf))) -#define DRF_LW_SMASK(o,drf) (DRF_LW_MASK((o),drf) << DRF_LW_LO((o),drf)) -#define DRF_LW_GET(o,drf) (((o)[DRF_LW_IDX((o),drf)] >> DRF_LW_LO((o),drf)) & DRF_LW_MASK((o),drf)) -#define DRF_LW_VAL(o,drf,v) (((v) & DRF_LW_MASK((o),drf)) << DRF_LW_LO((o),drf)) -#define DRF_LW_CLR(o,drf) ((o)[DRF_LW_IDX((o),drf)] & ~DRF_LW_SMASK((o),drf)) -#define DRF_LW_SET(o,drf,v) (DRF_LW_CLR((o),drf) | DRF_LW_VAL((o),drf,(v))) - -#define DRF_HW_IDX(o,drf) (DRF_HI(DRF_MW(drf)) / DRF_MW_SIZE(o)) -#define DRF_HW_LO(o,drf)0 -#define DRF_HW_HI(o,drf)(DRF_HI(DRF_MW(drf)) % DRF_MW_SIZE(o)) -#define DRF_HW_BITS(o,drf) (DRF_HW_HI((o),drf) - DRF_HW_LO((o),drf) + 1) -#define DRF_HW_MASK(o,drf) (~0ULL >> (64 - DRF_HW_BITS((o),drf))) -#define DRF_HW_SMASK(o,drf) (DRF_HW_MASK((o),drf) << DRF_HW_LO((o),drf)) -#define DRF_HW_GET(o,drf) ((o)[DRF_HW_IDX(o,drf)] & DRF_HW_SMASK((o),drf)) -#define DRF_HW_VAL(o,drf,v) (((long long)(v) >> DRF_LW_BITS((o),drf)) & DRF_HW_SMASK((o),drf)) -#define DRF_HW_CLR(o,drf) ((o)[DRF_HW_IDX((o),drf)] & ~DRF_HW_SMASK((o),drf)) -#define DRF_HW_SET(o,drf,v) (DRF_HW_CLR((o),drf) | DRF_HW_VAL((o),drf,(v))) +#define DRF_LW_IDX(o, drf) (DRF_LO(DRF_MW(drf)) / DRF_MW_SIZE(o)) +#define DRF_LW_LO(o, drf)(DRF_LO(DRF_MW(drf)) % DRF_MW_SIZE(o)) +#define DRF_LW_HI(o, drf)(DRF_MW_SPANS((o), drf) ? (DRF_MW_SIZE(o) - 1) : DRF_HW_HI((o), drf)) +#define DRF_LW_BITS(o, drf) (DRF_LW_HI((o), drf) - DRF_LW_LO((o), drf) + 1) +#define DRF_LW_MASK(o, drf) (~0ULL >> (64 - DRF_LW_BITS((o), drf))) +#define DRF_LW_SMASK(o, drf) (DRF_LW_MASK((o), drf) << DRF_LW_LO((o), drf)) +#define DRF_LW_GET(o, drf) (((o)[DRF_LW_IDX((o), drf)] >> DRF_LW_LO((o), drf)) & DRF_LW_MASK((o), drf)) +#define DRF_LW_VAL(o, drf, v) (((v) & DRF_LW_MASK((o), drf)) << DRF_LW_LO((o), drf)) +#define DRF_LW_CLR(o, drf) ((o)[DRF_LW_IDX((o), drf)] & ~DRF_LW_SMASK((o), drf)) +#define DRF_LW_SET(o, drf, v) (DRF_LW_CLR((o), drf) | DRF_LW_VAL((o), drf, (v))) + +#define DRF_HW_IDX(o, drf) (DRF_HI(DRF_MW(drf)) / DRF_MW_SIZE(o)) +#define DRF_HW_LO(o, drf)0 +#define DRF_HW_HI(o, drf)(DRF_HI(DRF_MW(drf)) % DRF_MW_SIZE(o)) +#define DRF_HW_BITS(o, drf) (DRF_HW_HI((o), drf) - DRF_HW_LO((o), drf) + 1) +#define DRF_HW_MASK(o, drf) (~0ULL >> (64 - DRF_HW_BITS((o), drf))) +#define DRF_HW_SMASK(o, drf) (DRF_HW_MASK((o), drf) << DRF_HW_LO((o), drf)) +#define DRF_HW_GET(o, drf) ((o)[DRF_HW_IDX(o, drf)] & DRF_HW_SMASK((o), drf)) +#define DRF_HW_VAL(o, drf, v) (((long long)(v) >> DRF_LW_BITS((o), drf)) & DRF_HW_SMASK((o), drf)) +#define DRF_HW_CLR(o, drf) ((o)[DRF_HW_IDX((o), drf)] & ~DRF_HW_SMASK((o), drf)) +#define DRF_HW_SET(o, drf, v) (DRF_HW_CLR((o), drf) | DRF_HW_VAL((o), drf, (v))) /* DRF accessors. */ -#define NVVAL_X(drf,v) (((v) & DRF_MASK(drf)) << DRF_LO(drf)) -#define NVVAL_N(X,d,r,f, v) NVVAL_X(d##_##r##_##f, (v)) -#define NVVAL_I(X,d,r,f,i,v) NVVAL_X(d##_##r##_##f(i), (v)) -#define NVVAL_(X,_1,_2,_3,_4,_5,IMPL,...) IMPL +#define NVVAL_X(drf, v) (((v) & DRF_MASK(drf)) << DRF_LO(drf)) +#define NVVAL_N(X, d, r, f, v) NVVAL_X(d##_##r##_##f, (v)) +#define NVVAL_I(X, d, r, f, i, v) NVVAL_X(d##_##r##_##f(i), (v)) +#define NVVAL_(X, _1, _2, _3, _4, _5, IMPL, ...) IMPL #define NVVAL(A...) NVVAL_(X, ##A, NVVAL_I, NVVAL_N)(X, ##A) -#define NVDEF_N(X,d,r,f, v) NVVAL_X(d##_##r##_##f, d##_##r##_##f##_##v) -#define NVDEF_I(X,d,r,f,i,v) NVVAL_X(d##_##r##_##f(i), d##_##r##_##f##_##v) -#define NVDEF_(X,_1,_2,_3,_4,_5,IMPL,...) IMPL +#define NVDEF_N(X, d, r, f, v) NVVAL_X(d##_##r##_##f, d##_##r##_##f##_##v) +#define NVDEF_I(X, d, r, f, i, v) NVVAL_X(d##_##r##_##f(i), d##_##r##_##f##_##v) +#define NVDEF_(X, _1, _2, _3, _4, _5, IMPL, ...) IMPL #define NVDEF(A...) NVDEF_(X, ##A, NVDEF_I, NVDEF_N)(X, ##A) -#define
[PATCH] drm/nouveau: remove spaces after '*'
Fix four occurrences of the checkpatch.pl error:
ERROR: "foo * bar" should be "foo *bar"
Signed-off-by: Ran Sun
---
drivers/gpu/drm/nouveau/dispnv04/crtc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/dispnv04/crtc.c
b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
index a6f2e681bde9..5ef84f4749e1 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/crtc.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
@@ -114,7 +114,7 @@ static void nv_crtc_set_image_sharpening(struct
drm_crtc *crtc, int level)
* bits 28-31: related to single stage mode? (bit 8/12)
*/
-static void nv_crtc_calc_state_ext(struct drm_crtc *crtc, struct
drm_display_mode * mode, int dot_clock)
+static void nv_crtc_calc_state_ext(struct drm_crtc *crtc, struct
drm_display_mode *mode, int dot_clock)
{
struct drm_device *dev = crtc->dev;
struct nouveau_drm *drm = nouveau_drm(dev);
@@ -458,7 +458,7 @@ nv_crtc_mode_set_vga(struct drm_crtc *crtc, struct
drm_display_mode *mode)
* be easily turned on/off after this.
*/
static void
-nv_crtc_mode_set_regs(struct drm_crtc *crtc, struct drm_display_mode *
mode)
+nv_crtc_mode_set_regs(struct drm_crtc *crtc, struct drm_display_mode
*mode)
{
struct drm_device *dev = crtc->dev;
struct nouveau_drm *drm = nouveau_drm(dev);
[PATCH] drm/nouveau: Move assignment outside if condition
Fixes the following checkpatch errors:
ERROR: do not use assignment in if condition
Signed-off-by: Ran Sun
---
drivers/gpu/drm/nouveau/nouveau_usif.c | 12
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nouveau_usif.c
b/drivers/gpu/drm/nouveau/nouveau_usif.c
index 002d1479ba89..d0b555630a6f 100644
--- a/drivers/gpu/drm/nouveau/nouveau_usif.c
+++ b/drivers/gpu/drm/nouveau/nouveau_usif.c
@@ -57,7 +57,8 @@ usif_object_new(struct drm_file *f, void *data, u32
size, void *argv, u32 argc,
struct usif_object *object;
int ret = -ENOSYS;
-if ((ret = nvif_unpack(ret, , , args->v0, 0, 0, true)))
+ret = nvif_unpack(ret, , , args->v0, 0, 0, true);
+if (ret)
return ret;
switch (args->v0.oclass) {
@@ -70,7 +71,8 @@ usif_object_new(struct drm_file *f, void *data, u32
size, void *argv, u32 argc,
struct nv_device_v0 v0;
} *args = data;
-if ((ret = nvif_unpack(ret, , , args->v0, 0, 0,
false)))
+ret = nvif_unpack(ret, , , args->v0, 0, 0, false);
+if (ret)
return ret;
args->v0.priv = false;
@@ -82,7 +84,8 @@ usif_object_new(struct drm_file *f, void *data, u32
size, void *argv, u32 argc,
break;
}
-if (!(object = kmalloc(sizeof(*object), GFP_KERNEL)))
+object = kmalloc(sizeof(*object), GFP_KERNEL);
+if (!object)
return -ENOMEM;
list_add(>head, >objects);
@@ -121,7 +124,8 @@ usif_ioctl(struct drm_file *filp, void __user *user,
u32 argc)
if (ret = -EFAULT, copy_from_user(argv, user, size))
goto done;
-if (!(ret = nvif_unpack(-ENOSYS, , , argv->v0, 0, 0,
true))) {
+ret = nvif_unpack(-ENOSYS, , , argv->v0, 0, 0, true);
+if (!ret) {
/* block access to objects not created via this interface */
owner = argv->v0.owner;
if (argv->v0.object == 0ULL &&
[PATCH] drm/nouveau: add missing spaces after ','
Add missing spaces to clear checkpatch errors.
ERROR: space required after that ',' (ctx:VxV)
Signed-off-by: Ran Sun
---
drivers/gpu/drm/nouveau/nouveau_svm.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nouveau_svm.c
b/drivers/gpu/drm/nouveau/nouveau_svm.c
index a74ba8d84ba7..78ea3b541a5b 100644
--- a/drivers/gpu/drm/nouveau/nouveau_svm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_svm.c
@@ -75,8 +75,8 @@ struct nouveau_svm {
#define FAULT_ACCESS_ATOMIC 2
#define FAULT_ACCESS_PREFETCH 3
-#define SVM_DBG(s,f,a...) NV_DEBUG((s)->drm, "svm: "f"\n", ##a)
-#define SVM_ERR(s,f,a...) NV_WARN((s)->drm, "svm: "f"\n", ##a)
+#define SVM_DBG(s, f, a...) NV_DEBUG((s)->drm, "svm: "f"\n", ##a)
+#define SVM_ERR(s, f, a...) NV_WARN((s)->drm, "svm: "f"\n", ##a)
struct nouveau_pfnmap_args {
struct nvif_ioctl_v0 i;
@@ -101,9 +101,9 @@ nouveau_ivmm_find(struct nouveau_svm *svm, u64 inst)
return NULL;
}
-#define SVMM_DBG(s,f,a...)
\
+#define SVMM_DBG(s, f, a...)
\
NV_DEBUG((s)->vmm->cli->drm, "svm-%p: "f"\n", (s), ##a)
-#define SVMM_ERR(s,f,a...)
\
+#define SVMM_ERR(s, f, a...)
\
NV_WARN((s)->vmm->cli->drm, "svm-%p: "f"\n", (s), ##a)
int
[PATCH] drm/nouveau: add missing spaces after ',' and before '('
Add missing spaces to clear checkpatch errors.
ERROR: space required after that ',' (ctx:VxV)
ERROR: space required before the open parenthesis '('
Signed-off-by: Ran Sun
---
drivers/gpu/drm/nouveau/nouveau_drv.h | 28 +--
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h
b/drivers/gpu/drm/nouveau/nouveau_drv.h
index b5de312a523f..89ee6cba0ad6 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -248,30 +248,30 @@ nouveau_platform_device_create(const struct
nvkm_device_tegra_func *,
struct platform_device *, struct nvkm_device **);
void nouveau_drm_device_remove(struct drm_device *dev);
-#define NV_PRINTK(l,c,f,a...) do {
\
+#define NV_PRINTK(l, c, f, a...) do {
\
struct nouveau_cli *_cli = (c);
\
dev_##l(_cli->drm->dev->dev, "%s: "f, _cli->name, ##a);
\
-} while(0)
+} while (0)
-#define NV_FATAL(drm,f,a...) NV_PRINTK(crit, &(drm)->client, f, ##a)
-#define NV_ERROR(drm,f,a...) NV_PRINTK(err, &(drm)->client, f, ##a)
-#define NV_WARN(drm,f,a...) NV_PRINTK(warn, &(drm)->client, f, ##a)
-#define NV_INFO(drm,f,a...) NV_PRINTK(info, &(drm)->client, f, ##a)
+#define NV_FATAL(drm, f, a...) NV_PRINTK(crit, &(drm)->client, f, ##a)
+#define NV_ERROR(drm, f, a...) NV_PRINTK(err, &(drm)->client, f, ##a)
+#define NV_WARN(drm, f, a...) NV_PRINTK(warn, &(drm)->client, f, ##a)
+#define NV_INFO(drm, f, a...) NV_PRINTK(info, &(drm)->client, f, ##a)
-#define NV_DEBUG(drm,f,a...) do {
\
+#define NV_DEBUG(drm, f, a...) do {
\
if (drm_debug_enabled(DRM_UT_DRIVER))
\
NV_PRINTK(info, &(drm)->client, f, ##a);
\
-} while(0)
-#define NV_ATOMIC(drm,f,a...) do {
\
+} while (0)
+#define NV_ATOMIC(drm, f, a...) do {
\
if (drm_debug_enabled(DRM_UT_ATOMIC))
\
NV_PRINTK(info, &(drm)->client, f, ##a);
\
-} while(0)
+} while (0)
-#define NV_PRINTK_ONCE(l,c,f,a...) NV_PRINTK(l##_once,c,f, ##a)
+#define NV_PRINTK_ONCE(l, c, f, a...) NV_PRINTK(l##_once, c, f, ##a)
-#define NV_ERROR_ONCE(drm,f,a...) NV_PRINTK_ONCE(err, &(drm)->client,
f, ##a)
-#define NV_WARN_ONCE(drm,f,a...) NV_PRINTK_ONCE(warn, &(drm)->client,
f, ##a)
-#define NV_INFO_ONCE(drm,f,a...) NV_PRINTK_ONCE(info, &(drm)->client,
f, ##a)
+#define NV_ERROR_ONCE(drm, f, a...) NV_PRINTK_ONCE(err, &(drm)->client,
f, ##a)
+#define NV_WARN_ONCE(drm, f, a...) NV_PRINTK_ONCE(warn, &(drm)->client,
f, ##a)
+#define NV_INFO_ONCE(drm, f, a...) NV_PRINTK_ONCE(info, &(drm)->client,
f, ##a)
extern int nouveau_modeset;
[PATCH] drm/nouveau: ERROR: (foo*) should be (foo *)
Fix two occurrences of the checkpatch.pl error:
ERROR: (foo*) should be (foo *)
Signed-off-by: Ran Sun
---
drivers/gpu/drm/nouveau/nouveau_fence.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c
b/drivers/gpu/drm/nouveau/nouveau_fence.c
index ee5e9d40c166..287885a3a37e 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fence.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
@@ -169,7 +169,7 @@ nouveau_fence_wait_uevent_handler(struct nvif_event
*event, void *repv, u32 repc
void
nouveau_fence_context_new(struct nouveau_channel *chan, struct
nouveau_fence_chan *fctx)
{
-struct nouveau_fence_priv *priv = (void*)chan->drm->fence;
+struct nouveau_fence_priv *priv = (void *)chan->drm->fence;
struct nouveau_cli *cli = (void *)chan->user.client;
struct {
struct nvif_event_v0 base;
@@ -207,7 +207,7 @@ int
nouveau_fence_emit(struct nouveau_fence *fence, struct nouveau_channel
*chan)
{
struct nouveau_fence_chan *fctx = chan->fence;
-struct nouveau_fence_priv *priv = (void*)chan->drm->fence;
+struct nouveau_fence_priv *priv = (void *)chan->drm->fence;
int ret;
fence->channel = chan;
[PATCH] drm/nouveau/flcn/qmgr: add missing spaces after ','
Add missing spaces to clear checkpatch errors.
ERROR: space required before the open brace ','
Signed-off-by: Ran Sun
---
drivers/gpu/drm/nouveau/nvkm/falcon/qmgr.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nvkm/falcon/qmgr.h
b/drivers/gpu/drm/nouveau/nvkm/falcon/qmgr.h
index 79f0da9e749f..0503183d7ca8 100644
--- a/drivers/gpu/drm/nouveau/nvkm/falcon/qmgr.h
+++ b/drivers/gpu/drm/nouveau/nvkm/falcon/qmgr.h
@@ -82,7 +82,7 @@ struct nvkm_falcon_msgq {
u32 position;
};
-#define FLCNQ_PRINTK(q,l,p,f,a...) FLCN_PRINTK((q)->qmgr->falcon, l, p,
"%s: "f, (q)->name, ##a)
-#define FLCNQ_DBG(q,f,a...) FLCNQ_PRINTK((q), DEBUG, info, f, ##a)
-#define FLCNQ_ERR(q,f,a...) FLCNQ_PRINTK((q), ERROR, err, f, ##a)
+#define FLCNQ_PRINTK(q, l, p, f, a...) FLCN_PRINTK((q)->qmgr->falcon,
l, p, "%s: "f, (q)->name, ##a)
+#define FLCNQ_DBG(q, f, a...) FLCNQ_PRINTK((q), DEBUG, info, f, ##a)
+#define FLCNQ_ERR(q, f, a...) FLCNQ_PRINTK((q), ERROR, err, f, ##a)
#endif
[PATCH] drm/nouveau/flcn/cmdq: Move assignment outside if condition
Fixes the following checkpatch errors:
ERROR: do not use assignment in if condition
Signed-off-by: Ran Sun
---
drivers/gpu/drm/nouveau/nvkm/falcon/cmdq.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/nouveau/nvkm/falcon/cmdq.c
b/drivers/gpu/drm/nouveau/nvkm/falcon/cmdq.c
index 211ebe7afac6..a8beb55097a6 100644
--- a/drivers/gpu/drm/nouveau/nvkm/falcon/cmdq.c
+++ b/drivers/gpu/drm/nouveau/nvkm/falcon/cmdq.c
@@ -203,7 +203,8 @@ nvkm_falcon_cmdq_new(struct nvkm_falcon_qmgr *qmgr,
const char *name,
{
struct nvkm_falcon_cmdq *cmdq = *pcmdq;
-if (!(cmdq = *pcmdq = kzalloc(sizeof(*cmdq), GFP_KERNEL)))
+cmdq = *pcmdq = kzalloc(sizeof(*cmdq), GFP_KERNEL);
+if (!cmdq)
return -ENOMEM;
cmdq->qmgr = qmgr;
[PATCH] drm/nouveau/flcn/qmgr: Move assignment outside if condition
Fixes the following checkpatch errors: ERROR: do not use assignment in if condition Signed-off-by: Ran Sun --- drivers/gpu/drm/nouveau/nvkm/falcon/qmgr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/falcon/qmgr.c b/drivers/gpu/drm/nouveau/nvkm/falcon/qmgr.c index a453de341a75..48abdb124326 100644 --- a/drivers/gpu/drm/nouveau/nvkm/falcon/qmgr.c +++ b/drivers/gpu/drm/nouveau/nvkm/falcon/qmgr.c @@ -73,7 +73,8 @@ nvkm_falcon_qmgr_new(struct nvkm_falcon *falcon, struct nvkm_falcon_qmgr *qmgr; int i; -if (!(qmgr = *pqmgr = kzalloc(sizeof(*qmgr), GFP_KERNEL))) +qmgr = *pqmgr = kzalloc(sizeof(*qmgr), GFP_KERNEL); +if (!qmgr) return -ENOMEM; qmgr->falcon = falcon;
[PATCH] drm/nouveau/flcn/msgq: Move assignment outside if condition
Fixes the following checkpatch errors:
ERROR: do not use assignment in if condition
Signed-off-by: Ran Sun
---
drivers/gpu/drm/nouveau/nvkm/falcon/msgq.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/nouveau/nvkm/falcon/msgq.c
b/drivers/gpu/drm/nouveau/nvkm/falcon/msgq.c
index 16b246fda666..52af200b45bc 100644
--- a/drivers/gpu/drm/nouveau/nvkm/falcon/msgq.c
+++ b/drivers/gpu/drm/nouveau/nvkm/falcon/msgq.c
@@ -203,7 +203,8 @@ nvkm_falcon_msgq_new(struct nvkm_falcon_qmgr *qmgr,
const char *name,
{
struct nvkm_falcon_msgq *msgq = *pmsgq;
-if (!(msgq = *pmsgq = kzalloc(sizeof(*msgq), GFP_KERNEL)))
+msgq = *pmsgq = kzalloc(sizeof(*msgq), GFP_KERNEL);
+if (!msgq)
return -ENOMEM;
msgq->qmgr = qmgr;
[PATCH] drm/nouveau/clk: remove spaces before ','
Remove spaces to clear checkpatch errors.
ERROR: space prohibited before that ',' (ctx:WxW)
Signed-off-by: Ran Sun
---
.../gpu/drm/nouveau/nvkm/subdev/clk/gf100.c | 20 +--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gf100.c
b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gf100.c
index 6eea11aefb70..09face813805 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gf100.c
@@ -453,16 +453,16 @@ gf100_clk = {
.tidy = gf100_clk_tidy,
.domains = {
{ nv_clk_src_crystal, 0xff },
-{ nv_clk_src_href , 0xff },
-{ nv_clk_src_hubk06 , 0x00 },
-{ nv_clk_src_hubk01 , 0x01 },
-{ nv_clk_src_copy , 0x02 },
-{ nv_clk_src_gpc, 0x03, NVKM_CLK_DOM_FLAG_VPSTATE, "core",
2000 },
-{ nv_clk_src_rop, 0x04 },
-{ nv_clk_src_mem, 0x05, 0, "memory", 1000 },
-{ nv_clk_src_vdec , 0x06 },
-{ nv_clk_src_pmu, 0x0a },
-{ nv_clk_src_hubk07 , 0x0b },
+{ nv_clk_src_href, 0xff },
+{ nv_clk_src_hubk06, 0x00 },
+{ nv_clk_src_hubk01, 0x01 },
+{ nv_clk_src_copy, 0x02 },
+{ nv_clk_src_gpc, 0x03, NVKM_CLK_DOM_FLAG_VPSTATE, "core", 2000
},
+{ nv_clk_src_rop, 0x04 },
+{ nv_clk_src_mem, 0x05, 0, "memory", 1000 },
+{ nv_clk_src_vdec, 0x06 },
+{ nv_clk_src_pmu, 0x0a },
+{ nv_clk_src_hubk07, 0x0b },
{ nv_clk_src_max }
}
};
[PATCH] drm/nouveau/clk: Move assignment outside if condition
Fixes the following checkpatch errors:
ERROR: do not use assignment in if condition
Signed-off-by: Ran Sun
---
drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c
b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c
index f85d6a08c61a..77465bfa71ea 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c
@@ -414,7 +414,8 @@ mcp77_clk_new(struct nvkm_device *device, enum
nvkm_subdev_type type, int inst,
{
struct mcp77_clk *clk;
-if (!(clk = kzalloc(sizeof(*clk), GFP_KERNEL)))
+clk = kzalloc(sizeof(*clk), GFP_KERNEL);
+if (!clk)
return -ENOMEM;
*pclk = >base;
[PATCH] drm/nouveau/clk: add missing spaces after ',' and '{'
Add missing spaces to clear checkpatch errors.
ERROR: space required before the open brace '{'
ERROR: space required before the open parenthesis '('
Signed-off-by: Ran Sun
---
drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c
b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c
index 81f103f88dc8..f85d6a08c61a 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c
@@ -56,7 +56,7 @@ read_pll(struct mcp77_clk *clk, u32 base)
u32 clock = 0;
int N1, M1;
-switch (base){
+switch (base) {
case 0x4020:
post_div = 1 << ((nvkm_rd32(device, 0x4070) & 0x000f) >>
16);
break;
@@ -222,7 +222,7 @@ mcp77_clk_calc(struct nvkm_clk *base, struct
nvkm_cstate *cstate)
/* NVCTRL is actually used _after_ NVPOST, and after what we
* call NVPLL. To make matters worse, NVPOST is an integer
* divider instead of a right-shift number. */
-if(P1 > 2) {
+if (P1 > 2) {
P2 = P1 - 2;
P1 = 2;
}
@@ -258,7 +258,7 @@ mcp77_clk_calc(struct nvkm_clk *base, struct
nvkm_cstate *cstate)
/* vclk */
out = calc_P(core, vdec, );
clock = calc_P(50, vdec, );
-if(abs(vdec - out) <= abs(vdec - clock)) {
+if (abs(vdec - out) <= abs(vdec - clock)) {
clk->vsrc = nv_clk_src_cclk;
clk->vdiv = divs << 16;
} else {
[PATCH] drm/nouveau/clk: add missing spaces after ','
Add missing spaces to clear checkpatch errors. ERROR: space required after that ',' (ctx:VxV) Signed-off-by: Ran Sun --- drivers/gpu/drm/nouveau/nvkm/subdev/clk/seq.h | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/seq.h b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/seq.h index e4b362d3449b..67c7b3e495fb 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/seq.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/seq.h @@ -3,13 +3,13 @@ #define __NVKM_CLK_SEQ_H__ #include -#define clk_init(s,p) hwsq_init(&(s)->base, (p)) -#define clk_exec(s,e) hwsq_exec(&(s)->base, (e)) -#define clk_have(s,r) ((s)->r_##r.addr != 0x00) -#define clk_rd32(s,r) hwsq_rd32(&(s)->base, &(s)->r_##r) -#define clk_wr32(s,r,d) hwsq_wr32(&(s)->base, &(s)->r_##r, (d)) -#define clk_mask(s,r,m,d) hwsq_mask(&(s)->base, &(s)->r_##r, (m), (d)) -#define clk_setf(s,f,d) hwsq_setf(&(s)->base, (f), (d)) -#define clk_wait(s,f,d) hwsq_wait(&(s)->base, (f), (d)) -#define clk_nsec(s,n) hwsq_nsec(&(s)->base, (n)) +#define clk_init(s, p) hwsq_init(&(s)->base, (p)) +#define clk_exec(s, e) hwsq_exec(&(s)->base, (e)) +#define clk_have(s, r) ((s)->r_##r.addr != 0x00) +#define clk_rd32(s, r) hwsq_rd32(&(s)->base, &(s)->r_##r) +#define clk_wr32(s, r, d) hwsq_wr32(&(s)->base, &(s)->r_##r, (d)) +#define clk_mask(s, r, m, d) hwsq_mask(&(s)->base, &(s)->r_##r, (m), (d)) +#define clk_setf(s, f, d) hwsq_setf(&(s)->base, (f), (d)) +#define clk_wait(s, f, d) hwsq_wait(&(s)->base, (f), (d)) +#define clk_nsec(s, n) hwsq_nsec(&(s)->base, (n)) #endif
[PATCH] drm/nouveau/clk: remove spaces before ','
Remove spaces to clear checkpatch errors.
ERROR: space prohibited before that ',' (ctx:WxW)
Signed-off-by: Ran Sun
---
drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c
b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c
index b5f3969727a2..ce72079353e5 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c
@@ -524,13 +524,13 @@ gt215_clk = {
.prog = gt215_clk_prog,
.tidy = gt215_clk_tidy,
.domains = {
-{ nv_clk_src_crystal , 0xff },
-{ nv_clk_src_core , 0x00, 0, "core", 1000 },
-{ nv_clk_src_shader , 0x01, 0, "shader", 1000 },
-{ nv_clk_src_mem , 0x02, 0, "memory", 1000 },
-{ nv_clk_src_vdec , 0x03 },
-{ nv_clk_src_disp , 0x04 },
-{ nv_clk_src_host , 0x05 },
+{ nv_clk_src_crystal, 0xff },
+{ nv_clk_src_core, 0x00, 0, "core", 1000 },
+{ nv_clk_src_shader, 0x01, 0, "shader", 1000 },
+{ nv_clk_src_mem, 0x02, 0, "memory", 1000 },
+{ nv_clk_src_vdec, 0x03 },
+{ nv_clk_src_disp, 0x04 },
+{ nv_clk_src_host, 0x05 },
{ nv_clk_src_core_intm, 0x06 },
{ nv_clk_src_max }
}
[PATCH] drm/nouveau/devinit: Move assignment outside if condition
Fixes the following checkpatch errors:
ERROR: do not use assignment in if condition
Signed-off-by: Ran Sun
---
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv05.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv05.c
b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv05.c
index 1410befd2285..8185e10efc49 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv05.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv05.c
@@ -61,7 +61,8 @@ nv05_devinit_meminit(struct nvkm_devinit *init)
}
strap = (nvkm_rd32(device, 0x101000) & 0x003c) >> 2;
-if ((data = bmp_mem_init_table(bios))) {
+data = bmp_mem_init_table(bios);
+if (data) {
ramcfg[0] = nvbios_rd08(bios, data + 2 * strap + 0);
ramcfg[1] = nvbios_rd08(bios, data + 2 * strap + 1);
} else {
[PATCH] drm/nouveau/volt: Move assignment outside if condition
Fixes the following checkpatch errors:
ERROR: do not use assignment in if condition
Signed-off-by: Ran Sun
---
drivers/gpu/drm/nouveau/nvkm/subdev/volt/base.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/volt/base.c
b/drivers/gpu/drm/nouveau/nvkm/subdev/volt/base.c
index a17a6dd8d3de..d1ae98a42e34 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/volt/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/volt/base.c
@@ -321,7 +321,8 @@ int
nvkm_volt_new_(const struct nvkm_volt_func *func, struct nvkm_device
*device,
enum nvkm_subdev_type type, int inst, struct nvkm_volt
**pvolt)
{
-if (!(*pvolt = kzalloc(sizeof(**pvolt), GFP_KERNEL)))
+*pvolt = kzalloc(sizeof(**pvolt), GFP_KERNEL);
+if (!*pvolt)
return -ENOMEM;
nvkm_volt_ctor(func, device, type, inst, *pvolt);
return 0;
[PATCH] drm/nouveau/volt/gk104: Move assignment outside if condition
Fixes the following checkpatch errors: ERROR: do not use assignment in if condition Signed-off-by: Ran Sun --- drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk104.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk104.c b/drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk104.c index d1ce4309cfb8..35ab4fa5d18e 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk104.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk104.c @@ -113,7 +113,8 @@ gk104_volt_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst, volt_func = _volt_pwm; } -if (!(volt = kzalloc(sizeof(*volt), GFP_KERNEL))) +volt = kzalloc(sizeof(*volt), GFP_KERNEL); +if (!volt) return -ENOMEM; nvkm_volt_ctor(volt_func, device, type, inst, >base); *pvolt = >base;
[PATCH] drm/nouveau/pmu: add spaces around '='
This fixes the checkpatch.pl errors:
ERROR: spaces required around that '=' (ctx:VxW)
Signed-off-by: Ran Sun
---
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c
b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c
index b5e52b35f5d0..d3e67c41560d 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c
@@ -98,7 +98,7 @@ gk20a_pmu_dvfs_get_dev_status(struct gk20a_pmu *pmu,
struct nvkm_falcon *falcon = >base.falcon;
status->busy = nvkm_falcon_rd32(falcon, 0x508 + (BUSY_SLOT *
0x10));
-status->total= nvkm_falcon_rd32(falcon, 0x508 + (CLK_SLOT * 0x10));
+status->total = nvkm_falcon_rd32(falcon, 0x508 + (CLK_SLOT *
0x10));
}
static void
@@ -188,7 +188,7 @@ gk20a_pmu_init(struct nvkm_pmu *pmu)
}
static struct gk20a_pmu_dvfs_data
-gk20a_dvfs_data= {
+gk20a_dvfs_data = {
.p_load_target = 70,
.p_load_max = 90,
.p_smooth = 1,
[PATCH] drm/radeon: ERROR: "(foo*)" should be "(foo *)"
Fix five occurrences of the checkpatch.pl error:
ERROR: "(foo*)" should be "(foo *)"
Signed-off-by: Ran Sun
---
drivers/gpu/drm/radeon/radeon_kms.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_kms.c
b/drivers/gpu/drm/radeon/radeon_kms.c
index e0214cf1b43b..a16590c6247f 100644
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@ -444,7 +444,7 @@ int radeon_info_ioctl(struct drm_device *dev, void
*data, struct drm_file *filp)
DRM_DEBUG_KMS("timestamp is r6xx+ only!\n");
return -EINVAL;
}
-value = (uint32_t*)
+value = (uint32_t *)
value_size = sizeof(uint64_t);
value64 = radeon_get_gpu_clock_counter(rdev);
break;
@@ -543,18 +543,18 @@ int radeon_info_ioctl(struct drm_device *dev, void
*data, struct drm_file *filp)
*value = rdev->vce.fb_version;
break;
case RADEON_INFO_NUM_BYTES_MOVED:
-value = (uint32_t*)
+value = (uint32_t *)
value_size = sizeof(uint64_t);
value64 = atomic64_read(>num_bytes_moved);
break;
case RADEON_INFO_VRAM_USAGE:
-value = (uint32_t*)
+value = (uint32_t *)
value_size = sizeof(uint64_t);
man = ttm_manager_type(>mman.bdev, TTM_PL_VRAM);
value64 = ttm_resource_manager_usage(man);
break;
case RADEON_INFO_GTT_USAGE:
-value = (uint32_t*)
+value = (uint32_t *)
value_size = sizeof(uint64_t);
man = ttm_manager_type(>mman.bdev, TTM_PL_TT);
value64 = ttm_resource_manager_usage(man);
@@ -614,7 +614,7 @@ int radeon_info_ioctl(struct drm_device *dev, void
*data, struct drm_file *filp)
DRM_DEBUG_KMS("Invalid request %d\n", info->request);
return -EINVAL;
}
-if (copy_to_user(value_ptr, (char*)value, value_size)) {
+if (copy_to_user(value_ptr, (char *)value, value_size)) {
DRM_ERROR("copy_to_user %s:%u\n", __func__, __LINE__);
return -EFAULT;
}
[PATCH] drm/nouveau/iccsense: do not use assignment in if condition
checkpatch.pl does not like assignment in if condition
Signed-off-by: Ran Sun
---
drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c
b/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c
index 8f0ccd3664eb..2428f3d6e477 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c
@@ -322,7 +322,8 @@ int
nvkm_iccsense_new_(struct nvkm_device *device, enum nvkm_subdev_type
type, int inst,
struct nvkm_iccsense **iccsense)
{
-if (!(*iccsense = kzalloc(sizeof(**iccsense), GFP_KERNEL)))
+*iccsense = kzalloc(sizeof(**iccsense), GFP_KERNEL);
+if (!*iccsense)
return -ENOMEM;
INIT_LIST_HEAD(&(*iccsense)->sensors);
INIT_LIST_HEAD(&(*iccsense)->rails);
[PATCH] drm/radeon: ERROR: that open brace { should be on the previous line
Fix eleven occurrences of the checkpatch.pl error:
ERROR: that open brace { should be on the previous line
Signed-off-by: Ran Sun
---
drivers/gpu/drm/radeon/rv770.c | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/radeon/rv770.c
b/drivers/gpu/drm/radeon/rv770.c
index a5ce59d4a485..9ce12fa3c356 100644
--- a/drivers/gpu/drm/radeon/rv770.c
+++ b/drivers/gpu/drm/radeon/rv770.c
@@ -136,7 +136,7 @@ int rv770_set_uvd_clocks(struct radeon_device *rdev,
u32 vclk, u32 dclk)
return 0;
}
-static const u32 r7xx_golden_registers[] ={
+static const u32 r7xx_golden_registers[] = {
0x8d00, 0x, 0x0e0e0074,
0x8d04, 0x, 0x013a2b34,
0x9508, 0x, 0x0002,
@@ -151,7 +151,7 @@ static const u32 r7xx_golden_registers[] ={
0x7300, 0x, 0x001000f0
};
-static const u32 r7xx_golden_dyn_gpr_registers[] ={
+static const u32 r7xx_golden_dyn_gpr_registers[] = {
0x8db0, 0x, 0x98989898,
0x8db4, 0x, 0x98989898,
0x8db8, 0x, 0x98989898,
@@ -163,7 +163,7 @@ static const u32 r7xx_golden_dyn_gpr_registers[] ={
0x88c4, 0x, 0x0082
};
-static const u32 rv770_golden_registers[] ={
+static const u32 rv770_golden_registers[] = {
0x562c, 0x, 0,
0x3f90, 0x, 0,
0x9148, 0x, 0,
@@ -172,7 +172,7 @@ static const u32 rv770_golden_registers[] ={
0x9698, 0x1800, 0x1800
};
-static const u32 rv770ce_golden_registers[] ={
+static const u32 rv770ce_golden_registers[] = {
0x562c, 0x, 0,
0x3f90, 0x, 0x00cc,
0x9148, 0x, 0x00cc,
@@ -183,7 +183,7 @@ static const u32 rv770ce_golden_registers[] ={
0x9698, 0x1800, 0x1800
};
-static const u32 rv770_mgcg_init[] ={
+static const u32 rv770_mgcg_init[] = {
0x8bcc, 0x, 0x130300f9,
0x5448, 0x, 0x100,
0x55e4, 0x, 0x100,
@@ -340,7 +340,7 @@ static const u32 rv770_mgcg_init[] ={
0x92a4, 0x, 0x00080007
};
-static const u32 rv710_golden_registers[] ={
+static const u32 rv710_golden_registers[] = {
0x3f90, 0x00ff, 0x00fc,
0x9148, 0x00ff, 0x00fc,
0x3f94, 0x00ff, 0x00fc,
@@ -349,7 +349,7 @@ static const u32 rv710_golden_registers[] ={
0xa180, 0x, 0x3f3f
};
-static const u32 rv710_mgcg_init[] ={
+static const u32 rv710_mgcg_init[] = {
0x8bcc, 0x, 0x13030040,
0x5448, 0x, 0x100,
0x55e4, 0x, 0x100,
@@ -407,7 +407,7 @@ static const u32 rv710_mgcg_init[] ={
0x9150, 0x, 0x4d94
};
-static const u32 rv730_golden_registers[] ={
+static const u32 rv730_golden_registers[] = {
0x3f90, 0x00ff, 0x00f0,
0x9148, 0x00ff, 0x00f0,
0x3f94, 0x00ff, 0x00f0,
@@ -417,7 +417,7 @@ static const u32 rv730_golden_registers[] ={
0xa180, 0x, 0x3f3f
};
-static const u32 rv730_mgcg_init[] ={
+static const u32 rv730_mgcg_init[] = {
0x8bcc, 0x, 0x130300f9,
0x5448, 0x, 0x100,
0x55e4, 0x, 0x100,
@@ -538,7 +538,7 @@ static const u32 rv730_mgcg_init[] ={
0x92a4, 0x, 0x0005
};
-static const u32 rv740_golden_registers[] ={
+static const u32 rv740_golden_registers[] = {
0x88c4, 0x, 0x0082,
0x28a50, 0xfffc, 0x0004,
0x2650, 0x0004, 0,
@@ -574,7 +574,7 @@ static const u32 rv740_golden_registers[] ={
0x9698, 0x1800, 0x1800
};
-static const u32 rv740_mgcg_init[] ={
+static const u32 rv740_mgcg_init[] = {
0x8bcc, 0x, 0x13030100,
0x5448, 0x, 0x100,
0x55e4, 0x, 0x100,
[PATCH] drm/radeon: ERROR: "(foo*)" should be "(foo *)"
Fix four occurrences of the checkpatch.pl error:
ERROR: "(foo*)" should be "(foo *)"
Signed-off-by: Ran Sun
---
drivers/gpu/drm/radeon/radeon_atombios.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c
b/drivers/gpu/drm/radeon/radeon_atombios.c
index bf3c411a55c5..85c4bb186203 100644
--- a/drivers/gpu/drm/radeon/radeon_atombios.c
+++ b/drivers/gpu/drm/radeon/radeon_atombios.c
@@ -1389,7 +1389,7 @@ bool radeon_atombios_get_ppll_ss_info(struct
radeon_device *rdev,
num_indices = (size - sizeof(ATOM_COMMON_TABLE_HEADER)) /
sizeof(ATOM_SPREAD_SPECTRUM_ASSIGNMENT);
-ss_assign = (struct _ATOM_SPREAD_SPECTRUM_ASSIGNMENT*)
+ss_assign = (struct _ATOM_SPREAD_SPECTRUM_ASSIGNMENT *)
((u8 *)_info->asSS_Info[0]);
for (i = 0; i < num_indices; i++) {
if (ss_assign->ucSS_Id == id) {
@@ -1402,7 +1402,7 @@ bool radeon_atombios_get_ppll_ss_info(struct
radeon_device *rdev,
ss->refdiv = ss_assign->ucRecommendedRef_Div;
return true;
}
-ss_assign = (struct _ATOM_SPREAD_SPECTRUM_ASSIGNMENT*)
+ss_assign = (struct _ATOM_SPREAD_SPECTRUM_ASSIGNMENT *)
((u8 *)ss_assign + sizeof(struct
_ATOM_SPREAD_SPECTRUM_ASSIGNMENT));
}
}
@@ -3406,7 +3406,7 @@ static ATOM_VOLTAGE_OBJECT_V2
*atom_lookup_voltage_object_v2(ATOM_VOLTAGE_OBJECT
{
u32 size = le16_to_cpu(v2->sHeader.usStructureSize);
u32 offset = offsetof(ATOM_VOLTAGE_OBJECT_INFO_V2,
asVoltageObj[0]);
-u8 *start = (u8*)v2;
+u8 *start = (u8 *)v2;
while (offset < size) {
ATOM_VOLTAGE_OBJECT_V2 *vo = (ATOM_VOLTAGE_OBJECT_V2 *)(start +
offset);
@@ -3423,7 +3423,7 @@ static ATOM_VOLTAGE_OBJECT_V3
*atom_lookup_voltage_object_v3(ATOM_VOLTAGE_OBJECT
{
u32 size = le16_to_cpu(v3->sHeader.usStructureSize);
u32 offset = offsetof(ATOM_VOLTAGE_OBJECT_INFO_V3_1,
asVoltageObj[0]);
-u8 *start = (u8*)v3;
+u8 *start = (u8 *)v3;
while (offset < size) {
ATOM_VOLTAGE_OBJECT_V3 *vo = (ATOM_VOLTAGE_OBJECT_V3 *)(start +
offset);
[PATCH] drm/radeon: ERROR: "(foo*)" should be "(foo *)"
Fix four occurrences of the checkpatch.pl error: ERROR: "(foo*)" should be "(foo *)" Signed-off-by: Ran Sun --- drivers/gpu/drm/radeon/radeon_test.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_test.c b/drivers/gpu/drm/radeon/radeon_test.c index a5e1d2139e80..c9fef9b61ced 100644 --- a/drivers/gpu/drm/radeon/radeon_test.c +++ b/drivers/gpu/drm/radeon/radeon_test.c @@ -156,10 +156,10 @@ static void radeon_do_test_moves(struct radeon_device *rdev, int flag) i, *vram_start, gtt_start, (unsigned long long) (gtt_addr - rdev->mc.gtt_start + - (void*)gtt_start - gtt_map), + (void *)gtt_start - gtt_map), (unsigned long long) (vram_addr - rdev->mc.vram_start + - (void*)gtt_start - gtt_map)); + (void *)gtt_start - gtt_map)); radeon_bo_kunmap(vram_obj); goto out_lclean_unpin; } @@ -207,10 +207,10 @@ static void radeon_do_test_moves(struct radeon_device *rdev, int flag) i, *gtt_start, vram_start, (unsigned long long) (vram_addr - rdev->mc.vram_start + - (void*)vram_start - vram_map), + (void *)vram_start - vram_map), (unsigned long long) (gtt_addr - rdev->mc.gtt_start + - (void*)vram_start - vram_map)); + (void *)vram_start - vram_map)); radeon_bo_kunmap(gtt_obj[i]); goto out_lclean_unpin; }
[PATCH] drm/radeon: ERROR: "foo * bar" should be "foo *bar"
Fix nine occurrences of the checkpatch.pl error:
ERROR: "foo * bar" should be "foo *bar"
Signed-off-by: Ran Sun
---
drivers/gpu/drm/radeon/atom.c | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/radeon/atom.c
b/drivers/gpu/drm/radeon/atom.c
index c1bbfbe28bda..11a1940bb26d 100644
--- a/drivers/gpu/drm/radeon/atom.c
+++ b/drivers/gpu/drm/radeon/atom.c
@@ -1156,7 +1156,7 @@ static struct {
atom_op_shr, ATOM_ARG_MC}, {
atom_op_debug, 0},};
-static int atom_execute_table_locked(struct atom_context *ctx, int
index, uint32_t * params)
+static int atom_execute_table_locked(struct atom_context *ctx, int
index, uint32_t *params)
{
int base = CU16(ctx->cmd_table + 4 + 2 * index);
int len, ws, ps, ptr;
@@ -1216,7 +1216,7 @@ static int atom_execute_table_locked(struct
atom_context *ctx, int index, uint32
return ret;
}
-int atom_execute_table_scratch_unlocked(struct atom_context *ctx, int
index, uint32_t * params)
+int atom_execute_table_scratch_unlocked(struct atom_context *ctx, int
index, uint32_t *params)
{
int r;
@@ -1237,7 +1237,7 @@ int atom_execute_table_scratch_unlocked(struct
atom_context *ctx, int index, uin
return r;
}
-int atom_execute_table(struct atom_context *ctx, int index, uint32_t *
params)
+int atom_execute_table(struct atom_context *ctx, int index, uint32_t
*params)
{
int r;
mutex_lock(>scratch_mutex);
@@ -1359,8 +1359,8 @@ void atom_destroy(struct atom_context *ctx)
}
bool atom_parse_data_header(struct atom_context *ctx, int index,
-uint16_t * size, uint8_t * frev, uint8_t * crev,
-uint16_t * data_start)
+uint16_t *size, uint8_t *frev, uint8_t *crev,
+uint16_t *data_start)
{
int offset = index * 2 + 4;
int idx = CU16(ctx->data_table + offset);
@@ -1379,8 +1379,8 @@ bool atom_parse_data_header(struct atom_context
*ctx, int index,
return true;
}
-bool atom_parse_cmd_header(struct atom_context *ctx, int index, uint8_t
* frev,
- uint8_t * crev)
+bool atom_parse_cmd_header(struct atom_context *ctx, int index, uint8_t
*frev,
+ uint8_t *crev)
{
int offset = index * 2 + 4;
int idx = CU16(ctx->cmd_table + offset);
[PATCH] drm/nouveau/nvkm: do not use assignment in if condition
Assignments in if condition are less readable and error-prone. Fixes
also checkpatch warning:
ERROR: do not use assignment in if condition
Signed-off-by:Ran Sun
---
drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c
b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c
index 976539de4220..054fa42f1d04 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c
@@ -286,7 +286,8 @@ nvkm_i2c_new_(const struct nvkm_i2c_func *func,
struct nvkm_device *device,
if (ccbE.share != DCB_I2C_UNUSED) {
const int id = NVKM_I2C_PAD_HYBRID(ccbE.share);
-if (!(pad = nvkm_i2c_pad_find(i2c, id)))
+pad = nvkm_i2c_pad_find(i2c, id);
+if (!pad)
ret = func->pad_s_new(i2c, id, );
else
ret = 0;
[PATCH] drm/nouveau/i2c: do not use assignment in if condition
Assignments in if condition are less readable and error-prone. Fixes
also checkpatch warning:
ERROR: do not use assignment in if condition
Signed-off-by: Ran Sun
---
drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c
b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c
index d063d0dc13c5..098051d3755c 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c
@@ -209,7 +209,8 @@ nvkm_i2c_aux_new_(const struct nvkm_i2c_aux_func
*func,
struct nvkm_i2c_pad *pad, int id,
struct nvkm_i2c_aux **paux)
{
-if (!(*paux = kzalloc(sizeof(**paux), GFP_KERNEL)))
+*paux = kzalloc(sizeof(**paux), GFP_KERNEL);
+if (!*paux)
return -ENOMEM;
return nvkm_i2c_aux_ctor(func, pad, id, *paux);
}
[PATCH] drm/nouveau/iccsense:
Fixed error: 'do not use assignment in if condition'
This patch fixes error: 'do not use assignment in if condition'
in drm/nouveau/iccsense
Signed-off-by: Ran Sun
---
drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c
b/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c
index 8f0ccd3664eb..2428f3d6e477 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c
@@ -322,7 +322,8 @@ int
nvkm_iccsense_new_(struct nvkm_device *device, enum nvkm_subdev_type
type, int inst,
struct nvkm_iccsense **iccsense)
{
-if (!(*iccsense = kzalloc(sizeof(**iccsense), GFP_KERNEL)))
+*iccsense = kzalloc(sizeof(**iccsense), GFP_KERNEL);
+if (!*iccsense)
return -ENOMEM;
INIT_LIST_HEAD(&(*iccsense)->sensors);
INIT_LIST_HEAD(&(*iccsense)->rails);
[PATCH] drm/nouveau/pci: ERROR: "foo * bar" should be "foo *bar"
Signed-off-by: Ran Sun
---
drivers/gpu/drm/nouveau/nvkm/subdev/pci/gk104.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pci/gk104.c
b/drivers/gpu/drm/nouveau/nvkm/subdev/pci/gk104.c
index 6be87ecffc89..bc51987c5f5f 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/pci/gk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pci/gk104.c
@@ -147,7 +147,7 @@ gk104_pcie_set_link_speed(struct nvkm_pci *pci, enum
nvkm_pcie_speed speed)
}
static int
-gk104_pcie_init(struct nvkm_pci * pci)
+gk104_pcie_init(struct nvkm_pci *pci)
{
enum nvkm_pcie_speed lnkctl_speed, max_speed, cap_speed;
struct nvkm_subdev *subdev = >subdev;
[PATCH] drm/nouveau/i2c: do not use assignment in if condition
Assignments in if condition are less readable and error-prone. Fixes also checkpatch warning: ERROR: do not use assignment in if condition Signed-off-by: Ran Sun --- drivers/gpu/drm/nouveau/nvkm/subdev/i2c/pad.c | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 drivers/gpu/drm/nouveau/nvkm/subdev/i2c/pad.c diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/pad.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/pad.c old mode 100755 new mode 100644
[PATCH] drm/nouveau/i2c: do not use assignment in if condition
Assignments in if condition are less readable and error-prone. Fixes
also checkpatch warning:
ERROR: do not use assignment in if condition
Signed-off-by: Ran Sun
---
drivers/gpu/drm/nouveau/nvkm/subdev/i2c/busgf119.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/busgf119.c
b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/busgf119.c
index 96bbdda0f439..a1cf406ff141 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/busgf119.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/busgf119.c
@@ -85,7 +85,8 @@ gf119_i2c_bus_new(struct nvkm_i2c_pad *pad, int id, u8
drive,
{
struct gf119_i2c_bus *bus;
-if (!(bus = kzalloc(sizeof(*bus), GFP_KERNEL)))
+bus = kzalloc(sizeof(*bus), GFP_KERNEL);
+if (!bus)
return -ENOMEM;
*pbus = >base;
[PATCH] drm/nouveau/i2c: do not use assignment in if condition
Assignments in if condition are less readable and error-prone. Fixes also checkpatch warning: ERROR: do not use assignment in if condition Signed-off-by: Ran Sun --- drivers/gpu/drm/nouveau/nvkm/subdev/i2c/busnv04.c | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 drivers/gpu/drm/nouveau/nvkm/subdev/i2c/busnv04.c diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/busnv04.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/busnv04.c old mode 100755 new mode 100644
[PATCH] drm/nouveau/nvkm: do not use assignment in if condition
Assignments in if condition are less readable and error-prone. Fixes
also checkpatch warning:
ERROR: do not use assignment in if condition
Signed-off-by: Ran Sun
---
drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c
b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c
index 976539de4220..054fa42f1d04 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c
@@ -286,7 +286,8 @@ nvkm_i2c_new_(const struct nvkm_i2c_func *func,
struct nvkm_device *device,
if (ccbE.share != DCB_I2C_UNUSED) {
const int id = NVKM_I2C_PAD_HYBRID(ccbE.share);
-if (!(pad = nvkm_i2c_pad_find(i2c, id)))
+pad = nvkm_i2c_pad_find(i2c, id);
+if (!pad)
ret = func->pad_s_new(i2c, id, );
else
ret = 0;
[PATCH] drm/nouveau/i2c: do not use assignment in if condition
Assignments in if condition are less readable and error-prone. Fixes also checkpatch warning: ERROR: do not use assignment in if condition Signed-off-by: Ran Sun --- drivers/gpu/drm/nouveau/nvkm/subdev/i2c/busnv04.c | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 drivers/gpu/drm/nouveau/nvkm/subdev/i2c/busnv04.c diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/busnv04.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/busnv04.c old mode 100755 new mode 100644
Fwd: [PATCH] drm/nouveau/i2c: do not use assignment in if condition
Assignments in if condition are less readable and error-prone. Fixes also checkpatch warning: ERROR: do not use assignment in if condition Signed-off-by: Ran Sun --- drivers/gpu/drm/nouveau/nvkm/subdev/i2c/busnv04.c | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 drivers/gpu/drm/nouveau/nvkm/subdev/i2c/busnv04.c diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/busnv04.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/busnv04.c old mode 100755 new mode 100644
