diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2018-09-26 12:24:25 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-09-26 22:09:26 -0400 |
commit | d30e63b159b0a77fb14fd6e8f86f20115baaeb1a (patch) | |
tree | 7584e34431766457bfcc4ca0fd5b86f48bad0b24 /drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | |
parent | 81bb773f35105f13c45b8cde1fa7cd147f9254b2 (diff) |
drm/amdgpu/vcn: whitespace cleanup
Fix some indentation issues.
Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: James Zhu <James.Zhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c index c6dd8403414f..2a2eb0143f48 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | |||
@@ -214,7 +214,7 @@ int amdgpu_vcn_resume(struct amdgpu_device *adev) | |||
214 | } | 214 | } |
215 | 215 | ||
216 | static int amdgpu_vcn_pause_dpg_mode(struct amdgpu_device *adev, | 216 | static int amdgpu_vcn_pause_dpg_mode(struct amdgpu_device *adev, |
217 | struct dpg_pause_state *new_state) | 217 | struct dpg_pause_state *new_state) |
218 | { | 218 | { |
219 | int ret_code; | 219 | int ret_code; |
220 | uint32_t reg_data = 0; | 220 | uint32_t reg_data = 0; |
@@ -228,23 +228,23 @@ static int amdgpu_vcn_pause_dpg_mode(struct amdgpu_device *adev, | |||
228 | new_state->fw_based, new_state->jpeg); | 228 | new_state->fw_based, new_state->jpeg); |
229 | 229 | ||
230 | reg_data = RREG32_SOC15(UVD, 0, mmUVD_DPG_PAUSE) & | 230 | reg_data = RREG32_SOC15(UVD, 0, mmUVD_DPG_PAUSE) & |
231 | (~UVD_DPG_PAUSE__NJ_PAUSE_DPG_ACK_MASK); | 231 | (~UVD_DPG_PAUSE__NJ_PAUSE_DPG_ACK_MASK); |
232 | 232 | ||
233 | if (new_state->fw_based == VCN_DPG_STATE__PAUSE) { | 233 | if (new_state->fw_based == VCN_DPG_STATE__PAUSE) { |
234 | ret_code = 0; | 234 | ret_code = 0; |
235 | 235 | ||
236 | if (!(reg_data & UVD_DPG_PAUSE__JPEG_PAUSE_DPG_ACK_MASK)) | 236 | if (!(reg_data & UVD_DPG_PAUSE__JPEG_PAUSE_DPG_ACK_MASK)) |
237 | SOC15_WAIT_ON_RREG(UVD, 0, mmUVD_POWER_STATUS, | 237 | SOC15_WAIT_ON_RREG(UVD, 0, mmUVD_POWER_STATUS, |
238 | UVD_POWER_STATUS__UVD_POWER_STATUS_TILES_OFF, | 238 | UVD_POWER_STATUS__UVD_POWER_STATUS_TILES_OFF, |
239 | UVD_POWER_STATUS__UVD_POWER_STATUS_MASK, ret_code); | 239 | UVD_POWER_STATUS__UVD_POWER_STATUS_MASK, ret_code); |
240 | 240 | ||
241 | if (!ret_code) { | 241 | if (!ret_code) { |
242 | /* pause DPG non-jpeg */ | 242 | /* pause DPG non-jpeg */ |
243 | reg_data |= UVD_DPG_PAUSE__NJ_PAUSE_DPG_REQ_MASK; | 243 | reg_data |= UVD_DPG_PAUSE__NJ_PAUSE_DPG_REQ_MASK; |
244 | WREG32_SOC15(UVD, 0, mmUVD_DPG_PAUSE, reg_data); | 244 | WREG32_SOC15(UVD, 0, mmUVD_DPG_PAUSE, reg_data); |
245 | SOC15_WAIT_ON_RREG(UVD, 0, mmUVD_DPG_PAUSE, | 245 | SOC15_WAIT_ON_RREG(UVD, 0, mmUVD_DPG_PAUSE, |
246 | UVD_DPG_PAUSE__NJ_PAUSE_DPG_ACK_MASK, | 246 | UVD_DPG_PAUSE__NJ_PAUSE_DPG_ACK_MASK, |
247 | UVD_DPG_PAUSE__NJ_PAUSE_DPG_ACK_MASK, ret_code); | 247 | UVD_DPG_PAUSE__NJ_PAUSE_DPG_ACK_MASK, ret_code); |
248 | 248 | ||
249 | /* Restore */ | 249 | /* Restore */ |
250 | ring = &adev->vcn.ring_enc[0]; | 250 | ring = &adev->vcn.ring_enc[0]; |
@@ -252,7 +252,7 @@ static int amdgpu_vcn_pause_dpg_mode(struct amdgpu_device *adev, | |||
252 | WREG32_SOC15(UVD, 0, mmUVD_RB_BASE_HI, upper_32_bits(ring->gpu_addr)); | 252 | WREG32_SOC15(UVD, 0, mmUVD_RB_BASE_HI, upper_32_bits(ring->gpu_addr)); |
253 | WREG32_SOC15(UVD, 0, mmUVD_RB_SIZE, ring->ring_size / 4); | 253 | WREG32_SOC15(UVD, 0, mmUVD_RB_SIZE, ring->ring_size / 4); |
254 | WREG32_SOC15(UVD, 0, mmUVD_RB_RPTR, lower_32_bits(ring->wptr)); | 254 | WREG32_SOC15(UVD, 0, mmUVD_RB_RPTR, lower_32_bits(ring->wptr)); |
255 | WREG32_SOC15(UVD, 0, mmUVD_RB_WPTR, lower_32_bits(ring->wptr)); | 255 | WREG32_SOC15(UVD, 0, mmUVD_RB_WPTR, lower_32_bits(ring->wptr)); |
256 | 256 | ||
257 | ring = &adev->vcn.ring_enc[1]; | 257 | ring = &adev->vcn.ring_enc[1]; |
258 | WREG32_SOC15(UVD, 0, mmUVD_RB_BASE_LO2, ring->gpu_addr); | 258 | WREG32_SOC15(UVD, 0, mmUVD_RB_BASE_LO2, ring->gpu_addr); |
@@ -263,10 +263,10 @@ static int amdgpu_vcn_pause_dpg_mode(struct amdgpu_device *adev, | |||
263 | 263 | ||
264 | ring = &adev->vcn.ring_dec; | 264 | ring = &adev->vcn.ring_dec; |
265 | WREG32_SOC15(UVD, 0, mmUVD_RBC_RB_WPTR, | 265 | WREG32_SOC15(UVD, 0, mmUVD_RBC_RB_WPTR, |
266 | lower_32_bits(ring->wptr) | 0x80000000); | 266 | lower_32_bits(ring->wptr) | 0x80000000); |
267 | SOC15_WAIT_ON_RREG(UVD, 0, mmUVD_POWER_STATUS, | 267 | SOC15_WAIT_ON_RREG(UVD, 0, mmUVD_POWER_STATUS, |
268 | UVD_PGFSM_CONFIG__UVDM_UVDU_PWR_ON, | 268 | UVD_PGFSM_CONFIG__UVDM_UVDU_PWR_ON, |
269 | UVD_POWER_STATUS__UVD_POWER_STATUS_MASK, ret_code); | 269 | UVD_POWER_STATUS__UVD_POWER_STATUS_MASK, ret_code); |
270 | } | 270 | } |
271 | } else { | 271 | } else { |
272 | /* unpause dpg non-jpeg, no need to wait */ | 272 | /* unpause dpg non-jpeg, no need to wait */ |
@@ -283,15 +283,15 @@ static int amdgpu_vcn_pause_dpg_mode(struct amdgpu_device *adev, | |||
283 | new_state->fw_based, new_state->jpeg); | 283 | new_state->fw_based, new_state->jpeg); |
284 | 284 | ||
285 | reg_data = RREG32_SOC15(UVD, 0, mmUVD_DPG_PAUSE) & | 285 | reg_data = RREG32_SOC15(UVD, 0, mmUVD_DPG_PAUSE) & |
286 | (~UVD_DPG_PAUSE__JPEG_PAUSE_DPG_ACK_MASK); | 286 | (~UVD_DPG_PAUSE__JPEG_PAUSE_DPG_ACK_MASK); |
287 | 287 | ||
288 | if (new_state->jpeg == VCN_DPG_STATE__PAUSE) { | 288 | if (new_state->jpeg == VCN_DPG_STATE__PAUSE) { |
289 | ret_code = 0; | 289 | ret_code = 0; |
290 | 290 | ||
291 | if (!(reg_data & UVD_DPG_PAUSE__NJ_PAUSE_DPG_ACK_MASK)) | 291 | if (!(reg_data & UVD_DPG_PAUSE__NJ_PAUSE_DPG_ACK_MASK)) |
292 | SOC15_WAIT_ON_RREG(UVD, 0, mmUVD_POWER_STATUS, | 292 | SOC15_WAIT_ON_RREG(UVD, 0, mmUVD_POWER_STATUS, |
293 | UVD_POWER_STATUS__UVD_POWER_STATUS_TILES_OFF, | 293 | UVD_POWER_STATUS__UVD_POWER_STATUS_TILES_OFF, |
294 | UVD_POWER_STATUS__UVD_POWER_STATUS_MASK, ret_code); | 294 | UVD_POWER_STATUS__UVD_POWER_STATUS_MASK, ret_code); |
295 | 295 | ||
296 | if (!ret_code) { | 296 | if (!ret_code) { |
297 | /* Make sure JPRG Snoop is disabled before sending the pause */ | 297 | /* Make sure JPRG Snoop is disabled before sending the pause */ |
@@ -311,19 +311,19 @@ static int amdgpu_vcn_pause_dpg_mode(struct amdgpu_device *adev, | |||
311 | WREG32_SOC15(UVD, 0, mmUVD_LMI_JRBC_RB_VMID, 0); | 311 | WREG32_SOC15(UVD, 0, mmUVD_LMI_JRBC_RB_VMID, 0); |
312 | WREG32_SOC15(UVD, 0, mmUVD_JRBC_RB_CNTL, 0x00000001L | 0x00000002L); | 312 | WREG32_SOC15(UVD, 0, mmUVD_JRBC_RB_CNTL, 0x00000001L | 0x00000002L); |
313 | WREG32_SOC15(UVD, 0, mmUVD_LMI_JRBC_RB_64BIT_BAR_LOW, | 313 | WREG32_SOC15(UVD, 0, mmUVD_LMI_JRBC_RB_64BIT_BAR_LOW, |
314 | lower_32_bits(ring->gpu_addr)); | 314 | lower_32_bits(ring->gpu_addr)); |
315 | WREG32_SOC15(UVD, 0, mmUVD_LMI_JRBC_RB_64BIT_BAR_HIGH, | 315 | WREG32_SOC15(UVD, 0, mmUVD_LMI_JRBC_RB_64BIT_BAR_HIGH, |
316 | upper_32_bits(ring->gpu_addr)); | 316 | upper_32_bits(ring->gpu_addr)); |
317 | WREG32_SOC15(UVD, 0, mmUVD_JRBC_RB_RPTR, ring->wptr); | 317 | WREG32_SOC15(UVD, 0, mmUVD_JRBC_RB_RPTR, ring->wptr); |
318 | WREG32_SOC15(UVD, 0, mmUVD_JRBC_RB_WPTR, ring->wptr); | 318 | WREG32_SOC15(UVD, 0, mmUVD_JRBC_RB_WPTR, ring->wptr); |
319 | WREG32_SOC15(UVD, 0, mmUVD_JRBC_RB_CNTL, 0x00000002L); | 319 | WREG32_SOC15(UVD, 0, mmUVD_JRBC_RB_CNTL, 0x00000002L); |
320 | 320 | ||
321 | ring = &adev->vcn.ring_dec; | 321 | ring = &adev->vcn.ring_dec; |
322 | WREG32_SOC15(UVD, 0, mmUVD_RBC_RB_WPTR, | 322 | WREG32_SOC15(UVD, 0, mmUVD_RBC_RB_WPTR, |
323 | lower_32_bits(ring->wptr) | 0x80000000); | 323 | lower_32_bits(ring->wptr) | 0x80000000); |
324 | SOC15_WAIT_ON_RREG(UVD, 0, mmUVD_POWER_STATUS, | 324 | SOC15_WAIT_ON_RREG(UVD, 0, mmUVD_POWER_STATUS, |
325 | UVD_PGFSM_CONFIG__UVDM_UVDU_PWR_ON, | 325 | UVD_PGFSM_CONFIG__UVDM_UVDU_PWR_ON, |
326 | UVD_POWER_STATUS__UVD_POWER_STATUS_MASK, ret_code); | 326 | UVD_POWER_STATUS__UVD_POWER_STATUS_MASK, ret_code); |
327 | } | 327 | } |
328 | } else { | 328 | } else { |
329 | /* unpause dpg jpeg, no need to wait */ | 329 | /* unpause dpg jpeg, no need to wait */ |