Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa47d117 authored by Huang Rui's avatar Huang Rui Committed by Alex Deucher
Browse files

drm/amdgpu: move ih definitions into amdgpu_ih header 



Demangle amdgpu.h

Signed-off-by: default avatarHuang Rui <ray.huang@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 448fe192

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

+0 −14
Original line number Diff line number Diff line
@@ -319,16 +319,6 @@ struct amdgpu_vm_pte_funcs { 
			    uint32_t incr, uint64_t flags);

};



/* provided by the ih block */

struct amdgpu_ih_funcs {

	/* ring read/write ptr handling, called from interrupt context */

	u32 (*get_wptr)(struct amdgpu_device *adev);

	bool (*prescreen_iv)(struct amdgpu_device *adev);

	void (*decode_iv)(struct amdgpu_device *adev,

			  struct amdgpu_iv_entry *entry);

	void (*set_rptr)(struct amdgpu_device *adev);

};



/*

 * BIOS.

 */
@@ -1461,10 +1451,6 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring) 
#define amdgpu_ring_pad_ib(r, ib) ((r)->funcs->pad_ib((r), (ib)))

#define amdgpu_ring_init_cond_exec(r) (r)->funcs->init_cond_exec((r))

#define amdgpu_ring_patch_cond_exec(r,o) (r)->funcs->patch_cond_exec((r),(o))

#define amdgpu_ih_get_wptr(adev) (adev)->irq.ih_funcs->get_wptr((adev))

#define amdgpu_ih_prescreen_iv(adev) (adev)->irq.ih_funcs->prescreen_iv((adev))

#define amdgpu_ih_decode_iv(adev, iv) (adev)->irq.ih_funcs->decode_iv((adev), (iv))

#define amdgpu_ih_set_rptr(adev) (adev)->irq.ih_funcs->set_rptr((adev))

#define amdgpu_display_vblank_get_counter(adev, crtc) (adev)->mode_info.funcs->vblank_get_counter((adev), (crtc))

#define amdgpu_display_backlight_set_level(adev, e, l) (adev)->mode_info.funcs->backlight_set_level((e), (l))

#define amdgpu_display_backlight_get_level(adev, e) (adev)->mode_info.funcs->backlight_get_level((e))

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

+15 −0
Original line number Diff line number Diff line
@@ -76,6 +76,21 @@ struct amdgpu_iv_entry { 
	const uint32_t *iv_entry;

};



/* provided by the ih block */

struct amdgpu_ih_funcs {

	/* ring read/write ptr handling, called from interrupt context */

	u32 (*get_wptr)(struct amdgpu_device *adev);

	bool (*prescreen_iv)(struct amdgpu_device *adev);

	void (*decode_iv)(struct amdgpu_device *adev,

			  struct amdgpu_iv_entry *entry);

	void (*set_rptr)(struct amdgpu_device *adev);

};



#define amdgpu_ih_get_wptr(adev) (adev)->irq.ih_funcs->get_wptr((adev))

#define amdgpu_ih_prescreen_iv(adev) (adev)->irq.ih_funcs->prescreen_iv((adev))

#define amdgpu_ih_decode_iv(adev, iv) (adev)->irq.ih_funcs->decode_iv((adev), (iv))

#define amdgpu_ih_set_rptr(adev) (adev)->irq.ih_funcs->set_rptr((adev))



int amdgpu_ih_ring_init(struct amdgpu_device *adev, unsigned ring_size,

			bool use_bus_addr);

void amdgpu_ih_ring_fini(struct amdgpu_device *adev);