Commit e8614fc7 authored by Alex Deucher's avatar Alex Deucher
Browse files

Revert "drm/amdgpu: Use generic hdp flush function" 



This reverts commit 18a878fd.

Revert this temporarily to make it easier to fix a regression
in the HDP handling.

Reviewed-by: default avatarFelix Kuehling <felix.kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4c83d453

drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c

+0 −21
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
 */

#include "amdgpu.h"

#include "amdgpu_ras.h"

#include <uapi/linux/kfd_ioctl.h>



int amdgpu_hdp_ras_sw_init(struct amdgpu_device *adev)

{
@@ -47,23 +46,3 @@ int amdgpu_hdp_ras_sw_init(struct amdgpu_device *adev) 
	/* hdp ras follows amdgpu_ras_block_late_init_default for late init */

	return 0;

}
 


void amdgpu_hdp_generic_flush(struct amdgpu_device *adev,

			      struct amdgpu_ring *ring)

{

	if (!ring || !ring->funcs->emit_wreg) {

		WREG32((adev->rmmio_remap.reg_offset +

			KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL) >>

			       2,

		       0);

		RREG32((adev->rmmio_remap.reg_offset +

			KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL) >>

		       2);

	} else {

		amdgpu_ring_emit_wreg(ring,

				      (adev->rmmio_remap.reg_offset +

				       KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL) >>

					      2,

				      0);

	}

}
 
 No newline at end of file

drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h

+0 −2
Original line number Diff line number Diff line
@@ -44,6 +44,4 @@ struct amdgpu_hdp { 
};



int amdgpu_hdp_ras_sw_init(struct amdgpu_device *adev);

void amdgpu_hdp_generic_flush(struct amdgpu_device *adev,

			      struct amdgpu_ring *ring);

#endif /* __AMDGPU_HDP_H__ */

drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c

+12 −1
Original line number Diff line number Diff line
@@ -36,6 +36,17 @@ 
#define HDP_MEM_POWER_CTRL__RC_MEM_POWER_LS_EN_MASK     0x00020000L

#define mmHDP_MEM_POWER_CTRL_BASE_IDX   0



static void hdp_v4_0_flush_hdp(struct amdgpu_device *adev,

				struct amdgpu_ring *ring)

{

	if (!ring || !ring->funcs->emit_wreg) {

		WREG32((adev->rmmio_remap.reg_offset + KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL) >> 2, 0);

		RREG32((adev->rmmio_remap.reg_offset + KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL) >> 2);

	} else {

		amdgpu_ring_emit_wreg(ring, (adev->rmmio_remap.reg_offset + KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL) >> 2, 0);

	}

}



static void hdp_v4_0_invalidate_hdp(struct amdgpu_device *adev,

				    struct amdgpu_ring *ring)

{
@@ -169,7 +180,7 @@ struct amdgpu_hdp_ras hdp_v4_0_ras = { 
};



const struct amdgpu_hdp_funcs hdp_v4_0_funcs = {

	.flush_hdp = amdgpu_hdp_generic_flush,

	.flush_hdp = hdp_v4_0_flush_hdp,

	.invalidate_hdp = hdp_v4_0_invalidate_hdp,

	.update_clock_gating = hdp_v4_0_update_clock_gating,

	.get_clock_gating_state = hdp_v4_0_get_clockgating_state,

drivers/gpu/drm/amd/amdgpu/hdp_v5_0.c

+12 −1
Original line number Diff line number Diff line
@@ -27,6 +27,17 @@ 
#include "hdp/hdp_5_0_0_sh_mask.h"

#include <uapi/linux/kfd_ioctl.h>



static void hdp_v5_0_flush_hdp(struct amdgpu_device *adev,

				struct amdgpu_ring *ring)

{

	if (!ring || !ring->funcs->emit_wreg) {

		WREG32((adev->rmmio_remap.reg_offset + KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL) >> 2, 0);

		RREG32((adev->rmmio_remap.reg_offset + KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL) >> 2);

	} else {

		amdgpu_ring_emit_wreg(ring, (adev->rmmio_remap.reg_offset + KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL) >> 2, 0);

	}

}



static void hdp_v5_0_invalidate_hdp(struct amdgpu_device *adev,

				    struct amdgpu_ring *ring)

{
@@ -206,7 +217,7 @@ static void hdp_v5_0_init_registers(struct amdgpu_device *adev) 
}



const struct amdgpu_hdp_funcs hdp_v5_0_funcs = {

	.flush_hdp = amdgpu_hdp_generic_flush,

	.flush_hdp = hdp_v5_0_flush_hdp,

	.invalidate_hdp = hdp_v5_0_invalidate_hdp,

	.update_clock_gating = hdp_v5_0_update_clock_gating,

	.get_clock_gating_state = hdp_v5_0_get_clockgating_state,

drivers/gpu/drm/amd/amdgpu/hdp_v6_0.c

+12 −1
Original line number Diff line number Diff line
@@ -30,6 +30,17 @@ 
#define regHDP_CLK_CNTL_V6_1	0xd5

#define regHDP_CLK_CNTL_V6_1_BASE_IDX 0



static void hdp_v6_0_flush_hdp(struct amdgpu_device *adev,

				struct amdgpu_ring *ring)

{

	if (!ring || !ring->funcs->emit_wreg) {

		WREG32((adev->rmmio_remap.reg_offset + KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL) >> 2, 0);

		RREG32((adev->rmmio_remap.reg_offset + KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL) >> 2);

	} else {

		amdgpu_ring_emit_wreg(ring, (adev->rmmio_remap.reg_offset + KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL) >> 2, 0);

	}

}



static void hdp_v6_0_update_clock_gating(struct amdgpu_device *adev,

					 bool enable)

{
@@ -138,7 +149,7 @@ static void hdp_v6_0_get_clockgating_state(struct amdgpu_device *adev, 
}



const struct amdgpu_hdp_funcs hdp_v6_0_funcs = {

	.flush_hdp = amdgpu_hdp_generic_flush,

	.flush_hdp = hdp_v6_0_flush_hdp,

	.update_clock_gating = hdp_v6_0_update_clock_gating,

	.get_clock_gating_state = hdp_v6_0_get_clockgating_state,

};