Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amd: cleanup remaining spaces and tabs v2

This is the result of running the following commands:
find drivers/gpu/drm/amd/ -name "*.h" -exec sed -i 's/[ \t]\+$//' {} \;
find drivers/gpu/drm/amd/ -name "*.c" -exec sed -i 's/[ \t]\+$//' {} \;
find drivers/gpu/drm/amd/ -name "*.h" -exec sed -i 's/ \+\t/\t/' {} \;
find drivers/gpu/drm/amd/ -name "*.c" -exec sed -i 's/ \+\t/\t/' {} \;

v2: drop changes to DAL and internal headers

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Christian König and committed by
Alex Deucher
edf600da b1c8a81f

+56 -56
+6 -6
drivers/gpu/drm/amd/amdgpu/amdgpu.h
··· 369 369 370 370 struct amdgpu_user_fence { 371 371 /* write-back bo */ 372 - struct amdgpu_bo *bo; 372 + struct amdgpu_bo *bo; 373 373 /* write-back address offset to bo start */ 374 374 uint32_t offset; 375 375 }; ··· 777 777 struct amdgpu_device *adev; 778 778 const struct amdgpu_ring_funcs *funcs; 779 779 struct amdgpu_fence_driver fence_drv; 780 - struct amd_gpu_scheduler sched; 780 + struct amd_gpu_scheduler sched; 781 781 782 782 spinlock_t fence_lock; 783 783 struct amdgpu_bo *ring_obj; ··· 1247 1247 struct amdgpu_job { 1248 1248 struct amd_sched_job base; 1249 1249 struct amdgpu_device *adev; 1250 - struct amdgpu_vm *vm; 1250 + struct amdgpu_vm *vm; 1251 1251 struct amdgpu_ring *ring; 1252 1252 struct amdgpu_sync sync; 1253 1253 struct amdgpu_ib *ibs; ··· 1701 1701 struct amdgpu_sdma_instance instance[AMDGPU_MAX_SDMA_INSTANCES]; 1702 1702 struct amdgpu_irq_src trap_irq; 1703 1703 struct amdgpu_irq_src illegal_inst_irq; 1704 - int num_instances; 1704 + int num_instances; 1705 1705 }; 1706 1706 1707 1707 /* ··· 1955 1955 bool shutdown; 1956 1956 bool need_dma32; 1957 1957 bool accel_working; 1958 - struct work_struct reset_work; 1958 + struct work_struct reset_work; 1959 1959 struct notifier_block acpi_nb; 1960 1960 struct amdgpu_i2c_chan *i2c_bus[AMDGPU_MAX_I2C_BUS]; 1961 1961 struct amdgpu_debugfs debugfs[AMDGPU_DEBUGFS_MAX_COMPONENTS]; 1962 - unsigned debugfs_count; 1962 + unsigned debugfs_count; 1963 1963 #if defined(CONFIG_DEBUG_FS) 1964 1964 struct dentry *debugfs_regs[AMDGPU_DEBUGFS_MAX_COMPONENTS]; 1965 1965 #endif
+3 -3
drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c
··· 263 263 for (i = 0; i < args->in.bo_number; ++i) { 264 264 if (copy_from_user(&info[i], uptr, bytes)) 265 265 goto error_free; 266 - 266 + 267 267 uptr += args->in.bo_info_size; 268 268 } 269 269 } ··· 271 271 switch (args->in.operation) { 272 272 case AMDGPU_BO_LIST_OP_CREATE: 273 273 r = amdgpu_bo_list_create(fpriv, &list, &handle); 274 - if (r) 274 + if (r) 275 275 goto error_free; 276 276 277 277 r = amdgpu_bo_list_set(adev, filp, list, info, ··· 281 281 goto error_free; 282 282 283 283 break; 284 - 284 + 285 285 case AMDGPU_BO_LIST_OP_DESTROY: 286 286 amdgpu_bo_list_destroy(fpriv, handle); 287 287 handle = 0;
+1 -1
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
··· 348 348 adev->doorbell.base = pci_resource_start(adev->pdev, 2); 349 349 adev->doorbell.size = pci_resource_len(adev->pdev, 2); 350 350 351 - adev->doorbell.num_doorbells = min_t(u32, adev->doorbell.size / sizeof(u32), 351 + adev->doorbell.num_doorbells = min_t(u32, adev->doorbell.size / sizeof(u32), 352 352 AMDGPU_DOORBELL_MAX_ASSIGNMENT+1); 353 353 if (adev->doorbell.num_doorbells == 0) 354 354 return -EINVAL;
+3 -3
drivers/gpu/drm/amd/amdgpu/amdgpu_gds.h
··· 43 43 struct amdgpu_bo; 44 44 45 45 struct amdgpu_gds_asic_info { 46 - uint32_t total_size; 46 + uint32_t total_size; 47 47 uint32_t gfx_partition_size; 48 48 uint32_t cs_partition_size; 49 49 }; ··· 52 52 struct amdgpu_gds_asic_info mem; 53 53 struct amdgpu_gds_asic_info gws; 54 54 struct amdgpu_gds_asic_info oa; 55 - /* At present, GDS, GWS and OA resources for gfx (graphics) 56 - * is always pre-allocated and available for graphics operation. 55 + /* At present, GDS, GWS and OA resources for gfx (graphics) 56 + * is always pre-allocated and available for graphics operation. 57 57 * Such resource is shared between all gfx clients. 58 58 * TODO: move this operation to user space 59 59 * */
+1 -1
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
··· 530 530 ((em) == ATOM_ENCODER_MODE_DP_MST)) 531 531 532 532 /* Driver internal use only flags of amdgpu_get_crtc_scanoutpos() */ 533 - #define USE_REAL_VBLANKSTART (1 << 30) 533 + #define USE_REAL_VBLANKSTART (1 << 30) 534 534 #define GET_DISTANCE_TO_VBLANKSTART (1 << 31) 535 535 536 536 void amdgpu_link_encoder_connector(struct drm_device *dev);
+3 -3
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
··· 45 45 /* Firmware Names */ 46 46 #ifdef CONFIG_DRM_AMDGPU_CIK 47 47 #define FIRMWARE_BONAIRE "radeon/bonaire_uvd.bin" 48 - #define FIRMWARE_KABINI "radeon/kabini_uvd.bin" 49 - #define FIRMWARE_KAVERI "radeon/kaveri_uvd.bin" 50 - #define FIRMWARE_HAWAII "radeon/hawaii_uvd.bin" 48 + #define FIRMWARE_KABINI "radeon/kabini_uvd.bin" 49 + #define FIRMWARE_KAVERI "radeon/kaveri_uvd.bin" 50 + #define FIRMWARE_HAWAII "radeon/hawaii_uvd.bin" 51 51 #define FIRMWARE_MULLINS "radeon/mullins_uvd.bin" 52 52 #endif 53 53 #define FIRMWARE_TONGA "amdgpu/tonga_uvd.bin"
+3 -3
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
··· 41 41 /* Firmware Names */ 42 42 #ifdef CONFIG_DRM_AMDGPU_CIK 43 43 #define FIRMWARE_BONAIRE "radeon/bonaire_vce.bin" 44 - #define FIRMWARE_KABINI "radeon/kabini_vce.bin" 45 - #define FIRMWARE_KAVERI "radeon/kaveri_vce.bin" 46 - #define FIRMWARE_HAWAII "radeon/hawaii_vce.bin" 44 + #define FIRMWARE_KABINI "radeon/kabini_vce.bin" 45 + #define FIRMWARE_KAVERI "radeon/kaveri_vce.bin" 46 + #define FIRMWARE_HAWAII "radeon/hawaii_vce.bin" 47 47 #define FIRMWARE_MULLINS "radeon/mullins_vce.bin" 48 48 #endif 49 49 #define FIRMWARE_TONGA "amdgpu/tonga_vce.bin"
+1 -1
drivers/gpu/drm/amd/amdgpu/atom.h
··· 92 92 #define ATOM_WS_AND_MASK 0x45 93 93 #define ATOM_WS_FB_WINDOW 0x46 94 94 #define ATOM_WS_ATTRIBUTES 0x47 95 - #define ATOM_WS_REGPTR 0x48 95 + #define ATOM_WS_REGPTR 0x48 96 96 97 97 #define ATOM_IIO_NOP 0 98 98 #define ATOM_IIO_START 1
+1 -1
drivers/gpu/drm/amd/amdgpu/ci_dpm.c
··· 6363 6363 } 6364 6364 6365 6365 static int ci_dpm_process_interrupt(struct amdgpu_device *adev, 6366 - struct amdgpu_irq_src *source, 6366 + struct amdgpu_irq_src *source, 6367 6367 struct amdgpu_iv_entry *entry) 6368 6368 { 6369 6369 bool queue_thermal = false;
+1 -1
drivers/gpu/drm/amd/amdgpu/cik_ih.c
··· 243 243 /* wptr/rptr are in bytes! */ 244 244 u32 ring_index = adev->irq.ih.rptr >> 2; 245 245 uint32_t dw[4]; 246 - 246 + 247 247 dw[0] = le32_to_cpu(adev->irq.ih.ring[ring_index + 0]); 248 248 dw[1] = le32_to_cpu(adev->irq.ih.ring[ring_index + 1]); 249 249 dw[2] = le32_to_cpu(adev->irq.ih.ring[ring_index + 2]);
+2 -2
drivers/gpu/drm/amd/amdgpu/cikd.h
··· 190 190 # define MACRO_TILE_ASPECT(x) ((x) << 4) 191 191 # define NUM_BANKS(x) ((x) << 6) 192 192 193 - #define MSG_ENTER_RLC_SAFE_MODE 1 194 - #define MSG_EXIT_RLC_SAFE_MODE 0 193 + #define MSG_ENTER_RLC_SAFE_MODE 1 194 + #define MSG_EXIT_RLC_SAFE_MODE 0 195 195 196 196 /* 197 197 * PM4
+1 -1
drivers/gpu/drm/amd/amdgpu/cz_ih.c
··· 222 222 /* wptr/rptr are in bytes! */ 223 223 u32 ring_index = adev->irq.ih.rptr >> 2; 224 224 uint32_t dw[4]; 225 - 225 + 226 226 dw[0] = le32_to_cpu(adev->irq.ih.ring[ring_index + 0]); 227 227 dw[1] = le32_to_cpu(adev->irq.ih.ring[ring_index + 1]); 228 228 dw[2] = le32_to_cpu(adev->irq.ih.ring[ring_index + 2]);
+1 -1
drivers/gpu/drm/amd/amdgpu/cz_smumgr.h
··· 77 77 uint8_t driver_buffer_length; 78 78 uint8_t scratch_buffer_length; 79 79 uint16_t toc_entry_used_count; 80 - uint16_t toc_entry_initialize_index; 80 + uint16_t toc_entry_initialize_index; 81 81 uint16_t toc_entry_power_profiling_index; 82 82 uint16_t toc_entry_aram; 83 83 uint16_t toc_entry_ih_register_restore_task_index;
+1 -1
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
··· 603 603 mmPA_SC_LINE_STIPPLE_STATE, 0x0000ff0f, 0x00000000, 604 604 mmRLC_CGCG_CGLS_CTRL, 0x00000003, 0x0001003c, 605 605 mmTA_CNTL_AUX, 0x000f000f, 0x000b0000, 606 - mmTCC_CTRL, 0x00100000, 0xf31fff7f, 606 + mmTCC_CTRL, 0x00100000, 0xf31fff7f, 607 607 mmTCC_EXE_DISABLE, 0x00000002, 0x00000002, 608 608 mmTCP_ADDR_CONFIG, 0x0000000f, 0x000000f1, 609 609 mmTCP_CHAN_STEER_LO, 0xffffffff, 0x10101010,
+3 -3
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
··· 40 40 41 41 #define GRBM_GFX_INDEX__VCE_INSTANCE__SHIFT 0x04 42 42 #define GRBM_GFX_INDEX__VCE_INSTANCE_MASK 0x10 43 - #define mmVCE_LMI_VCPU_CACHE_40BIT_BAR0 0x8616 44 - #define mmVCE_LMI_VCPU_CACHE_40BIT_BAR1 0x8617 45 - #define mmVCE_LMI_VCPU_CACHE_40BIT_BAR2 0x8618 43 + #define mmVCE_LMI_VCPU_CACHE_40BIT_BAR0 0x8616 44 + #define mmVCE_LMI_VCPU_CACHE_40BIT_BAR1 0x8617 45 + #define mmVCE_LMI_VCPU_CACHE_40BIT_BAR2 0x8618 46 46 47 47 #define VCE_V3_0_FW_SIZE (384 * 1024) 48 48 #define VCE_V3_0_STACK_SIZE (64 * 1024)
+1 -1
drivers/gpu/drm/amd/amdgpu/vid.h
··· 365 365 #define VCE_CMD_IB 0x00000002 366 366 #define VCE_CMD_FENCE 0x00000003 367 367 #define VCE_CMD_TRAP 0x00000004 368 - #define VCE_CMD_IB_AUTO 0x00000005 368 + #define VCE_CMD_IB_AUTO 0x00000005 369 369 #define VCE_CMD_SEMAPHORE 0x00000006 370 370 371 371 #endif
+3 -3
drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c
··· 465 465 table_info->vdd_dep_on_mclk; 466 466 467 467 PP_ASSERT_WITH_CODE(allowed_sclk_vdd_table != NULL, 468 - "VDD dependency on SCLK table is missing. \ 468 + "VDD dependency on SCLK table is missing. \ 469 469 This table is mandatory", return -EINVAL); 470 470 PP_ASSERT_WITH_CODE(allowed_sclk_vdd_table->count >= 1, 471 - "VDD dependency on SCLK table has to have is missing. \ 471 + "VDD dependency on SCLK table has to have is missing. \ 472 472 This table is mandatory", return -EINVAL); 473 473 474 474 PP_ASSERT_WITH_CODE(allowed_mclk_vdd_table != NULL, 475 - "VDD dependency on MCLK table is missing. \ 475 + "VDD dependency on MCLK table is missing. \ 476 476 This table is mandatory", return -EINVAL); 477 477 PP_ASSERT_WITH_CODE(allowed_mclk_vdd_table->count >= 1, 478 478 "VDD dependency on MCLK table has to have is missing. \
+4 -4
drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c
··· 2900 2900 table_info->vdd_dep_on_mclk; 2901 2901 2902 2902 PP_ASSERT_WITH_CODE(allowed_sclk_vdd_table != NULL, 2903 - "VDD dependency on SCLK table is missing. \ 2903 + "VDD dependency on SCLK table is missing. \ 2904 2904 This table is mandatory", return -EINVAL); 2905 2905 PP_ASSERT_WITH_CODE(allowed_sclk_vdd_table->count >= 1, 2906 - "VDD dependency on SCLK table has to have is missing. \ 2906 + "VDD dependency on SCLK table has to have is missing. \ 2907 2907 This table is mandatory", return -EINVAL); 2908 2908 2909 2909 PP_ASSERT_WITH_CODE(allowed_mclk_vdd_table != NULL, 2910 - "VDD dependency on MCLK table is missing. \ 2910 + "VDD dependency on MCLK table is missing. \ 2911 2911 This table is mandatory", return -EINVAL); 2912 2912 PP_ASSERT_WITH_CODE(allowed_mclk_vdd_table->count >= 1, 2913 2913 "VDD dependency on MCLK table has to have is missing. \ ··· 4628 4628 data->need_long_memory_training = true; 4629 4629 4630 4630 /* 4631 - * PPMCME_FirmwareDescriptorEntry *pfd = NULL; 4631 + * PPMCME_FirmwareDescriptorEntry *pfd = NULL; 4632 4632 pfd = &tonga_mcmeFirmware; 4633 4633 if (0 == PHM_READ_FIELD(hwmgr->device, MC_SEQ_SUP_CNTL, RUN)) 4634 4634 polaris10_load_mc_microcode(hwmgr, pfd->dpmThreshold,
+2 -2
drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c
··· 1041 1041 } 1042 1042 1043 1043 /** atomctrl_get_voltage_evv_on_sclk gets voltage via call to ATOM COMMAND table. 1044 - * @param hwmgr input: pointer to hwManager 1044 + * @param hwmgr input: pointer to hwManager 1045 1045 * @param voltage_type input: type of EVV voltage VDDC or VDDGFX 1046 1046 * @param sclk input: in 10Khz unit. DPM state SCLK frequency 1047 - * which is define in PPTable SCLK/VDDC dependence 1047 + * which is define in PPTable SCLK/VDDC dependence 1048 1048 * table associated with this virtual_voltage_Id 1049 1049 * @param virtual_voltage_Id input: voltage id which match per voltage DPM state: 0xff01, 0xff02.. 0xff08 1050 1050 * @param voltage output: real voltage level in unit of mv
+4 -4
drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c
··· 2683 2683 struct TONGA_DLL_SPEED_SETTING { 2684 2684 uint16_t Min; /* Minimum Data Rate*/ 2685 2685 uint16_t Max; /* Maximum Data Rate*/ 2686 - uint32_t dll_speed; /* The desired DLL_SPEED setting*/ 2686 + uint32_t dll_speed; /* The desired DLL_SPEED setting*/ 2687 2687 }; 2688 2688 2689 2689 static int tonga_populate_clock_stretcher_data_table(struct pp_hwmgr *hwmgr) ··· 3316 3316 pptable_info->vdd_dep_on_mclk; 3317 3317 3318 3318 PP_ASSERT_WITH_CODE(allowed_sclk_vdd_table != NULL, 3319 - "VDD dependency on SCLK table is missing. \ 3319 + "VDD dependency on SCLK table is missing. \ 3320 3320 This table is mandatory", return -1); 3321 3321 PP_ASSERT_WITH_CODE(allowed_sclk_vdd_table->count >= 1, 3322 - "VDD dependency on SCLK table has to have is missing. \ 3322 + "VDD dependency on SCLK table has to have is missing. \ 3323 3323 This table is mandatory", return -1); 3324 3324 3325 3325 PP_ASSERT_WITH_CODE(allowed_mclk_vdd_table != NULL, 3326 - "VDD dependency on MCLK table is missing. \ 3326 + "VDD dependency on MCLK table is missing. \ 3327 3327 This table is mandatory", return -1); 3328 3328 PP_ASSERT_WITH_CODE(allowed_mclk_vdd_table->count >= 1, 3329 3329 "VDD dependency on MCLK table has to have is missing. \
+9 -9
drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.h
··· 74 74 }; 75 75 76 76 struct _phw_tonga_dpm_level { 77 - bool enabled; 77 + bool enabled; 78 78 uint32_t value; 79 79 uint32_t param1; 80 80 }; ··· 237 237 irq_handler_func_t ctf_callback; 238 238 void *ctf_context; 239 239 240 - phw_tonga_clock_registers clock_registers; 240 + phw_tonga_clock_registers clock_registers; 241 241 phw_tonga_voltage_smio_registers voltage_smio_registers; 242 242 243 - bool is_memory_GDDR5; 243 + bool is_memory_GDDR5; 244 244 uint16_t acpi_vddc; 245 - bool pspp_notify_required; /* Flag to indicate if PSPP notification to SBIOS is required */ 245 + bool pspp_notify_required; /* Flag to indicate if PSPP notification to SBIOS is required */ 246 246 uint16_t force_pcie_gen; /* The forced PCI-E speed if not 0xffff */ 247 247 uint16_t acpi_pcie_gen; /* The PCI-E speed at ACPI time */ 248 248 uint32_t pcie_gen_cap; /* The PCI-E speed capabilities bitmap from CAIL */ 249 249 uint32_t pcie_lane_cap; /* The PCI-E lane capabilities bitmap from CAIL */ 250 250 uint32_t pcie_spc_cap; /* Symbol Per Clock Capabilities from registry */ 251 - phw_tonga_leakage_voltage vddc_leakage; /* The Leakage VDDC supported (based on leakage ID).*/ 252 - phw_tonga_leakage_voltage vddcgfx_leakage; /* The Leakage VDDC supported (based on leakage ID). */ 253 - phw_tonga_leakage_voltage vddci_leakage; /* The Leakage VDDCI supported (based on leakage ID). */ 251 + phw_tonga_leakage_voltage vddc_leakage; /* The Leakage VDDC supported (based on leakage ID).*/ 252 + phw_tonga_leakage_voltage vddcgfx_leakage; /* The Leakage VDDC supported (based on leakage ID). */ 253 + phw_tonga_leakage_voltage vddci_leakage; /* The Leakage VDDCI supported (based on leakage ID). */ 254 254 255 255 uint32_t mvdd_control; 256 256 uint32_t vddc_mask_low; ··· 263 263 uint32_t mclk_stutter_mode_threshold; 264 264 uint32_t mclk_edc_enable_threshold; 265 265 uint32_t mclk_edc_wr_enable_threshold; 266 - bool is_uvd_enabled; 267 - bool is_xdma_enabled; 266 + bool is_uvd_enabled; 267 + bool is_xdma_enabled; 268 268 phw_tonga_vbios_boot_state vbios_boot_state; 269 269 270 270 bool battery_state;
+1 -1
drivers/gpu/drm/amd/powerplay/inc/hwmgr.h
··· 500 500 struct phm_ppm_table *ppm_parameter_table; 501 501 struct phm_cac_tdp_table *cac_dtp_table; 502 502 struct phm_clock_voltage_dependency_table *vdd_gfx_dependency_on_sclk; 503 - struct phm_vq_budgeting_table *vq_budgeting_table; 503 + struct phm_vq_budgeting_table *vq_budgeting_table; 504 504 }; 505 505 506 506 struct pp_fan_info {
+1 -1
drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
··· 74 74 struct amd_gpu_scheduler *sched; 75 75 spinlock_t lock; 76 76 void *owner; 77 - struct amd_sched_job *s_job; 77 + struct amd_sched_job *s_job; 78 78 }; 79 79 80 80 struct amd_sched_job {