drm/amdgpu: make function pointers mandatory (f54b30d7) · Commits · 戴 / test

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -468,7 +468,6 @@ static const struct amdgpu_ih_funcs cik_ih_funcs = {

		static void cik_ih_set_interrupt_funcs(struct amdgpu_device *adev)
		{
		if (adev->irq.ih_funcs == NULL)
		adev->irq.ih_funcs = &cik_ih_funcs;
		}

+8 −12

Original line number	Diff line number	Diff line
		@@ -1370,11 +1370,9 @@ static const struct amdgpu_buffer_funcs cik_sdma_buffer_funcs = {

		static void cik_sdma_set_buffer_funcs(struct amdgpu_device *adev)
		{
		if (adev->mman.buffer_funcs == NULL) {
		adev->mman.buffer_funcs = &cik_sdma_buffer_funcs;
		adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].ring;
		}
		}

		static const struct amdgpu_vm_pte_funcs cik_sdma_vm_pte_funcs = {
		.copy_pte_num_dw = 7,
		@@ -1389,7 +1387,6 @@ static void cik_sdma_set_vm_pte_funcs(struct amdgpu_device *adev)
		struct drm_gpu_scheduler *sched;
		unsigned i;

		if (adev->vm_manager.vm_pte_funcs == NULL) {
		adev->vm_manager.vm_pte_funcs = &cik_sdma_vm_pte_funcs;
		for (i = 0; i < adev->sdma.num_instances; i++) {
		sched = &adev->sdma.instance[i].ring.sched;
		@@ -1398,7 +1395,6 @@ static void cik_sdma_set_vm_pte_funcs(struct amdgpu_device *adev)
		}
		adev->vm_manager.vm_pte_num_rqs = adev->sdma.num_instances;
		}
		}

		const struct amdgpu_ip_block_version cik_sdma_ip_block =
		{

+1 −2

Original line number	Diff line number	Diff line
		@@ -449,7 +449,6 @@ static const struct amdgpu_ih_funcs cz_ih_funcs = {

		static void cz_ih_set_interrupt_funcs(struct amdgpu_device *adev)
		{
		if (adev->irq.ih_funcs == NULL)
		adev->irq.ih_funcs = &cz_ih_funcs;
		}

+1 −2

Original line number	Diff line number	Diff line
		@@ -3570,7 +3570,6 @@ static const struct amdgpu_display_funcs dce_v10_0_display_funcs = {

		static void dce_v10_0_set_display_funcs(struct amdgpu_device *adev)
		{
		if (adev->mode_info.funcs == NULL)
		adev->mode_info.funcs = &dce_v10_0_display_funcs;
		}

+1 −2

Original line number	Diff line number	Diff line
		@@ -3702,7 +3702,6 @@ static const struct amdgpu_display_funcs dce_v11_0_display_funcs = {

		static void dce_v11_0_set_display_funcs(struct amdgpu_device *adev)
		{
		if (adev->mode_info.funcs == NULL)
		adev->mode_info.funcs = &dce_v11_0_display_funcs;
		}