drm/amdgpu: move ring macros into amdgpu_ring header
Subsystems (2)
PATCH 1/5 drm/amdgpu: move ring macros into amdgpu_ring header
Demangle amdgpu.h.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 23 ----------------------- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 23 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -23
@@ -1261,29 +1261,6 @@ int emu_soc_asic_init(struct amdgpu_device *adev);#define amdgpu_vm_copy_pte (adev, ib, pe, src, count) ((adev)->vm_manager.vm_pte_funcs->copy_pte((ib), (pe), (src), (count)))#define amdgpu_vm_write_pte (adev, ib, pe, value, count, incr) ((adev)->vm_manager.vm_pte_funcs->write_pte((ib), (pe), (value), (count), (incr)))#define amdgpu_vm_set_pte_pde (adev, ib, pe, addr, count, incr, flags) ((adev)->vm_manager.vm_pte_funcs->set_pte_pde((ib), (pe), (addr), (count), (incr), (flags))) -#define amdgpu_ring_parse_cs (r, p, ib) ((r)->funcs->parse_cs((p), (ib))) -#define amdgpu_ring_patch_cs_in_place (r, p, ib) ((r)->funcs->patch_cs_in_place((p), (ib))) -#define amdgpu_ring_test_ring (r) (r)->funcs->test_ring((r)) -#define amdgpu_ring_test_ib (r, t) (r)->funcs->test_ib((r), (t)) -#define amdgpu_ring_get_rptr (r) (r)->funcs->get_rptr((r)) -#define amdgpu_ring_get_wptr (r) (r)->funcs->get_wptr((r)) -#define amdgpu_ring_set_wptr (r) (r)->funcs->set_wptr((r)) -#define amdgpu_ring_emit_ib (r, ib, vmid, c) (r)->funcs->emit_ib((r), (ib), (vmid), (c)) -#define amdgpu_ring_emit_pipeline_sync (r) (r)->funcs->emit_pipeline_sync((r)) -#define amdgpu_ring_emit_vm_flush (r, vmid, addr) (r)->funcs->emit_vm_flush((r), (vmid), (addr)) -#define amdgpu_ring_emit_fence (r, addr, seq, flags) (r)->funcs->emit_fence((r), (addr), (seq), (flags)) -#define amdgpu_ring_emit_gds_switch (r, v, db, ds, wb, ws, ab, as) (r)->funcs->emit_gds_switch((r), (v), (db), (ds), (wb), (ws), (ab), (as)) -#define amdgpu_ring_emit_hdp_flush (r) (r)->funcs->emit_hdp_flush((r)) -#define amdgpu_ring_emit_switch_buffer (r) (r)->funcs->emit_switch_buffer((r)) -#define amdgpu_ring_emit_cntxcntl (r, d) (r)->funcs->emit_cntxcntl((r), (d)) -#define amdgpu_ring_emit_rreg (r, d) (r)->funcs->emit_rreg((r), (d)) -#define amdgpu_ring_emit_wreg (r, d, v) (r)->funcs->emit_wreg((r), (d), (v)) -#define amdgpu_ring_emit_reg_wait (r, d, v, m) (r)->funcs->emit_reg_wait((r), (d), (v), (m)) -#define amdgpu_ring_emit_reg_write_reg_wait (r, d0, d1, v, m) (r)->funcs->emit_reg_write_reg_wait((r), (d0), (d1), (v), (m)) -#define amdgpu_ring_emit_tmz (r, b) (r)->funcs->emit_tmz((r), (b)) -#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_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_ring.h +24 -0
@@ -221,6 +221,30 @@ struct amdgpu_ring {#endif }; +#define amdgpu_ring_parse_cs (r, p, ib) ((r)->funcs->parse_cs((p), (ib))) +#define amdgpu_ring_patch_cs_in_place (r, p, ib) ((r)->funcs->patch_cs_in_place((p), (ib))) +#define amdgpu_ring_test_ring (r) (r)->funcs->test_ring((r)) +#define amdgpu_ring_test_ib (r, t) (r)->funcs->test_ib((r), (t)) +#define amdgpu_ring_get_rptr (r) (r)->funcs->get_rptr((r)) +#define amdgpu_ring_get_wptr (r) (r)->funcs->get_wptr((r)) +#define amdgpu_ring_set_wptr (r) (r)->funcs->set_wptr((r)) +#define amdgpu_ring_emit_ib (r, ib, vmid, c) (r)->funcs->emit_ib((r), (ib), (vmid), (c)) +#define amdgpu_ring_emit_pipeline_sync (r) (r)->funcs->emit_pipeline_sync((r)) +#define amdgpu_ring_emit_vm_flush (r, vmid, addr) (r)->funcs->emit_vm_flush((r), (vmid), (addr)) +#define amdgpu_ring_emit_fence (r, addr, seq, flags) (r)->funcs->emit_fence((r), (addr), (seq), (flags)) +#define amdgpu_ring_emit_gds_switch (r, v, db, ds, wb, ws, ab, as) (r)->funcs->emit_gds_switch((r), (v), (db), (ds), (wb), (ws), (ab), (as)) +#define amdgpu_ring_emit_hdp_flush (r) (r)->funcs->emit_hdp_flush((r)) +#define amdgpu_ring_emit_switch_buffer (r) (r)->funcs->emit_switch_buffer((r)) +#define amdgpu_ring_emit_cntxcntl (r, d) (r)->funcs->emit_cntxcntl((r), (d)) +#define amdgpu_ring_emit_rreg (r, d) (r)->funcs->emit_rreg((r), (d)) +#define amdgpu_ring_emit_wreg (r, d, v) (r)->funcs->emit_wreg((r), (d), (v)) +#define amdgpu_ring_emit_reg_wait (r, d, v, m) (r)->funcs->emit_reg_wait((r), (d), (v), (m)) +#define amdgpu_ring_emit_reg_write_reg_wait (r, d0, d1, v, m) (r)->funcs->emit_reg_write_reg_wait((r), (d0), (d1), (v), (m)) +#define amdgpu_ring_emit_tmz (r, b) (r)->funcs->emit_tmz((r), (b)) +#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)) +int amdgpu_ring_alloc (struct amdgpu_ring *ring,unsigned ndw);void amdgpu_ring_insert_nop (struct amdgpu_ring *ring,uint32_t count);void amdgpu_ring_generic_pad_ib (struct amdgpu_ring *ring,struct amdgpu_ib *ib);
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1533294709-13622-1-git-send-email-ray.huang-5C7GfCeVMHo@public.gmane.org
PATCH 2/5 drm/amdgpu: remove useless gds switch macro
Demangle amdgpu.h.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -1
@@ -1272,7 +1272,6 @@ int emu_soc_asic_init(struct amdgpu_device *adev);#define amdgpu_display_page_flip_get_scanoutpos (adev, crtc, vbl, pos) (adev)->mode_info.funcs->page_flip_get_scanoutpos((adev), (crtc), (vbl), (pos))#define amdgpu_display_add_encoder (adev, e, s, c) (adev)->mode_info.funcs->add_encoder((adev), (e), (s), (c))#define amdgpu_display_add_connector (adev, ci, sd, ct, ib, coi, h, r) (adev)->mode_info.funcs->add_connector((adev), (ci), (sd), (ct), (ib), (coi), (h), (r)) -#define amdgpu_gds_switch (adev, r, v, d, w, a) (adev)->gds.funcs->patch_gds_switch((r), (v), (d), (w), (a))/* Common functions */ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/5 drm/amdgpu: move display definitions into amdgpu_display header
In reply to a message not in the archiveDemangle amdgpu.h.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 15 --------------- drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_display.h | 15 +++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 1 + drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 1 + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 1 + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 1 + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 1 + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 1 + 13 files changed, 26 insertions(+), 15 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -15
@@ -758,9 +758,6 @@ int amdgpu_cs_wait_ioctl(struct drm_device *dev, void *data, struct drm_file *fiint amdgpu_cs_wait_fences_ioctl (struct drm_device *dev,void *data,struct drm_file *filp); -int amdgpu_display_freesync_ioctl (struct drm_device *dev,void *data, -struct drm_file *filp); -/* VRAM scratch page for HDP bug, default vram page */ struct amdgpu_vram_scratch {struct amdgpu_bo *robj;
@@ -1261,24 +1258,12 @@ int emu_soc_asic_init(struct amdgpu_device *adev);#define amdgpu_vm_copy_pte (adev, ib, pe, src, count) ((adev)->vm_manager.vm_pte_funcs->copy_pte((ib), (pe), (src), (count)))#define amdgpu_vm_write_pte (adev, ib, pe, value, count, incr) ((adev)->vm_manager.vm_pte_funcs->write_pte((ib), (pe), (value), (count), (incr)))#define amdgpu_vm_set_pte_pde (adev, ib, pe, addr, count, incr, flags) ((adev)->vm_manager.vm_pte_funcs->set_pte_pde((ib), (pe), (addr), (count), (incr), (flags))) -#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)) -#define amdgpu_display_hpd_sense (adev, h) (adev)->mode_info.funcs->hpd_sense((adev), (h)) -#define amdgpu_display_hpd_set_polarity (adev, h) (adev)->mode_info.funcs->hpd_set_polarity((adev), (h)) -#define amdgpu_display_hpd_get_gpio_reg (adev) (adev)->mode_info.funcs->hpd_get_gpio_reg((adev)) -#define amdgpu_display_bandwidth_update (adev) (adev)->mode_info.funcs->bandwidth_update((adev)) -#define amdgpu_display_page_flip (adev, crtc, base, async) (adev)->mode_info.funcs->page_flip((adev), (crtc), (base), (async)) -#define amdgpu_display_page_flip_get_scanoutpos (adev, crtc, vbl, pos) (adev)->mode_info.funcs->page_flip_get_scanoutpos((adev), (crtc), (vbl), (pos)) -#define amdgpu_display_add_encoder (adev, e, s, c) (adev)->mode_info.funcs->add_encoder((adev), (e), (s), (c)) -#define amdgpu_display_add_connector (adev, ci, sd, ct, ib, coi, h, r) (adev)->mode_info.funcs->add_connector((adev), (ci), (sd), (ct), (ib), (coi), (h), (r))/* Common functions */ int amdgpu_device_gpu_recover (struct amdgpu_device *adev,struct amdgpu_job * job,bool force);void amdgpu_device_pci_config_reset (struct amdgpu_device *adev);bool amdgpu_device_need_post (struct amdgpu_device *adev); -void amdgpu_display_update_priority (struct amdgpu_device *adev);void amdgpu_cs_report_moved_bytes (struct amdgpu_device *adev,u64 num_bytes,u64 num_vis_bytes);
drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c +1 -0
@@ -31,6 +31,7 @@#include <drm/drm_crtc_helper.h> #include "amdgpu.h" #include "amdgpu_pm.h" +#include "amdgpu_display.h" #include "amd_acpi.h" #include "atom.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +1 -0
@@ -29,6 +29,7 @@#include "amdgpu_atombios.h" #include "amdgpu_atomfirmware.h" #include "amdgpu_i2c.h" +#include "amdgpu_display.h" #include "atom.h" #include "atom-bits.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +1 -0
@@ -34,6 +34,7 @@#include "atombios_dp.h" #include "amdgpu_connectors.h" #include "amdgpu_i2c.h" +#include "amdgpu_display.h" #include <linux/pm_runtime.h>
drivers/gpu/drm/amd/amdgpu/amdgpu_display.h +15 -0
@@ -23,6 +23,21 @@#ifndef __AMDGPU_DISPLAY_H__#define __AMDGPU_DISPLAY_H__ +#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)) +#define amdgpu_display_hpd_sense (adev, h) (adev)->mode_info.funcs->hpd_sense((adev), (h)) +#define amdgpu_display_hpd_set_polarity (adev, h) (adev)->mode_info.funcs->hpd_set_polarity((adev), (h)) +#define amdgpu_display_hpd_get_gpio_reg (adev) (adev)->mode_info.funcs->hpd_get_gpio_reg((adev)) +#define amdgpu_display_bandwidth_update (adev) (adev)->mode_info.funcs->bandwidth_update((adev)) +#define amdgpu_display_page_flip (adev, crtc, base, async) (adev)->mode_info.funcs->page_flip((adev), (crtc), (base), (async)) +#define amdgpu_display_page_flip_get_scanoutpos (adev, crtc, vbl, pos) (adev)->mode_info.funcs->page_flip_get_scanoutpos((adev), (crtc), (vbl), (pos)) +#define amdgpu_display_add_encoder (adev, e, s, c) (adev)->mode_info.funcs->add_encoder((adev), (e), (s), (c)) +#define amdgpu_display_add_connector (adev, ci, sd, ct, ib, coi, h, r) (adev)->mode_info.funcs->add_connector((adev), (ci), (sd), (ct), (ib), (coi), (h), (r)) + +int amdgpu_display_freesync_ioctl (struct drm_device *dev,void *data, +struct drm_file *filp); +void amdgpu_display_update_priority (struct amdgpu_device *adev);uint32_t amdgpu_display_supported_domains (struct amdgpu_device *adev);struct drm_framebuffer * amdgpu_display_user_framebuffer_create(struct drm_device *dev,
drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c +1 -0
@@ -28,6 +28,7 @@#include <drm/amdgpu_drm.h> #include "amdgpu.h" #include "amdgpu_connectors.h" +#include "amdgpu_display.h" #include "atom.h" #include "atombios_encoders.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +1 -0
@@ -38,6 +38,7 @@#include <linux/pm_runtime.h> #include "amdgpu_amdkfd.h" #include "amdgpu_gem.h" +#include "amdgpu_display.h" /** * amdgpu_driver_unload_kms - Main unload function for KMS.
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +1 -0
@@ -27,6 +27,7 @@#include "amdgpu_drv.h" #include "amdgpu_pm.h" #include "amdgpu_dpm.h" +#include "amdgpu_display.h" #include "atom.h" #include <linux/power_supply.h> #include <linux/hwmon.h>
drivers/gpu/drm/amd/amdgpu/atombios_encoders.c +1 -0
@@ -28,6 +28,7 @@#include <drm/amdgpu_drm.h> #include "amdgpu.h" #include "amdgpu_connectors.h" +#include "amdgpu_display.h" #include "atom.h" #include "atombios_encoders.h" #include "atombios_dp.h"
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +1 -0
@@ -31,6 +31,7 @@#include "atombios_encoders.h" #include "amdgpu_pll.h" #include "amdgpu_connectors.h" +#include "amdgpu_display.h" #include "dce_v10_0.h" #include "dce/dce_10_0_d.h"
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +1 -0
@@ -31,6 +31,7 @@#include "atombios_encoders.h" #include "amdgpu_pll.h" #include "amdgpu_connectors.h" +#include "amdgpu_display.h" #include "dce_v11_0.h" #include "dce/dce_11_0_d.h"
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +1 -0
@@ -30,6 +30,7 @@#include "atombios_encoders.h" #include "amdgpu_pll.h" #include "amdgpu_connectors.h" +#include "amdgpu_display.h" #include "bif/bif_3_0_d.h" #include "bif/bif_3_0_sh_mask.h"
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +1 -0
@@ -31,6 +31,7 @@#include "atombios_encoders.h" #include "amdgpu_pll.h" #include "amdgpu_connectors.h" +#include "amdgpu_display.h" #include "dce_v8_0.h" #include "dce/dce_8_0_d.h"
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/5 drm/amdgpu: move gmc macros into amdgpu_gmc header
In reply to a message not in the archiveDemangle amdgpu.h.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 6 ------ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 7 +++++++ 2 files changed, 7 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -6
@@ -1249,12 +1249,6 @@ int emu_soc_asic_init(struct amdgpu_device *adev);#define amdgpu_asic_flush_hdp (adev, r) (adev)->asic_funcs->flush_hdp((adev), (r))#define amdgpu_asic_invalidate_hdp (adev, r) (adev)->asic_funcs->invalidate_hdp((adev), (r))#define amdgpu_asic_need_full_reset (adev) (adev)->asic_funcs->need_full_reset((adev)) -#define amdgpu_gmc_flush_gpu_tlb (adev, vmid) (adev)->gmc.gmc_funcs->flush_gpu_tlb((adev), (vmid)) -#define amdgpu_gmc_emit_flush_gpu_tlb (r, vmid, addr) (r)->adev->gmc.gmc_funcs->emit_flush_gpu_tlb((r), (vmid), (addr)) -#define amdgpu_gmc_emit_pasid_mapping (r, vmid, pasid) (r)->adev->gmc.gmc_funcs->emit_pasid_mapping((r), (vmid), (pasid)) -#define amdgpu_gmc_set_pte_pde (adev, pt, idx, addr, flags) (adev)->gmc.gmc_funcs->set_pte_pde((adev), (pt), (idx), (addr), (flags)) -#define amdgpu_gmc_get_vm_pde (adev, level, dst, flags) (adev)->gmc.gmc_funcs->get_vm_pde((adev), (level), (dst), (flags)) -#define amdgpu_gmc_get_pte_flags (adev, flags) (adev)->gmc.gmc_funcs->get_vm_pte_flags((adev),(flags))#define amdgpu_vm_copy_pte (adev, ib, pe, src, count) ((adev)->vm_manager.vm_pte_funcs->copy_pte((ib), (pe), (src), (count)))#define amdgpu_vm_write_pte (adev, ib, pe, value, count, incr) ((adev)->vm_manager.vm_pte_funcs->write_pte((ib), (pe), (value), (count), (incr)))#define amdgpu_vm_set_pte_pde (adev, ib, pe, addr, count, incr, flags) ((adev)->vm_manager.vm_pte_funcs->set_pte_pde((ib), (pe), (addr), (count), (incr), (flags)))
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h +7 -0
@@ -109,6 +109,13 @@ struct amdgpu_gmc {const struct amdgpu_gmc_funcs *gmc_funcs; }; +#define amdgpu_gmc_flush_gpu_tlb (adev, vmid) (adev)->gmc.gmc_funcs->flush_gpu_tlb((adev), (vmid)) +#define amdgpu_gmc_emit_flush_gpu_tlb (r, vmid, addr) (r)->adev->gmc.gmc_funcs->emit_flush_gpu_tlb((r), (vmid), (addr)) +#define amdgpu_gmc_emit_pasid_mapping (r, vmid, pasid) (r)->adev->gmc.gmc_funcs->emit_pasid_mapping((r), (vmid), (pasid)) +#define amdgpu_gmc_set_pte_pde (adev, pt, idx, addr, flags) (adev)->gmc.gmc_funcs->set_pte_pde((adev), (pt), (idx), (addr), (flags)) +#define amdgpu_gmc_get_vm_pde (adev, level, dst, flags) (adev)->gmc.gmc_funcs->get_vm_pde((adev), (level), (dst), (flags)) +#define amdgpu_gmc_get_pte_flags (adev, flags) (adev)->gmc.gmc_funcs->get_vm_pte_flags((adev),(flags)) +/** * amdgpu_gmc_vram_full_visible - Check if full VRAM is visible through the BAR *
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/5 drm/amdgpu: move vm definitions into amdgpu_vm header
In reply to a message not in the archiveDemangle amdgpu.h.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 24 ------------------------ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 24 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -24
@@ -257,27 +257,6 @@ amdgpu_device_ip_get_ip_block(struct amdgpu_device *adev,int amdgpu_device_ip_block_add (struct amdgpu_device *adev,const struct amdgpu_ip_block_version *ip_block_version); -/* provided by hw blocks that can write ptes, e.g., sdma */ -struct amdgpu_vm_pte_funcs { -/* number of dw to reserve per operation */ -unsigned copy_pte_num_dw; - -/* copy pte entries from GART */ -void (*copy_pte)(struct amdgpu_ib *ib, -uint64_t pe,uint64_t src, -unsigned count); - -/* write pte one entry at a time with addr mapping */ -void (*write_pte)(struct amdgpu_ib *ib,uint64_t pe, -uint64_t value,unsigned count, -uint32_t incr); -/* for linear pte/pde updates without addr mapping */ -void (*set_pte_pde)(struct amdgpu_ib *ib, -uint64_t pe, -uint64_t addr,unsigned count, -uint32_t incr,uint64_t flags); -}; -/* * BIOS. */
@@ -1249,9 +1228,6 @@ int emu_soc_asic_init(struct amdgpu_device *adev);#define amdgpu_asic_flush_hdp (adev, r) (adev)->asic_funcs->flush_hdp((adev), (r))#define amdgpu_asic_invalidate_hdp (adev, r) (adev)->asic_funcs->invalidate_hdp((adev), (r))#define amdgpu_asic_need_full_reset (adev) (adev)->asic_funcs->need_full_reset((adev)) -#define amdgpu_vm_copy_pte (adev, ib, pe, src, count) ((adev)->vm_manager.vm_pte_funcs->copy_pte((ib), (pe), (src), (count))) -#define amdgpu_vm_write_pte (adev, ib, pe, value, count, incr) ((adev)->vm_manager.vm_pte_funcs->write_pte((ib), (pe), (value), (count), (incr))) -#define amdgpu_vm_set_pte_pde (adev, ib, pe, addr, count, incr, flags) ((adev)->vm_manager.vm_pte_funcs->set_pte_pde((ib), (pe), (addr), (count), (incr), (flags)))/* Common functions */ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +25 -0
@@ -160,6 +160,27 @@ struct amdgpu_vm_pt {struct amdgpu_vm_pt *entries; }; +/* provided by hw blocks that can write ptes, e.g., sdma */ +struct amdgpu_vm_pte_funcs { +/* number of dw to reserve per operation */ +unsigned copy_pte_num_dw; + +/* copy pte entries from GART */ +void (*copy_pte)(struct amdgpu_ib *ib, +uint64_t pe,uint64_t src, +unsigned count); + +/* write pte one entry at a time with addr mapping */ +void (*write_pte)(struct amdgpu_ib *ib,uint64_t pe, +uint64_t value,unsigned count, +uint32_t incr); +/* for linear pte/pde updates without addr mapping */ +void (*set_pte_pde)(struct amdgpu_ib *ib, +uint64_t pe, +uint64_t addr,unsigned count, +uint32_t incr,uint64_t flags); +}; +#define AMDGPU_VM_FAULT (pasid, addr) (((u64)(pasid) << 48) | (addr))#define AMDGPU_VM_FAULT_PASID (fault) ((u64)(fault) >> 48)#define AMDGPU_VM_FAULT_ADDR (fault) ((u64)(fault) & 0xfffffffff000ULL)
@@ -266,6 +287,10 @@ struct amdgpu_vm_manager {spinlock_t pasid_lock; }; +#define amdgpu_vm_copy_pte (adev, ib, pe, src, count) ((adev)->vm_manager.vm_pte_funcs->copy_pte((ib), (pe), (src), (count))) +#define amdgpu_vm_write_pte (adev, ib, pe, value, count, incr) ((adev)->vm_manager.vm_pte_funcs->write_pte((ib), (pe), (value), (count), (incr))) +#define amdgpu_vm_set_pte_pde (adev, ib, pe, addr, count, incr, flags) ((adev)->vm_manager.vm_pte_funcs->set_pte_pde((ib), (pe), (addr), (count), (incr), (flags))) +void amdgpu_vm_manager_init (struct amdgpu_device *adev);void amdgpu_vm_manager_fini (struct amdgpu_device *adev); int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Christian König
Acked-byAm 03.08.2018 um 13:11 schrieb Huang Rui:
Quoted 3 lines
Demangle
amdgpu.h.Signed-off-by Huang Rui <[email protected]>
Thanks a lot for taking care of this,
Christian.
Quoted 64 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 23 ----------------------- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 23 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +0
-23@@ -1261,29 +1261,6 @@ int emu_soc_asic_init(struct amdgpu_device *adev);#define amdgpu_vm_copy_pte (adev, ib, pe, src, count) ((adev)->vm_manager.vm_pte_funcs->copy_pte((ib), (pe), (src), (count)))#define amdgpu_vm_write_pte (adev, ib, pe, value, count, incr) ((adev)->vm_manager.vm_pte_funcs->write_pte((ib), (pe), (value), (count), (incr)))#define amdgpu_vm_set_pte_pde (adev, ib, pe, addr, count, incr, flags) ((adev)->vm_manager.vm_pte_funcs->set_pte_pde((ib), (pe), (addr), (count), (incr), (flags))) -#define amdgpu_ring_parse_cs (r, p, ib) ((r)->funcs->parse_cs((p), (ib))) -#define amdgpu_ring_patch_cs_in_place (r, p, ib) ((r)->funcs->patch_cs_in_place((p), (ib))) -#define amdgpu_ring_test_ring (r) (r)->funcs->test_ring((r)) -#define amdgpu_ring_test_ib (r, t) (r)->funcs->test_ib((r), (t)) -#define amdgpu_ring_get_rptr (r) (r)->funcs->get_rptr((r)) -#define amdgpu_ring_get_wptr (r) (r)->funcs->get_wptr((r)) -#define amdgpu_ring_set_wptr (r) (r)->funcs->set_wptr((r)) -#define amdgpu_ring_emit_ib (r, ib, vmid, c) (r)->funcs->emit_ib((r), (ib), (vmid), (c)) -#define amdgpu_ring_emit_pipeline_sync (r) (r)->funcs->emit_pipeline_sync((r)) -#define amdgpu_ring_emit_vm_flush (r, vmid, addr) (r)->funcs->emit_vm_flush((r), (vmid), (addr)) -#define amdgpu_ring_emit_fence (r, addr, seq, flags) (r)->funcs->emit_fence((r), (addr), (seq), (flags)) -#define amdgpu_ring_emit_gds_switch (r, v, db, ds, wb, ws, ab, as) (r)->funcs->emit_gds_switch((r), (v), (db), (ds), (wb), (ws), (ab), (as)) -#define amdgpu_ring_emit_hdp_flush (r) (r)->funcs->emit_hdp_flush((r)) -#define amdgpu_ring_emit_switch_buffer (r) (r)->funcs->emit_switch_buffer((r)) -#define amdgpu_ring_emit_cntxcntl (r, d) (r)->funcs->emit_cntxcntl((r), (d)) -#define amdgpu_ring_emit_rreg (r, d) (r)->funcs->emit_rreg((r), (d)) -#define amdgpu_ring_emit_wreg (r, d, v) (r)->funcs->emit_wreg((r), (d), (v)) -#define amdgpu_ring_emit_reg_wait (r, d, v, m) (r)->funcs->emit_reg_wait((r), (d), (v), (m)) -#define amdgpu_ring_emit_reg_write_reg_wait (r, d0, d1, v, m) (r)->funcs->emit_reg_write_reg_wait((r), (d0), (d1), (v), (m)) -#define amdgpu_ring_emit_tmz (r, b) (r)->funcs->emit_tmz((r), (b)) -#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_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_ring.h +17
-0@@ -221,6 +221,30 @@ struct amdgpu_ring {#endif }; +#define amdgpu_ring_parse_cs (r, p, ib) ((r)->funcs->parse_cs((p), (ib))) +#define amdgpu_ring_patch_cs_in_place (r, p, ib) ((r)->funcs->patch_cs_in_place((p), (ib))) +#define amdgpu_ring_test_ring (r) (r)->funcs->test_ring((r)) +#define amdgpu_ring_test_ib (r, t) (r)->funcs->test_ib((r), (t)) +#define amdgpu_ring_get_rptr (r) (r)->funcs->get_rptr((r)) +#define amdgpu_ring_get_wptr (r) (r)->funcs->get_wptr((r)) +#define amdgpu_ring_set_wptr (r) (r)->funcs->set_wptr((r)) +#define amdgpu_ring_emit_ib (r, ib, vmid, c) (r)->funcs->emit_ib((r), (ib), (vmid), (c)) +#define amdgpu_ring_emit_pipeline_sync (r) (r)->funcs->emit_pipeline_sync((r)) +#define amdgpu_ring_emit_vm_flush (r, vmid, addr) (r)->funcs->emit_vm_flush((r), (vmid), (addr)) +#define amdgpu_ring_emit_fence (r, addr, seq, flags) (r)->funcs->emit_fence((r), (addr), (seq), (flags)) +#define amdgpu_ring_emit_gds_switch (r, v, db, ds, wb, ws, ab, as) (r)->funcs->emit_gds_switch((r), (v), (db), (ds), (wb), (ws), (ab), (as)) +#define amdgpu_ring_emit_hdp_flush (r) (r)->funcs->emit_hdp_flush((r)) +#define amdgpu_ring_emit_switch_buffer (r) (r)->funcs->emit_switch_buffer((r)) +#define amdgpu_ring_emit_cntxcntl (r, d) (r)->funcs->emit_cntxcntl((r), (d)) +#define amdgpu_ring_emit_rreg (r, d) (r)->funcs->emit_rreg((r), (d)) +#define amdgpu_ring_emit_wreg (r, d, v) (r)->funcs->emit_wreg((r), (d), (v))
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h struct amdgpu_ring { · line 250
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +7
-0+#define amdgpu_ring_emit_reg_wait (r, d, v, m) (r)->funcs->emit_reg_wait((r), (d), (v), (m)) +#define amdgpu_ring_emit_reg_write_reg_wait (r, d0, d1, v, m) (r)->funcs->emit_reg_write_reg_wait((r), (d0), (d1), (v), (m)) +#define amdgpu_ring_emit_tmz (r, b) (r)->funcs->emit_tmz((r), (b)) +#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)) +int amdgpu_ring_alloc (struct amdgpu_ring *ring,unsigned ndw);void amdgpu_ring_insert_nop (struct amdgpu_ring *ring,uint32_t count);void amdgpu_ring_generic_pad_ib (struct amdgpu_ring *ring,struct amdgpu_ib *ib);
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx