drm/amdgpu/gfx8: whitespace change
Subsystems (3)
PATCH 1/6 drm/amdgpu/gfx8: whitespace change
Make it consistent.
--- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +2 -1
@@ -859,7 +859,8 @@ static int gfx_v8_0_ring_test_ib(struct amdgpu_ring *ring, long timeout) } -static void gfx_v8_0_free_microcode (struct amdgpu_device *adev) { +static void gfx_v8_0_free_microcode (struct amdgpu_device *adev) +{release_firmware (adev->gfx.pfp_fw); adev->gfx.pfp_fw =NULL ;release_firmware (adev->gfx.me_fw);
Signature · 6 lines
2.5.5 _______________________________________________ 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): 1496864097-4322-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
PATCH 2/6 drm/amdgpu/gfx9: remove spurious line in kiq setup
This overrode what queue was actually assigned for kiq.
--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +0 -1
@@ -1054,7 +1054,6 @@ static int gfx_v9_0_kiq_init_ring(struct amdgpu_device *adev,if (r)return r; - ring->queue =0 ; ring->eop_gpu_addr = kiq->eop_gpu_addr;sprintf (ring->name,"kiq %d.%d.%d" , ring->me, ring->pipe, ring->queue); r = amdgpu_ring_init(adev, ring, 1024,
Signature · 6 lines
2.5.5 _______________________________________________ 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): 1496864097-4322-2-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
axie
Reviewed-by Alex XieRe: [PATCH 2/6] drm/amdgpu/gfx9: remove spurious line in kiq setup
Quoted 12 lines · Alex Deucher
This overrode what queue was actually assigned for kiq.
Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 1 - 1 file changed, 1 deletion(-)drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +0
-0
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c static int gfx_v9_0_kiq_init_ring(struct amdgpu_device *adev, · line 1059
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +0
-1@@ -1054,7 +1054,6 @@ static int gfx_v9_0_kiq_init_ring(struct amdgpu_device *adev,if (r)return r; - ring->queue =0 ; ring->eop_gpu_addr = kiq->eop_gpu_addr;sprintf (ring->name,"kiq %d.%d.%d" , ring->me, ring->pipe, ring->queue); r = amdgpu_ring_init(adev, ring, 1024,
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/6 drm/amdgpu: move mec queue helpers to amdgpu_gfx.h
In reply to a message not in the archiveThey are gfx related, not general helpers.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 30 ------------------------------ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 9 +++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 30 ++++++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 ++-- 6 files changed, 40 insertions(+), 39 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -30
@@ -1831,36 +1831,6 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring)return NULL ; } -static inline int amdgpu_queue_to_bit (struct amdgpu_device *adev, -int mec,int pipe,int queue) -{ -int bit =0 ; - - bit += mec * adev->gfx.mec.num_pipe_per_mec - * adev->gfx.mec.num_queue_per_pipe; - bit += pipe * adev->gfx.mec.num_queue_per_pipe; - bit += queue; - -return bit; -} - -static inline void amdgpu_bit_to_queue (struct amdgpu_device *adev,int bit, -int *mec,int *pipe,int *queue) -{ - *queue = bit % adev->gfx.mec.num_queue_per_pipe; - *pipe = (bit / adev->gfx.mec.num_queue_per_pipe) - % adev->gfx.mec.num_pipe_per_mec; - *mec = (bit / adev->gfx.mec.num_queue_per_pipe) - / adev->gfx.mec.num_pipe_per_mec; - -} -static inline bool amdgpu_is_mec_queue_enabled (struct amdgpu_device *adev, -int mec,int pipe,int queue) -{ -return test_bit (amdgpu_queue_to_bit (adev, mec, pipe, queue), - adev->gfx.mec.queue_bitmap); -} -/* * ASICs macro. */
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +5 -4
@@ -24,6 +24,7 @@#include "amd_shared.h" #include <drm/drmP.h> #include "amdgpu.h" +#include "amdgpu_gfx.h" #include <linux/module.h> const struct kfd2kgd_calls *kfd2kgd;
@@ -113,10 +114,10 @@ void amdgpu_amdkfd_device_init(struct amdgpu_device *adev)/* remove the KIQ bit as well */ if (adev->gfx.kiq.ring.ready) -clear_bit (amdgpu_queue_to_bit (adev, - adev->gfx.kiq.ring.me -1 , - adev->gfx.kiq.ring.pipe, - adev->gfx.kiq.ring.queue), +clear_bit (amdgpu_gfx_queue_to_bit (adev, + adev->gfx.kiq.ring.me -1 , + adev->gfx.kiq.ring.pipe, + adev->gfx.kiq.ring.queue), gpu_resources.queue_bitmap);/* According to linux/bitmap.h we shouldn't use bitmap_clear if
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h +30 -0
@@ -45,4 +45,34 @@ static inline u32 amdgpu_gfx_create_bitmask(u32 bit_width)return (u32)((1ULL << bit_width) -1 ); } +static inline int amdgpu_gfx_queue_to_bit (struct amdgpu_device *adev, +int mec,int pipe,int queue) +{ +int bit =0 ; + + bit += mec * adev->gfx.mec.num_pipe_per_mec + * adev->gfx.mec.num_queue_per_pipe; + bit += pipe * adev->gfx.mec.num_queue_per_pipe; + bit += queue; + +return bit; +} + +static inline void amdgpu_gfx_bit_to_queue (struct amdgpu_device *adev,int bit, +int *mec,int *pipe,int *queue) +{ + *queue = bit % adev->gfx.mec.num_queue_per_pipe; + *pipe = (bit / adev->gfx.mec.num_queue_per_pipe) + % adev->gfx.mec.num_pipe_per_mec; + *mec = (bit / adev->gfx.mec.num_queue_per_pipe) + / adev->gfx.mec.num_pipe_per_mec; + +} +static inline bool amdgpu_gfx_is_mec_queue_enabled (struct amdgpu_device *adev, +int mec,int pipe,int queue) +{ +return test_bit (amdgpu_gfx_queue_to_bit (adev, mec, pipe, queue), + adev->gfx.mec.queue_bitmap); +} +#endif
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +1 -1
@@ -4776,7 +4776,7 @@ static int gfx_v7_0_sw_init(void *handle)for (i =0 ; i < adev->gfx.mec.num_mec; ++i) {for (j =0 ; j < adev->gfx.mec.num_queue_per_pipe; j++) {for (k =0 ; k < adev->gfx.mec.num_pipe_per_mec; k++) { -if (!amdgpu_is_mec_queue_enabled (adev, i, k, j)) +if (!amdgpu_gfx_is_mec_queue_enabled (adev, i, k, j))continue ; r = gfx_v7_0_compute_ring_init(adev,
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +2 -2
@@ -1393,7 +1393,7 @@ static int gfx_v8_0_kiq_acquire(struct amdgpu_device *adev,if (test_bit (queue_bit, adev->gfx.mec.queue_bitmap))continue ; -amdgpu_bit_to_queue (adev, queue_bit, &mec, &pipe, &queue); +amdgpu_gfx_bit_to_queue (adev, queue_bit, &mec, &pipe, &queue);/* Using pipes 2/3 from MEC 2 seems cause problems */ if (mec ==1 && pipe >1 )
@@ -2178,7 +2178,7 @@ static int gfx_v8_0_sw_init(void *handle)for (i =0 ; i < adev->gfx.mec.num_mec; ++i) {for (j =0 ; j < adev->gfx.mec.num_queue_per_pipe; j++) {for (k =0 ; k < adev->gfx.mec.num_pipe_per_mec; k++) { -if (!amdgpu_is_mec_queue_enabled (adev, i, k, j)) +if (!amdgpu_gfx_is_mec_queue_enabled (adev, i, k, j))continue ; r = gfx_v8_0_compute_ring_init(adev,
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +2 -2
@@ -1015,7 +1015,7 @@ static int gfx_v9_0_kiq_acquire(struct amdgpu_device *adev,if (test_bit (queue_bit, adev->gfx.mec.queue_bitmap))continue ; -amdgpu_bit_to_queue (adev, queue_bit, &mec, &pipe, &queue); +amdgpu_gfx_bit_to_queue (adev, queue_bit, &mec, &pipe, &queue);/* Using pipes 2/3 from MEC 2 seems cause problems */ if (mec ==1 && pipe >1 )
@@ -1556,7 +1556,7 @@ static int gfx_v9_0_sw_init(void *handle)for (i =0 ; i < adev->gfx.mec.num_mec; ++i) {for (j =0 ; j < adev->gfx.mec.num_queue_per_pipe; j++) {for (k =0 ; k < adev->gfx.mec.num_pipe_per_mec; k++) { -if (!amdgpu_is_mec_queue_enabled (adev, i, k, j)) +if (!amdgpu_gfx_is_mec_queue_enabled (adev, i, k, j))continue ; r = gfx_v9_0_compute_ring_init(adev,
Signature · 6 lines
2.5.5 _______________________________________________ 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): 1496864097-4322-3-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
axie
Reviewed-by Alex XieRe: [PATCH 3/6] drm/amdgpu: move mec queue helpers to amdgpu_gfx.h
Quoted 168 lines · Alex Deucher
They are gfx related, not general helpers.
Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 30 ------------------------------ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 9 +++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 30 ++++++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 ++-- 6 files changed, 40 insertions(+), 39 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +0
-30@@ -1831,36 +1831,6 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring)return NULL ; } -static inline int amdgpu_queue_to_bit (struct amdgpu_device *adev, -int mec,int pipe,int queue) -{ -int bit =0 ; - - bit += mec * adev->gfx.mec.num_pipe_per_mec - * adev->gfx.mec.num_queue_per_pipe; - bit += pipe * adev->gfx.mec.num_queue_per_pipe; - bit += queue; - -return bit; -} - -static inline void amdgpu_bit_to_queue (struct amdgpu_device *adev,int bit, -int *mec,int *pipe,int *queue) -{ - *queue = bit % adev->gfx.mec.num_queue_per_pipe; - *pipe = (bit / adev->gfx.mec.num_queue_per_pipe) - % adev->gfx.mec.num_pipe_per_mec; - *mec = (bit / adev->gfx.mec.num_queue_per_pipe) - / adev->gfx.mec.num_pipe_per_mec; - -} -static inline bool amdgpu_is_mec_queue_enabled (struct amdgpu_device *adev, -int mec,int pipe,int queue) -{ -return test_bit (amdgpu_queue_to_bit (adev, mec, pipe, queue), - adev->gfx.mec.queue_bitmap); -} -/* * ASICs macro. */ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +5
-4@@ -24,6 +24,7 @@#include "amd_shared.h" #include <drm/drmP.h> #include "amdgpu.h" +#include "amdgpu_gfx.h" #include <linux/module.h> const struct kfd2kgd_calls *kfd2kgd;@@ -113,10 +114,10 @@ void amdgpu_amdkfd_device_init(struct amdgpu_device *adev)/* remove the KIQ bit as well */ if (adev->gfx.kiq.ring.ready) -clear_bit (amdgpu_queue_to_bit (adev, - adev->gfx.kiq.ring.me -1 , - adev->gfx.kiq.ring.pipe, - adev->gfx.kiq.ring.queue), +clear_bit (amdgpu_gfx_queue_to_bit (adev, + adev->gfx.kiq.ring.me -1 , + adev->gfx.kiq.ring.pipe, + adev->gfx.kiq.ring.queue), gpu_resources.queue_bitmap);/* According to linux/bitmap.h we shouldn't use bitmap_clear if drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h +30
-0@@ -45,4 +45,34 @@ static inline u32 amdgpu_gfx_create_bitmask(u32 bit_width)return (u32)((1ULL << bit_width) -1 ); } +static inline int amdgpu_gfx_queue_to_bit (struct amdgpu_device *adev, +int mec,int pipe,int queue) +{ +int bit =0 ; + + bit += mec * adev->gfx.mec.num_pipe_per_mec + * adev->gfx.mec.num_queue_per_pipe; + bit += pipe * adev->gfx.mec.num_queue_per_pipe; + bit += queue; + +return bit; +} + +static inline void amdgpu_gfx_bit_to_queue (struct amdgpu_device *adev,int bit, +int *mec,int *pipe,int *queue) +{ + *queue = bit % adev->gfx.mec.num_queue_per_pipe; + *pipe = (bit / adev->gfx.mec.num_queue_per_pipe) + % adev->gfx.mec.num_pipe_per_mec; + *mec = (bit / adev->gfx.mec.num_queue_per_pipe) + / adev->gfx.mec.num_pipe_per_mec; + +} +static inline bool amdgpu_gfx_is_mec_queue_enabled (struct amdgpu_device *adev, +int mec,int pipe,int queue) +{ +return test_bit (amdgpu_gfx_queue_to_bit (adev, mec, pipe, queue), + adev->gfx.mec.queue_bitmap); +} +#endif drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +1
-1@@ -4776,7 +4776,7 @@ static int gfx_v7_0_sw_init(void *handle)for (i =0 ; i < adev->gfx.mec.num_mec; ++i) {for (j =0 ; j < adev->gfx.mec.num_queue_per_pipe; j++) {for (k =0 ; k < adev->gfx.mec.num_pipe_per_mec; k++) { -if (!amdgpu_is_mec_queue_enabled (adev, i, k, j)) +if (!amdgpu_gfx_is_mec_queue_enabled (adev, i, k, j))continue ; r = gfx_v7_0_compute_ring_init(adev,drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +2
-2@@ -1393,7 +1393,7 @@ static int gfx_v8_0_kiq_acquire(struct amdgpu_device *adev,if (test_bit (queue_bit, adev->gfx.mec.queue_bitmap))continue ; -amdgpu_bit_to_queue (adev, queue_bit, &mec, &pipe, &queue); +amdgpu_gfx_bit_to_queue (adev, queue_bit, &mec, &pipe, &queue);/* Using pipes 2/3 from MEC 2 seems cause problems */ if (mec ==1 && pipe >1 )@@ -2178,7 +2178,7 @@ static int gfx_v8_0_sw_init(void *handle)for (i =0 ; i < adev->gfx.mec.num_mec; ++i) {for (j =0 ; j < adev->gfx.mec.num_queue_per_pipe; j++) {for (k =0 ; k < adev->gfx.mec.num_pipe_per_mec; k++) { -if (!amdgpu_is_mec_queue_enabled (adev, i, k, j)) +if (!amdgpu_gfx_is_mec_queue_enabled (adev, i, k, j))continue ; r = gfx_v8_0_compute_ring_init(adev,drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +1
-1@@ -1015,7 +1015,7 @@ static int gfx_v9_0_kiq_acquire(struct amdgpu_device *adev,if (test_bit (queue_bit, adev->gfx.mec.queue_bitmap))continue ; -amdgpu_bit_to_queue (adev, queue_bit, &mec, &pipe, &queue); +amdgpu_gfx_bit_to_queue (adev, queue_bit, &mec, &pipe, &queue);/* Using pipes 2/3 from MEC 2 seems cause problems */ if (mec ==1 && pipe >1 )
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c static int gfx_v9_0_sw_init(void *handle) · line 1562
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +1
-1@@ -1556,7 +1556,7 @@ static int gfx_v9_0_sw_init(void *handle)for (i =0 ; i < adev->gfx.mec.num_mec; ++i) {for (j =0 ; j < adev->gfx.mec.num_queue_per_pipe; j++) {for (k =0 ; k < adev->gfx.mec.num_pipe_per_mec; k++) { -if (!amdgpu_is_mec_queue_enabled (adev, i, k, j)) +if (!amdgpu_gfx_is_mec_queue_enabled (adev, i, k, j))continue ; r = gfx_v9_0_compute_ring_init(adev,
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/6 drm/amdgpu/gfx: move more common KIQ code to amdgpu_gfx.c
In reply to a message not in the archiveLots more common stuff.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 103 ++++++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 11 ++++ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 110 ++------------------------------ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 109 ++----------------------------- 4 files changed, 122 insertions(+), 211 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +103 -0
@@ -145,3 +145,106 @@ void amdgpu_gfx_compute_queue_acquire(struct amdgpu_device *adev)if (WARN_ON (adev->gfx.num_compute_rings >AMDGPU_MAX_COMPUTE_RINGS )) adev->gfx.num_compute_rings =AMDGPU_MAX_COMPUTE_RINGS ; } + +static int amdgpu_gfx_kiq_acquire (struct amdgpu_device *adev, +struct amdgpu_ring *ring) +{ +int queue_bit; +int mec, pipe, queue; + + queue_bit = adev->gfx.mec.num_mec + * adev->gfx.mec.num_pipe_per_mec + * adev->gfx.mec.num_queue_per_pipe; + +while (queue_bit-- >=0 ) { +if (test_bit (queue_bit, adev->gfx.mec.queue_bitmap)) +continue ; + +amdgpu_gfx_bit_to_queue (adev, queue_bit, &mec, &pipe, &queue); + +/* Using pipes 2/3 from MEC 2 seems cause problems */ +if (mec ==1 && pipe >1 ) +continue ; + + ring->me = mec +1 ; + ring->pipe = pipe; + ring->queue = queue; + +return 0 ; + } + +dev_err (adev->dev,"Failed to find a queue for KIQ\n" ); +return -EINVAL ; +} + +int amdgpu_gfx_kiq_init_ring (struct amdgpu_device *adev, +struct amdgpu_ring *ring, +struct amdgpu_irq_src *irq) +{ +struct amdgpu_kiq *kiq = &adev->gfx.kiq; +int r =0 ; + +mutex_init (&kiq->ring_mutex); + + r =amdgpu_wb_get (adev, &adev->virt.reg_val_offs); +if (r) +return r; + + ring->adev =NULL ; + ring->ring_obj =NULL ; + ring->use_doorbell = true; + ring->doorbell_index =AMDGPU_DOORBELL_KIQ ; + + r =amdgpu_gfx_kiq_acquire (adev, ring); +if (r) +return r; + + ring->eop_gpu_addr = kiq->eop_gpu_addr; +sprintf (ring->name,"kiq %d.%d.%d" , ring->me, ring->pipe, ring->queue); + r =amdgpu_ring_init (adev, ring,1024 , + irq,AMDGPU_CP_KIQ_IRQ_DRIVER0 ); +if (r) +dev_warn (adev->dev,"(%d) failed to init kiq ring\n" , r); + +return r; +} + +void amdgpu_gfx_kiq_free_ring (struct amdgpu_ring *ring, +struct amdgpu_irq_src *irq) +{ +amdgpu_wb_free (ring->adev, ring->adev->virt.reg_val_offs); +amdgpu_ring_fini (ring); +} + +void amdgpu_gfx_kiq_fini (struct amdgpu_device *adev) +{ +struct amdgpu_kiq *kiq = &adev->gfx.kiq; + +amdgpu_bo_free_kernel (&kiq->eop_obj, &kiq->eop_gpu_addr,NULL ); +} + +int amdgpu_gfx_kiq_init (struct amdgpu_device *adev, +unsigned hpd_size) +{ +int r; +u32 *hpd; +struct amdgpu_kiq *kiq = &adev->gfx.kiq; + + r =amdgpu_bo_create_kernel (adev, hpd_size,PAGE_SIZE , +AMDGPU_GEM_DOMAIN_GTT , &kiq->eop_obj, + &kiq->eop_gpu_addr, (void **)&hpd); +if (r) { +dev_warn (adev->dev,"failed to create KIQ bo (%d).\n" , r); +return r; + } + +memset (hpd,0 , hpd_size); + + r =amdgpu_bo_reserve (kiq->eop_obj, true); +if (unlikely (r !=0 )) +dev_warn (adev->dev,"(%d) reserve kiq eop bo failed\n" , r); +amdgpu_bo_kunmap (kiq->eop_obj); +amdgpu_bo_unreserve (kiq->eop_obj); + +return 0 ; +}
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h +11 -0
@@ -32,6 +32,17 @@ void amdgpu_gfx_parse_disable_cu(unsigned *mask, unsigned max_se,void amdgpu_gfx_compute_queue_acquire (struct amdgpu_device *adev); +int amdgpu_gfx_kiq_init_ring (struct amdgpu_device *adev, +struct amdgpu_ring *ring, +struct amdgpu_irq_src *irq); + +void amdgpu_gfx_kiq_free_ring (struct amdgpu_ring *ring, +struct amdgpu_irq_src *irq); + +void amdgpu_gfx_kiq_fini (struct amdgpu_device *adev); +int amdgpu_gfx_kiq_init (struct amdgpu_device *adev, +unsigned hpd_size); +/** * amdgpu_gfx_create_bitmask - create a bitmask *
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +4 -106
140 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +4 -105
133 lines not on this page · raw message
Signature · 6 lines
2.5.5 _______________________________________________ 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): 1496864097-4322-4-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
axie
Reviewed-by Alex XieRe: [PATCH 4/6] drm/amdgpu/gfx: move more common KIQ code to amdgpu_gfx.c
Quoted 421 lines · Alex Deucher
Lots more common stuff.
Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 103 ++++++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 11 ++++ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 110 ++------------------------------ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 109 ++----------------------------- 4 files changed, 122 insertions(+), 211 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +103
-0@@ -145,3 +145,106 @@ void amdgpu_gfx_compute_queue_acquire(struct amdgpu_device *adev)if (WARN_ON (adev->gfx.num_compute_rings >AMDGPU_MAX_COMPUTE_RINGS )) adev->gfx.num_compute_rings =AMDGPU_MAX_COMPUTE_RINGS ; } + +static int amdgpu_gfx_kiq_acquire (struct amdgpu_device *adev, +struct amdgpu_ring *ring) +{ +int queue_bit; +int mec, pipe, queue; + + queue_bit = adev->gfx.mec.num_mec + * adev->gfx.mec.num_pipe_per_mec + * adev->gfx.mec.num_queue_per_pipe; + +while (queue_bit-- >=0 ) { +if (test_bit (queue_bit, adev->gfx.mec.queue_bitmap)) +continue ; + +amdgpu_gfx_bit_to_queue (adev, queue_bit, &mec, &pipe, &queue); + +/* Using pipes 2/3 from MEC 2 seems cause problems */ +if (mec ==1 && pipe >1 ) +continue ; + + ring->me = mec +1 ; + ring->pipe = pipe; + ring->queue = queue; + +return 0 ; + } + +dev_err (adev->dev,"Failed to find a queue for KIQ\n" ); +return -EINVAL ; +} + +int amdgpu_gfx_kiq_init_ring (struct amdgpu_device *adev, +struct amdgpu_ring *ring, +struct amdgpu_irq_src *irq) +{ +struct amdgpu_kiq *kiq = &adev->gfx.kiq; +int r =0 ; + +mutex_init (&kiq->ring_mutex); + + r =amdgpu_wb_get (adev, &adev->virt.reg_val_offs); +if (r) +return r; + + ring->adev =NULL ; + ring->ring_obj =NULL ; + ring->use_doorbell = true; + ring->doorbell_index =AMDGPU_DOORBELL_KIQ ; + + r =amdgpu_gfx_kiq_acquire (adev, ring); +if (r) +return r; + + ring->eop_gpu_addr = kiq->eop_gpu_addr; +sprintf (ring->name,"kiq %d.%d.%d" , ring->me, ring->pipe, ring->queue); + r =amdgpu_ring_init (adev, ring,1024 , + irq,AMDGPU_CP_KIQ_IRQ_DRIVER0 ); +if (r) +dev_warn (adev->dev,"(%d) failed to init kiq ring\n" , r); + +return r; +} + +void amdgpu_gfx_kiq_free_ring (struct amdgpu_ring *ring, +struct amdgpu_irq_src *irq) +{ +amdgpu_wb_free (ring->adev, ring->adev->virt.reg_val_offs); +amdgpu_ring_fini (ring); +} + +void amdgpu_gfx_kiq_fini (struct amdgpu_device *adev) +{ +struct amdgpu_kiq *kiq = &adev->gfx.kiq; + +amdgpu_bo_free_kernel (&kiq->eop_obj, &kiq->eop_gpu_addr,NULL ); +} + +int amdgpu_gfx_kiq_init (struct amdgpu_device *adev, +unsigned hpd_size) +{ +int r; +u32 *hpd; +struct amdgpu_kiq *kiq = &adev->gfx.kiq; + + r =amdgpu_bo_create_kernel (adev, hpd_size,PAGE_SIZE , +AMDGPU_GEM_DOMAIN_GTT , &kiq->eop_obj, + &kiq->eop_gpu_addr, (void **)&hpd); +if (r) { +dev_warn (adev->dev,"failed to create KIQ bo (%d).\n" , r); +return r; + } + +memset (hpd,0 , hpd_size); + + r =amdgpu_bo_reserve (kiq->eop_obj, true); +if (unlikely (r !=0 )) +dev_warn (adev->dev,"(%d) reserve kiq eop bo failed\n" , r); +amdgpu_bo_kunmap (kiq->eop_obj); +amdgpu_bo_unreserve (kiq->eop_obj); + +return 0 ; +}drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h +11
-0@@ -32,6 +32,17 @@ void amdgpu_gfx_parse_disable_cu(unsigned *mask, unsigned max_se,void amdgpu_gfx_compute_queue_acquire (struct amdgpu_device *adev); +int amdgpu_gfx_kiq_init_ring (struct amdgpu_device *adev, +struct amdgpu_ring *ring, +struct amdgpu_irq_src *irq); + +void amdgpu_gfx_kiq_free_ring (struct amdgpu_ring *ring, +struct amdgpu_irq_src *irq); + +void amdgpu_gfx_kiq_fini (struct amdgpu_device *adev); +int amdgpu_gfx_kiq_init (struct amdgpu_device *adev, +unsigned hpd_size); +/** * amdgpu_gfx_create_bitmask - create a bitmask * drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +4
-106@@ -1379,76 +1379,6 @@ static void gfx_v8_0_mec_fini(struct amdgpu_device *adev) } } -static int gfx_v8_0_kiq_acquire (struct amdgpu_device *adev, -struct amdgpu_ring *ring) -{ -int queue_bit; -int mec, pipe, queue; - - queue_bit = adev->gfx.mec.num_mec - * adev->gfx.mec.num_pipe_per_mec - * adev->gfx.mec.num_queue_per_pipe; - -while (queue_bit-- >=0 ) { -if (test_bit (queue_bit, adev->gfx.mec.queue_bitmap)) -continue ; - -amdgpu_gfx_bit_to_queue (adev, queue_bit, &mec, &pipe, &queue); - -/* Using pipes 2/3 from MEC 2 seems cause problems */ -if (mec ==1 && pipe >1 ) -continue ; - - ring->me = mec +1 ; - ring->pipe = pipe; - ring->queue = queue; - -return 0 ; - } - -dev_err (adev->dev,"Failed to find a queue for KIQ\n" ); -return -EINVAL ; -} - -static int gfx_v8_0_kiq_init_ring (struct amdgpu_device *adev, -struct amdgpu_ring *ring, -struct amdgpu_irq_src *irq) -{ -struct amdgpu_kiq *kiq = &adev->gfx.kiq; -int r =0 ; - -mutex_init (&kiq->ring_mutex); - - r =amdgpu_wb_get (adev, &adev->virt.reg_val_offs); -if (r) -return r; - - ring->adev =NULL ; - ring->ring_obj =NULL ; - ring->use_doorbell = true; - ring->doorbell_index =AMDGPU_DOORBELL_KIQ ; - - r =gfx_v8_0_kiq_acquire (adev, ring); -if (r) -return r; - - ring->eop_gpu_addr = kiq->eop_gpu_addr; -sprintf (ring->name,"kiq %d.%d.%d" , ring->me, ring->pipe, ring->queue); - r =amdgpu_ring_init (adev, ring,1024 , - irq,AMDGPU_CP_KIQ_IRQ_DRIVER0 ); -if (r) -dev_warn (adev->dev,"(%d) failed to init kiq ring\n" , r); - -return r; -} - -static void gfx_v8_0_kiq_free_ring (struct amdgpu_ring *ring, -struct amdgpu_irq_src *irq) -{ -amdgpu_wb_free (ring->adev, ring->adev->virt.reg_val_offs); -amdgpu_ring_fini (ring); -} -static int gfx_v8_0_mec_init (struct amdgpu_device *adev) {int r;@@ -1520,38 +1450,6 @@ static int gfx_v8_0_mec_init(struct amdgpu_device *adev)return 0 ; } -static void gfx_v8_0_kiq_fini (struct amdgpu_device *adev) -{ -struct amdgpu_kiq *kiq = &adev->gfx.kiq; - -amdgpu_bo_free_kernel (&kiq->eop_obj, &kiq->eop_gpu_addr,NULL ); -} - -static int gfx_v8_0_kiq_init (struct amdgpu_device *adev) -{ -int r; -u32 *hpd; -struct amdgpu_kiq *kiq = &adev->gfx.kiq; - - r =amdgpu_bo_create_kernel (adev,GFX8_MEC_HPD_SIZE ,PAGE_SIZE , -AMDGPU_GEM_DOMAIN_GTT , &kiq->eop_obj, - &kiq->eop_gpu_addr, (void **)&hpd); -if (r) { -dev_warn (adev->dev,"failed to create KIQ bo (%d).\n" , r); -return r; - } - -memset (hpd,0 ,GFX8_MEC_HPD_SIZE ); - - r =amdgpu_bo_reserve (kiq->eop_obj, true); -if (unlikely (r !=0 )) -dev_warn (adev->dev,"(%d) reserve kiq eop bo failed\n" , r); -amdgpu_bo_kunmap (kiq->eop_obj); -amdgpu_bo_unreserve (kiq->eop_obj); - -return 0 ; -} -static const u32 vgpr_init_compute_shader[] = {0x7e000209 ,0x7e020208 ,@@ -2192,14 +2090,14 @@ static int gfx_v8_0_sw_init(void *handle) } } - r =gfx_v8_0_kiq_init (adev); + r =amdgpu_gfx_kiq_init (adev,GFX8_MEC_HPD_SIZE );if (r) {DRM_ERROR ("Failed to init KIQ BOs!\n" );return r; } kiq = &adev->gfx.kiq; - r =gfx_v8_0_kiq_init_ring (adev, &kiq->ring, &kiq->irq); + r =amdgpu_gfx_kiq_init_ring (adev, &kiq->ring, &kiq->irq);if (r)return r;@@ -2251,8 +2149,8 @@ static int gfx_v8_0_sw_fini(void *handle)amdgpu_ring_fini (&adev->gfx.compute_ring[i]);gfx_v8_0_compute_mqd_sw_fini (adev); -gfx_v8_0_kiq_free_ring (&adev->gfx.kiq.ring, &adev->gfx.kiq.irq); -gfx_v8_0_kiq_fini (adev); +amdgpu_gfx_kiq_free_ring (&adev->gfx.kiq.ring, &adev->gfx.kiq.irq); +amdgpu_gfx_kiq_fini (adev);gfx_v8_0_mec_fini (adev);gfx_v8_0_rlc_fini (adev);drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +2
-103@@ -969,107 +969,6 @@ static int gfx_v9_0_mec_init(struct amdgpu_device *adev)return 0 ; } -static void gfx_v9_0_kiq_fini (struct amdgpu_device *adev) -{ -struct amdgpu_kiq *kiq = &adev->gfx.kiq; - -amdgpu_bo_free_kernel (&kiq->eop_obj, &kiq->eop_gpu_addr,NULL ); -} - -static int gfx_v9_0_kiq_init (struct amdgpu_device *adev) -{ -int r; -u32 *hpd; -struct amdgpu_kiq *kiq = &adev->gfx.kiq; - - r =amdgpu_bo_create_kernel (adev,GFX9_MEC_HPD_SIZE ,PAGE_SIZE , -AMDGPU_GEM_DOMAIN_GTT , &kiq->eop_obj, - &kiq->eop_gpu_addr, (void **)&hpd); -if (r) { -dev_warn (adev->dev,"failed to create KIQ bo (%d).\n" , r); -return r; - } - -memset (hpd,0 ,GFX9_MEC_HPD_SIZE ); - - r =amdgpu_bo_reserve (kiq->eop_obj, true); -if (unlikely (r !=0 )) -dev_warn (adev->dev,"(%d) reserve kiq eop bo failed\n" , r); -amdgpu_bo_kunmap (kiq->eop_obj); -amdgpu_bo_unreserve (kiq->eop_obj); - -return 0 ; -} - -static int gfx_v9_0_kiq_acquire (struct amdgpu_device *adev, -struct amdgpu_ring *ring) -{ -int queue_bit; -int mec, pipe, queue; - - queue_bit = adev->gfx.mec.num_mec - * adev->gfx.mec.num_pipe_per_mec - * adev->gfx.mec.num_queue_per_pipe; - -while (queue_bit-- >=0 ) { -if (test_bit (queue_bit, adev->gfx.mec.queue_bitmap)) -continue ; - -amdgpu_gfx_bit_to_queue (adev, queue_bit, &mec, &pipe, &queue); - -/* Using pipes 2/3 from MEC 2 seems cause problems */ -if (mec ==1 && pipe >1 ) -continue ; - - ring->me = mec +1 ; - ring->pipe = pipe; - ring->queue = queue; - -return 0 ; - } - -dev_err (adev->dev,"Failed to find a queue for KIQ\n" ); -return -EINVAL ; -} - -static int gfx_v9_0_kiq_init_ring (struct amdgpu_device *adev, -struct amdgpu_ring *ring, -struct amdgpu_irq_src *irq) -{ -struct amdgpu_kiq *kiq = &adev->gfx.kiq; -int r =0 ; - -mutex_init (&kiq->ring_mutex); - - r =amdgpu_wb_get (adev, &adev->virt.reg_val_offs); -if (r) -return r; - - ring->adev =NULL ; - ring->ring_obj =NULL ; - ring->use_doorbell = true; - ring->doorbell_index =AMDGPU_DOORBELL_KIQ ; - - r =gfx_v9_0_kiq_acquire (adev, ring); -if (r) -return r; - - ring->eop_gpu_addr = kiq->eop_gpu_addr; -sprintf (ring->name,"kiq %d.%d.%d" , ring->me, ring->pipe, ring->queue); - r =amdgpu_ring_init (adev, ring,1024 , - irq,AMDGPU_CP_KIQ_IRQ_DRIVER0 ); -if (r) -dev_warn (adev->dev,"(%d) failed to init kiq ring\n" , r); - -return r; -} -static void gfx_v9_0_kiq_free_ring (struct amdgpu_ring *ring, -struct amdgpu_irq_src *irq) -{ -amdgpu_wb_free (ring->adev, ring->adev->virt.reg_val_offs); -amdgpu_ring_fini (ring); -} -/* create MQD for each compute queue */ static int gfx_v9_0_compute_mqd_sw_init (struct amdgpu_device *adev) {@@ -1570,14 +1469,14 @@ static int gfx_v9_0_sw_init(void *handle) } } - r =gfx_v9_0_kiq_init (adev); + r =amdgpu_gfx_kiq_init (adev,GFX9_MEC_HPD_SIZE );if (r) {DRM_ERROR ("Failed to init KIQ BOs!\n" );return r; } kiq = &adev->gfx.kiq; - r =gfx_v9_0_kiq_init_ring (adev, &kiq->ring, &kiq->irq); + r =amdgpu_gfx_kiq_init_ring (adev, &kiq->ring, &kiq->irq);if (r)return r;
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c static int gfx_v9_0_sw_fini(void *handle) · line 1538
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +2
-2@@ -1632,8 +1531,8 @@ static int gfx_v9_0_sw_fini(void *handle)amdgpu_ring_fini (&adev->gfx.compute_ring[i]);gfx_v9_0_compute_mqd_sw_fini (adev); -gfx_v9_0_kiq_free_ring (&adev->gfx.kiq.ring, &adev->gfx.kiq.irq); -gfx_v9_0_kiq_fini (adev); +amdgpu_gfx_kiq_free_ring (&adev->gfx.kiq.ring, &adev->gfx.kiq.irq); +amdgpu_gfx_kiq_fini (adev);gfx_v9_0_mec_fini (adev);gfx_v9_0_ngg_fini (adev);
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/6 drm/amdgpu/gfx: move mec parameter setup into sw_init
In reply to a message not in the archiveThis will allow us to share more mec code.
--- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 30 +++++++++++++-------------- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 38 +++++++++++++++++------------------ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 26 ++++++++++++------------ 3 files changed, 47 insertions(+), 47 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +15 -15
@@ -2817,21 +2817,6 @@ static int gfx_v7_0_mec_init(struct amdgpu_device *adev)bitmap_zero (adev->gfx.mec.queue_bitmap,AMDGPU_MAX_COMPUTE_QUEUES ); -switch (adev->asic_type) { -case CHIP_KAVERI : - adev->gfx.mec.num_mec =2 ; -break ; -case CHIP_BONAIRE : -case CHIP_HAWAII : -case CHIP_KABINI : -case CHIP_MULLINS : -default : - adev->gfx.mec.num_mec =1 ; -break ; - } - adev->gfx.mec.num_pipe_per_mec =4 ; - adev->gfx.mec.num_queue_per_pipe =8 ; -/* take ownership of the relevant compute queues */ amdgpu_gfx_compute_queue_acquire (adev);
@@ -4723,6 +4708,21 @@ static int gfx_v7_0_sw_init(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;int i, j, k, r, ring_id; +switch (adev->asic_type) { +case CHIP_KAVERI : + adev->gfx.mec.num_mec =2 ; +break ; +case CHIP_BONAIRE : +case CHIP_HAWAII : +case CHIP_KABINI : +case CHIP_MULLINS : +default : + adev->gfx.mec.num_mec =1 ; +break ; + } + adev->gfx.mec.num_pipe_per_mec =4 ; + adev->gfx.mec.num_queue_per_pipe =8 ; +/* EOP Event */ r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,181 , &adev->gfx.eop_irq);if (r)
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +19 -19
@@ -1387,25 +1387,6 @@ static int gfx_v8_0_mec_init(struct amdgpu_device *adev)bitmap_zero (adev->gfx.mec.queue_bitmap,AMDGPU_MAX_COMPUTE_QUEUES ); -switch (adev->asic_type) { -case CHIP_FIJI : -case CHIP_TONGA : -case CHIP_POLARIS11 : -case CHIP_POLARIS12 : -case CHIP_POLARIS10 : -case CHIP_CARRIZO : - adev->gfx.mec.num_mec =2 ; -break ; -case CHIP_TOPAZ : -case CHIP_STONEY : -default : - adev->gfx.mec.num_mec =1 ; -break ; - } - - adev->gfx.mec.num_pipe_per_mec =4 ; - adev->gfx.mec.num_queue_per_pipe =8 ; -/* take ownership of the relevant compute queues */ amdgpu_gfx_compute_queue_acquire (adev);
@@ -2009,6 +1990,25 @@ static int gfx_v8_0_sw_init(void *handle)struct amdgpu_kiq *kiq;struct amdgpu_device *adev = (struct amdgpu_device *)handle; +switch (adev->asic_type) { +case CHIP_FIJI : +case CHIP_TONGA : +case CHIP_POLARIS11 : +case CHIP_POLARIS12 : +case CHIP_POLARIS10 : +case CHIP_CARRIZO : + adev->gfx.mec.num_mec =2 ; +break ; +case CHIP_TOPAZ : +case CHIP_STONEY : +default : + adev->gfx.mec.num_mec =1 ; +break ; + } + + adev->gfx.mec.num_pipe_per_mec =4 ; + adev->gfx.mec.num_queue_per_pipe =8 ; +/* KIQ event */ r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,178 , &adev->gfx.kiq.irq);if (r)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +13 -13
@@ -870,19 +870,6 @@ static int gfx_v9_0_mec_init(struct amdgpu_device *adev)bitmap_zero (adev->gfx.mec.queue_bitmap,AMDGPU_MAX_COMPUTE_QUEUES ); -switch (adev->asic_type) { -case CHIP_VEGA10 : -case CHIP_RAVEN : - adev->gfx.mec.num_mec =2 ; -break ; -default : - adev->gfx.mec.num_mec =1 ; -break ; - } - - adev->gfx.mec.num_pipe_per_mec =4 ; - adev->gfx.mec.num_queue_per_pipe =8 ; -/* take ownership of the relevant compute queues */ amdgpu_gfx_compute_queue_acquire (adev); mec_hpd_size = adev->gfx.num_compute_rings *GFX9_MEC_HPD_SIZE ;
@@ -1393,6 +1380,19 @@ static int gfx_v9_0_sw_init(void *handle)struct amdgpu_kiq *kiq;struct amdgpu_device *adev = (struct amdgpu_device *)handle; +switch (adev->asic_type) { +case CHIP_VEGA10 : +case CHIP_RAVEN : + adev->gfx.mec.num_mec =2 ; +break ; +default : + adev->gfx.mec.num_mec =1 ; +break ; + } + + adev->gfx.mec.num_pipe_per_mec =4 ; + adev->gfx.mec.num_queue_per_pipe =8 ; +/* KIQ event */ r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_GRBM_CP ,178 , &adev->gfx.kiq.irq);if (r)
Signature · 6 lines
2.5.5 _______________________________________________ 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): 1496864097-4322-5-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
axie
Reviewed-by Alex XieRe: [PATCH 5/6] drm/amdgpu/gfx: move mec parameter setup into sw_init
Quoted 147 lines · Alex Deucher
This will allow us to share more mec code.
Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 30 +++++++++++++-------------- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 38 +++++++++++++++++------------------ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 26 ++++++++++++------------ 3 files changed, 47 insertions(+), 47 deletions(-)drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +15
-15@@ -2817,21 +2817,6 @@ static int gfx_v7_0_mec_init(struct amdgpu_device *adev)bitmap_zero (adev->gfx.mec.queue_bitmap,AMDGPU_MAX_COMPUTE_QUEUES ); -switch (adev->asic_type) { -case CHIP_KAVERI : - adev->gfx.mec.num_mec =2 ; -break ; -case CHIP_BONAIRE : -case CHIP_HAWAII : -case CHIP_KABINI : -case CHIP_MULLINS : -default : - adev->gfx.mec.num_mec =1 ; -break ; - } - adev->gfx.mec.num_pipe_per_mec =4 ; - adev->gfx.mec.num_queue_per_pipe =8 ; -/* take ownership of the relevant compute queues */ amdgpu_gfx_compute_queue_acquire (adev);@@ -4723,6 +4708,21 @@ static int gfx_v7_0_sw_init(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;int i, j, k, r, ring_id; +switch (adev->asic_type) { +case CHIP_KAVERI : + adev->gfx.mec.num_mec =2 ; +break ; +case CHIP_BONAIRE : +case CHIP_HAWAII : +case CHIP_KABINI : +case CHIP_MULLINS : +default : + adev->gfx.mec.num_mec =1 ; +break ; + } + adev->gfx.mec.num_pipe_per_mec =4 ; + adev->gfx.mec.num_queue_per_pipe =8 ; +/* EOP Event */ r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,181 , &adev->gfx.eop_irq);if (r)drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +19
-19@@ -1387,25 +1387,6 @@ static int gfx_v8_0_mec_init(struct amdgpu_device *adev)bitmap_zero (adev->gfx.mec.queue_bitmap,AMDGPU_MAX_COMPUTE_QUEUES ); -switch (adev->asic_type) { -case CHIP_FIJI : -case CHIP_TONGA : -case CHIP_POLARIS11 : -case CHIP_POLARIS12 : -case CHIP_POLARIS10 : -case CHIP_CARRIZO : - adev->gfx.mec.num_mec =2 ; -break ; -case CHIP_TOPAZ : -case CHIP_STONEY : -default : - adev->gfx.mec.num_mec =1 ; -break ; - } - - adev->gfx.mec.num_pipe_per_mec =4 ; - adev->gfx.mec.num_queue_per_pipe =8 ; -/* take ownership of the relevant compute queues */ amdgpu_gfx_compute_queue_acquire (adev);@@ -2009,6 +1990,25 @@ static int gfx_v8_0_sw_init(void *handle)struct amdgpu_kiq *kiq;struct amdgpu_device *adev = (struct amdgpu_device *)handle; +switch (adev->asic_type) { +case CHIP_FIJI : +case CHIP_TONGA : +case CHIP_POLARIS11 : +case CHIP_POLARIS12 : +case CHIP_POLARIS10 : +case CHIP_CARRIZO : + adev->gfx.mec.num_mec =2 ; +break ; +case CHIP_TOPAZ : +case CHIP_STONEY : +default : + adev->gfx.mec.num_mec =1 ; +break ; + } + + adev->gfx.mec.num_pipe_per_mec =4 ; + adev->gfx.mec.num_queue_per_pipe =8 ; +/* KIQ event */ r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,178 , &adev->gfx.kiq.irq);if (r)drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +6
-13@@ -870,19 +870,6 @@ static int gfx_v9_0_mec_init(struct amdgpu_device *adev)bitmap_zero (adev->gfx.mec.queue_bitmap,AMDGPU_MAX_COMPUTE_QUEUES ); -switch (adev->asic_type) { -case CHIP_VEGA10 : -case CHIP_RAVEN : - adev->gfx.mec.num_mec =2 ; -break ; -default : - adev->gfx.mec.num_mec =1 ; -break ; - } - - adev->gfx.mec.num_pipe_per_mec =4 ; - adev->gfx.mec.num_queue_per_pipe =8 ; -/* take ownership of the relevant compute queues */ amdgpu_gfx_compute_queue_acquire (adev); mec_hpd_size = adev->gfx.num_compute_rings *GFX9_MEC_HPD_SIZE ;@@ -1393,6 +1380,19 @@ static int gfx_v9_0_sw_init(void *handle)struct amdgpu_kiq *kiq;struct amdgpu_device *adev = (struct amdgpu_device *)handle; +switch (adev->asic_type) { +case CHIP_VEGA10 : +case CHIP_RAVEN : + adev->gfx.mec.num_mec =2 ; +break ; +default :
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c static int gfx_v9_0_sw_init(void *handle) · line 1398
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +7
-0+ adev->gfx.mec.num_mec =1 ; +break ; + } + + adev->gfx.mec.num_pipe_per_mec =4 ; + adev->gfx.mec.num_queue_per_pipe =8 ; +/* KIQ event */ r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_GRBM_CP ,178 , &adev->gfx.kiq.irq);if (r)
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/6 drm/amdgpu/gfx: consolidate mqd buffer setup code
In reply to a message not in the archiveIt was duplicated across multiple generations.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 66 ++++++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 4 ++ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 71 +-------------------------------- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 65 +----------------------------- 4 files changed, 74 insertions(+), 132 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +66 -0
@@ -248,3 +248,69 @@ int amdgpu_gfx_kiq_init(struct amdgpu_device *adev,return 0 ; } + +/* create MQD for each compute queue */ +int amdgpu_gfx_compute_mqd_sw_init (struct amdgpu_device *adev, +unsigned mqd_size) +{ +struct amdgpu_ring *ring =NULL ; +int r, i; + +/* create MQD for KIQ */ + ring = &adev->gfx.kiq.ring; +if (!ring->mqd_obj) { + r =amdgpu_bo_create_kernel (adev, mqd_size,PAGE_SIZE , +AMDGPU_GEM_DOMAIN_GTT , &ring->mqd_obj, + &ring->mqd_gpu_addr, &ring->mqd_ptr); +if (r) { +dev_warn (adev->dev,"failed to create ring mqd ob (%d)" , r); +return r; + } + +/* prepare MQD backup */ + adev->gfx.mec.mqd_backup[AMDGPU_MAX_COMPUTE_RINGS ] =kmalloc (mqd_size,GFP_KERNEL ); +if (!adev->gfx.mec.mqd_backup[AMDGPU_MAX_COMPUTE_RINGS ]) +dev_warn (adev->dev,"no memory to create MQD backup for ring %s\n" , ring->name); + } + +/* create MQD for each KCQ */ +for (i =0 ; i < adev->gfx.num_compute_rings; i++) { + ring = &adev->gfx.compute_ring[i]; +if (!ring->mqd_obj) { + r =amdgpu_bo_create_kernel (adev, mqd_size,PAGE_SIZE , +AMDGPU_GEM_DOMAIN_GTT , &ring->mqd_obj, + &ring->mqd_gpu_addr, &ring->mqd_ptr); +if (r) { +dev_warn (adev->dev,"failed to create ring mqd ob (%d)" , r); +return r; + } + +/* prepare MQD backup */ + adev->gfx.mec.mqd_backup[i] =kmalloc (mqd_size,GFP_KERNEL ); +if (!adev->gfx.mec.mqd_backup[i]) +dev_warn (adev->dev,"no memory to create MQD backup for ring %s\n" , ring->name); + } + } + +return 0 ; +} + +void amdgpu_gfx_compute_mqd_sw_fini (struct amdgpu_device *adev) +{ +struct amdgpu_ring *ring =NULL ; +int i; + +for (i =0 ; i < adev->gfx.num_compute_rings; i++) { + ring = &adev->gfx.compute_ring[i]; +kfree (adev->gfx.mec.mqd_backup[i]); +amdgpu_bo_free_kernel (&ring->mqd_obj, + &ring->mqd_gpu_addr, + &ring->mqd_ptr); + } + + ring = &adev->gfx.kiq.ring; +kfree (adev->gfx.mec.mqd_backup[AMDGPU_MAX_COMPUTE_RINGS ]); +amdgpu_bo_free_kernel (&ring->mqd_obj, + &ring->mqd_gpu_addr, + &ring->mqd_ptr); +}
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h +4 -0
@@ -43,6 +43,10 @@ void amdgpu_gfx_kiq_fini(struct amdgpu_device *adev);int amdgpu_gfx_kiq_init (struct amdgpu_device *adev,unsigned hpd_size); +int amdgpu_gfx_compute_mqd_sw_init (struct amdgpu_device *adev, +unsigned mqd_size); +void amdgpu_gfx_compute_mqd_sw_fini (struct amdgpu_device *adev); +/** * amdgpu_gfx_create_bitmask - create a bitmask *
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +2 -69
92 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +2 -63
83 lines not on this page · raw message
Signature · 6 lines
2.5.5 _______________________________________________ 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): 1496864097-4322-6-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
axie
Reviewed-by Alex XieRe: [PATCH 6/6] drm/amdgpu/gfx: consolidate mqd buffer setup code
Quoted 281 lines · Alex Deucher
It was duplicated across multiple generations.
Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 66 ++++++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 4 ++ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 71 +-------------------------------- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 65 +----------------------------- 4 files changed, 74 insertions(+), 132 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +66
-0@@ -248,3 +248,69 @@ int amdgpu_gfx_kiq_init(struct amdgpu_device *adev,return 0 ; } + +/* create MQD for each compute queue */ +int amdgpu_gfx_compute_mqd_sw_init (struct amdgpu_device *adev, +unsigned mqd_size) +{ +struct amdgpu_ring *ring =NULL ; +int r, i; + +/* create MQD for KIQ */ + ring = &adev->gfx.kiq.ring; +if (!ring->mqd_obj) { + r =amdgpu_bo_create_kernel (adev, mqd_size,PAGE_SIZE , +AMDGPU_GEM_DOMAIN_GTT , &ring->mqd_obj, + &ring->mqd_gpu_addr, &ring->mqd_ptr); +if (r) { +dev_warn (adev->dev,"failed to create ring mqd ob (%d)" , r); +return r; + } + +/* prepare MQD backup */ + adev->gfx.mec.mqd_backup[AMDGPU_MAX_COMPUTE_RINGS ] =kmalloc (mqd_size,GFP_KERNEL ); +if (!adev->gfx.mec.mqd_backup[AMDGPU_MAX_COMPUTE_RINGS ]) +dev_warn (adev->dev,"no memory to create MQD backup for ring %s\n" , ring->name); + } + +/* create MQD for each KCQ */ +for (i =0 ; i < adev->gfx.num_compute_rings; i++) { + ring = &adev->gfx.compute_ring[i]; +if (!ring->mqd_obj) { + r =amdgpu_bo_create_kernel (adev, mqd_size,PAGE_SIZE , +AMDGPU_GEM_DOMAIN_GTT , &ring->mqd_obj, + &ring->mqd_gpu_addr, &ring->mqd_ptr); +if (r) { +dev_warn (adev->dev,"failed to create ring mqd ob (%d)" , r); +return r; + } + +/* prepare MQD backup */ + adev->gfx.mec.mqd_backup[i] =kmalloc (mqd_size,GFP_KERNEL ); +if (!adev->gfx.mec.mqd_backup[i]) +dev_warn (adev->dev,"no memory to create MQD backup for ring %s\n" , ring->name); + } + } + +return 0 ; +} + +void amdgpu_gfx_compute_mqd_sw_fini (struct amdgpu_device *adev) +{ +struct amdgpu_ring *ring =NULL ; +int i; + +for (i =0 ; i < adev->gfx.num_compute_rings; i++) { + ring = &adev->gfx.compute_ring[i]; +kfree (adev->gfx.mec.mqd_backup[i]); +amdgpu_bo_free_kernel (&ring->mqd_obj, + &ring->mqd_gpu_addr, + &ring->mqd_ptr); + } + + ring = &adev->gfx.kiq.ring; +kfree (adev->gfx.mec.mqd_backup[AMDGPU_MAX_COMPUTE_RINGS ]); +amdgpu_bo_free_kernel (&ring->mqd_obj, + &ring->mqd_gpu_addr, + &ring->mqd_ptr); +}drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h +4
-0@@ -43,6 +43,10 @@ void amdgpu_gfx_kiq_fini(struct amdgpu_device *adev);int amdgpu_gfx_kiq_init (struct amdgpu_device *adev,unsigned hpd_size); +int amdgpu_gfx_compute_mqd_sw_init (struct amdgpu_device *adev, +unsigned mqd_size); +void amdgpu_gfx_compute_mqd_sw_fini (struct amdgpu_device *adev); +/** * amdgpu_gfx_create_bitmask - create a bitmask * drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +2
-69@@ -659,8 +659,6 @@ static u32 gfx_v8_0_get_csb_size(struct amdgpu_device *adev);static void gfx_v8_0_get_cu_info (struct amdgpu_device *adev);static void gfx_v8_0_ring_emit_ce_meta (struct amdgpu_ring *ring);static void gfx_v8_0_ring_emit_de_meta (struct amdgpu_ring *ring); -static int gfx_v8_0_compute_mqd_sw_init (struct amdgpu_device *adev); -static void gfx_v8_0_compute_mqd_sw_fini (struct amdgpu_device *adev);static void gfx_v8_0_init_golden_registers (struct amdgpu_device *adev) {@@ -2102,7 +2100,7 @@ static int gfx_v8_0_sw_init(void *handle)return r;/* create MQD for all compute queues as well as KIQ for SRIOV case */ - r =gfx_v8_0_compute_mqd_sw_init (adev); + r =amdgpu_gfx_compute_mqd_sw_init (adev,sizeof (struct vi_mqd ));if (r)return r;@@ -2148,7 +2146,7 @@ static int gfx_v8_0_sw_fini(void *handle)for (i =0 ; i < adev->gfx.num_compute_rings; i++)amdgpu_ring_fini (&adev->gfx.compute_ring[i]); -gfx_v8_0_compute_mqd_sw_fini (adev); +amdgpu_gfx_compute_mqd_sw_fini (adev);amdgpu_gfx_kiq_free_ring (&adev->gfx.kiq.ring, &adev->gfx.kiq.irq);amdgpu_gfx_kiq_fini (adev);@@ -7146,68 +7144,3 @@ static void gfx_v8_0_ring_emit_de_meta(struct amdgpu_ring *ring)amdgpu_ring_write (ring,upper_32_bits (de_payload_addr));amdgpu_ring_write_multiple (ring, (void *)&de_payload, cnt_de -2 ); } - -/* create MQD for each compute queue */ -static int gfx_v8_0_compute_mqd_sw_init (struct amdgpu_device *adev) -{ -struct amdgpu_ring *ring =NULL ; -int r, i; - -/* create MQD for KIQ */ - ring = &adev->gfx.kiq.ring; -if (!ring->mqd_obj) { - r =amdgpu_bo_create_kernel (adev,sizeof (struct vi_mqd ),PAGE_SIZE , -AMDGPU_GEM_DOMAIN_GTT , &ring->mqd_obj, - &ring->mqd_gpu_addr, &ring->mqd_ptr); -if (r) { -dev_warn (adev->dev,"failed to create ring mqd ob (%d)" , r); -return r; - } - -/* prepare MQD backup */ - adev->gfx.mec.mqd_backup[AMDGPU_MAX_COMPUTE_RINGS ] =kmalloc (sizeof (struct vi_mqd ),GFP_KERNEL ); -if (!adev->gfx.mec.mqd_backup[AMDGPU_MAX_COMPUTE_RINGS ]) -dev_warn (adev->dev,"no memory to create MQD backup for ring %s\n" , ring->name); - } - -/* create MQD for each KCQ */ -for (i =0 ; i < adev->gfx.num_compute_rings; i++) { - ring = &adev->gfx.compute_ring[i]; -if (!ring->mqd_obj) { - r =amdgpu_bo_create_kernel (adev,sizeof (struct vi_mqd ),PAGE_SIZE , -AMDGPU_GEM_DOMAIN_GTT , &ring->mqd_obj, - &ring->mqd_gpu_addr, &ring->mqd_ptr); -if (r) { -dev_warn (adev->dev,"failed to create ring mqd ob (%d)" , r); -return r; - } - -/* prepare MQD backup */ - adev->gfx.mec.mqd_backup[i] =kmalloc (sizeof (struct vi_mqd ),GFP_KERNEL ); -if (!adev->gfx.mec.mqd_backup[i]) -dev_warn (adev->dev,"no memory to create MQD backup for ring %s\n" , ring->name); - } - } - -return 0 ; -} - -static void gfx_v8_0_compute_mqd_sw_fini (struct amdgpu_device *adev) -{ -struct amdgpu_ring *ring =NULL ; -int i; - -for (i =0 ; i < adev->gfx.num_compute_rings; i++) { - ring = &adev->gfx.compute_ring[i]; -kfree (adev->gfx.mec.mqd_backup[i]); -amdgpu_bo_free_kernel (&ring->mqd_obj, - &ring->mqd_gpu_addr, - &ring->mqd_ptr); - } - - ring = &adev->gfx.kiq.ring; -kfree (adev->gfx.mec.mqd_backup[AMDGPU_MAX_COMPUTE_RINGS ]); -amdgpu_bo_free_kernel (&ring->mqd_obj, - &ring->mqd_gpu_addr, - &ring->mqd_ptr); -}drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +1
-62@@ -956,67 +956,6 @@ static int gfx_v9_0_mec_init(struct amdgpu_device *adev)return 0 ; } -/* create MQD for each compute queue */ -static int gfx_v9_0_compute_mqd_sw_init (struct amdgpu_device *adev) -{ -struct amdgpu_ring *ring =NULL ; -int r, i; - -/* create MQD for KIQ */ - ring = &adev->gfx.kiq.ring; -if (!ring->mqd_obj) { - r =amdgpu_bo_create_kernel (adev,sizeof (struct v9_mqd ),PAGE_SIZE , -AMDGPU_GEM_DOMAIN_GTT , &ring->mqd_obj, - &ring->mqd_gpu_addr, (void **)&ring->mqd_ptr); -if (r) { -dev_warn (adev->dev,"failed to create ring mqd ob (%d)" , r); -return r; - } - -/* prepare MQD backup */ - adev->gfx.mec.mqd_backup[AMDGPU_MAX_COMPUTE_RINGS ] =kmalloc (sizeof (struct v9_mqd ),GFP_KERNEL ); -if (!adev->gfx.mec.mqd_backup[AMDGPU_MAX_COMPUTE_RINGS ]) -dev_warn (adev->dev,"no memory to create MQD backup for ring %s\n" , ring->name); - } - -/* create MQD for each KCQ */ -for (i =0 ; i < adev->gfx.num_compute_rings; i++) { - ring = &adev->gfx.compute_ring[i]; -if (!ring->mqd_obj) { - r =amdgpu_bo_create_kernel (adev,sizeof (struct v9_mqd ),PAGE_SIZE , -AMDGPU_GEM_DOMAIN_GTT , &ring->mqd_obj, - &ring->mqd_gpu_addr, (void **)&ring->mqd_ptr); -if (r) { -dev_warn (adev->dev,"failed to create ring mqd ob (%d)" , r); -return r; - } - -/* prepare MQD backup */ - adev->gfx.mec.mqd_backup[i] =kmalloc (sizeof (struct v9_mqd ),GFP_KERNEL ); -if (!adev->gfx.mec.mqd_backup[i]) -dev_warn (adev->dev,"no memory to create MQD backup for ring %s\n" , ring->name); - } - } - -return 0 ; -} - -static void gfx_v9_0_compute_mqd_sw_fini (struct amdgpu_device *adev) -{ -struct amdgpu_ring *ring =NULL ; -int i; - -for (i =0 ; i < adev->gfx.num_compute_rings; i++) { - ring = &adev->gfx.compute_ring[i]; -kfree (adev->gfx.mec.mqd_backup[i]); -amdgpu_bo_free_kernel (&ring->mqd_obj, &ring->mqd_gpu_addr, (void **)&ring->mqd_ptr); - } - - ring = &adev->gfx.kiq.ring; -kfree (adev->gfx.mec.mqd_backup[AMDGPU_MAX_COMPUTE_RINGS ]); -amdgpu_bo_free_kernel (&ring->mqd_obj, &ring->mqd_gpu_addr, (void **)&ring->mqd_ptr); -} -static uint32_t wave_read_ind (struct amdgpu_device *adev,uint32_t simd,uint32_t wave,uint32_t address) { WREG32_SOC15(GC, 0, mmSQ_IND_INDEX,@@ -1481,7 +1420,7 @@ static int gfx_v9_0_sw_init(void *handle)return r;/* create MQD for all compute queues as wel as KIQ for SRIOV case */ - r =gfx_v9_0_compute_mqd_sw_init (adev); + r =amdgpu_gfx_compute_mqd_sw_init (adev,sizeof (struct v9_mqd ));if (r)return r;
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c static int gfx_v9_0_sw_fini(void *handle) · line 1475
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +1
-1@@ -1530,7 +1469,7 @@ static int gfx_v9_0_sw_fini(void *handle)for (i =0 ; i < adev->gfx.num_compute_rings; i++)amdgpu_ring_fini (&adev->gfx.compute_ring[i]); -gfx_v9_0_compute_mqd_sw_fini (adev); +amdgpu_gfx_compute_mqd_sw_fini (adev);amdgpu_gfx_kiq_free_ring (&adev->gfx.kiq.ring, &adev->gfx.kiq.irq);amdgpu_gfx_kiq_fini (adev);
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
axie
Reviewed-by Alex XieQuoted 12 lines · Alex Deucher
Make it consistent.
Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +0
-0
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c static int gfx_v8_0_ring_test_ib(struct amdgpu_ring *ring, long timeout) · line 866
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +2
-1@@ -859,7 +859,8 @@ static int gfx_v8_0_ring_test_ib(struct amdgpu_ring *ring, long timeout) } -static void gfx_v8_0_free_microcode (struct amdgpu_device *adev) { +static void gfx_v8_0_free_microcode (struct amdgpu_device *adev) +{release_firmware (adev->gfx.pfp_fw); adev->gfx.pfp_fw =NULL ;release_firmware (adev->gfx.me_fw);
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Am 07.06.2017 um 21:34 schrieb Alex Deucher:
Quoted 3 lines
Make it consistent.
Signed-off-by Alex Deucher <[email protected]>
Regards,
Christian.
Quoted 9 lines
--- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +0
-0
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c static int gfx_v8_0_ring_test_ib(struct amdgpu_ring *ring, long timeout) · line 866
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +2
-1@@ -859,7 +859,8 @@ static int gfx_v8_0_ring_test_ib(struct amdgpu_ring *ring, long timeout) } -static void gfx_v8_0_free_microcode (struct amdgpu_device *adev) { +static void gfx_v8_0_free_microcode (struct amdgpu_device *adev) +{release_firmware (adev->gfx.pfp_fw); adev->gfx.pfp_fw =NULL ;release_firmware (adev->gfx.me_fw);
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx