> -----Original Message----- > From: amd-gfx [mailto:[email protected]] On Behalf > Of Christian König > Sent: Thursday, July 27, 2017 11:44 AM > To: [email protected] > Subject: [PATCH 7/8] drm/amdgpu: use amdgpu_bo_create_kernel more > often > > From: Christian König <[email protected]> > > Saves us quite a bunch of loc. > > Signed-off-by: Christian König <[email protected]>
Nice cleanup! Reviewed-by: Alex Deucher <[email protected]> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 34 +----- > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 19 +--- > drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 70 +++--------- > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 166 +++++---------------------- > -- > drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 100 ++++------------- > drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 110 ++++++------------- > 6 files changed, 103 insertions(+), 396 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > index 9c0f4cc..60f60e9 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > @@ -337,35 +337,11 @@ static void amdgpu_block_invalid_wreg(struct > amdgpu_device *adev, > > static int amdgpu_vram_scratch_init(struct amdgpu_device *adev) > { > - int r; > - > - if (adev->vram_scratch.robj == NULL) { > - r = amdgpu_bo_create(adev, AMDGPU_GPU_PAGE_SIZE, > - PAGE_SIZE, true, > AMDGPU_GEM_DOMAIN_VRAM, > - > AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED | > - > AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS, > - NULL, NULL, &adev->vram_scratch.robj); > - if (r) { > - return r; > - } > - } > - > - r = amdgpu_bo_reserve(adev->vram_scratch.robj, false); > - if (unlikely(r != 0)) > - return r; > - r = amdgpu_bo_pin(adev->vram_scratch.robj, > - AMDGPU_GEM_DOMAIN_VRAM, &adev- > >vram_scratch.gpu_addr); > - if (r) { > - amdgpu_bo_unreserve(adev->vram_scratch.robj); > - return r; > - } > - r = amdgpu_bo_kmap(adev->vram_scratch.robj, > - (void **)&adev->vram_scratch.ptr); > - if (r) > - amdgpu_bo_unpin(adev->vram_scratch.robj); > - amdgpu_bo_unreserve(adev->vram_scratch.robj); > - > - return r; > + return amdgpu_bo_create_kernel(adev, > AMDGPU_GPU_PAGE_SIZE, > + PAGE_SIZE, > AMDGPU_GEM_DOMAIN_VRAM, > + &adev->vram_scratch.robj, > + &adev->vram_scratch.gpu_addr, > + (void **)&adev->vram_scratch.ptr); > } > > static void amdgpu_vram_scratch_fini(struct amdgpu_device *adev) > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > index 4d2a454..d60819b 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > @@ -1232,23 +1232,12 @@ int amdgpu_ttm_init(struct amdgpu_device > *adev) > /* Change the size here instead of the init above so only lpfn is > affected */ > amdgpu_ttm_set_active_vram_size(adev, adev- > >mc.visible_vram_size); > > - r = amdgpu_bo_create(adev, adev->mc.stolen_size, PAGE_SIZE, > true, > - AMDGPU_GEM_DOMAIN_VRAM, > - AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED > | > - AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS, > - NULL, NULL, &adev->stollen_vga_memory); > - if (r) { > - return r; > - } > - r = amdgpu_bo_reserve(adev->stollen_vga_memory, false); > + r = amdgpu_bo_create_kernel(adev, adev->mc.stolen_size, > PAGE_SIZE, > + AMDGPU_GEM_DOMAIN_VRAM, > + &adev->stollen_vga_memory, > + NULL, NULL); > if (r) > return r; > - r = amdgpu_bo_pin(adev->stollen_vga_memory, > AMDGPU_GEM_DOMAIN_VRAM, NULL); > - amdgpu_bo_unreserve(adev->stollen_vga_memory); > - if (r) { > - amdgpu_bo_unref(&adev->stollen_vga_memory); > - return r; > - } > DRM_INFO("amdgpu: %uM of VRAM memory ready\n", > (unsigned) (adev->mc.real_vram_size / (1024 * 1024))); > > diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c > b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c > index 4ac85f4..faf8d28 100644 > --- a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c > @@ -2273,43 +2273,23 @@ static int gfx_v6_0_rlc_init(struct amdgpu_device > *adev) > > if (src_ptr) { > /* save restore block */ > - if (adev->gfx.rlc.save_restore_obj == NULL) { > - r = amdgpu_bo_create(adev, dws * 4, PAGE_SIZE, > true, > - AMDGPU_GEM_DOMAIN_VRAM, > - > AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED, > - NULL, NULL, > - &adev->gfx.rlc.save_restore_obj); > - > - if (r) { > - dev_warn(adev->dev, "(%d) create RLC sr bo > failed\n", r); > - return r; > - } > - } > - > - r = amdgpu_bo_reserve(adev->gfx.rlc.save_restore_obj, > false); > - if (unlikely(r != 0)) { > - gfx_v6_0_rlc_fini(adev); > - return r; > - } > - r = amdgpu_bo_pin(adev->gfx.rlc.save_restore_obj, > AMDGPU_GEM_DOMAIN_VRAM, > - &adev->gfx.rlc.save_restore_gpu_addr); > + r = amdgpu_bo_create_reserved(adev, dws * 4, PAGE_SIZE, > + AMDGPU_GEM_DOMAIN_VRAM, > + &adev->gfx.rlc.save_restore_obj, > + &adev- > >gfx.rlc.save_restore_gpu_addr, > + (void **)&adev->gfx.rlc.sr_ptr); > if (r) { > - amdgpu_bo_unreserve(adev- > >gfx.rlc.save_restore_obj); > - dev_warn(adev->dev, "(%d) pin RLC sr bo failed\n", > r); > + dev_warn(adev->dev, "(%d) create RLC sr bo > failed\n", > + r); > gfx_v6_0_rlc_fini(adev); > return r; > } > > - r = amdgpu_bo_kmap(adev->gfx.rlc.save_restore_obj, (void > **)&adev->gfx.rlc.sr_ptr); > - if (r) { > - dev_warn(adev->dev, "(%d) map RLC sr bo failed\n", > r); > - gfx_v6_0_rlc_fini(adev); > - return r; > - } > /* write the sr buffer */ > dst_ptr = adev->gfx.rlc.sr_ptr; > for (i = 0; i < adev->gfx.rlc.reg_list_size; i++) > dst_ptr[i] = cpu_to_le32(src_ptr[i]); > + > amdgpu_bo_kunmap(adev->gfx.rlc.save_restore_obj); > amdgpu_bo_unreserve(adev->gfx.rlc.save_restore_obj); > } > @@ -2319,39 +2299,17 @@ static int gfx_v6_0_rlc_init(struct amdgpu_device > *adev) > adev->gfx.rlc.clear_state_size = > gfx_v6_0_get_csb_size(adev); > dws = adev->gfx.rlc.clear_state_size + (256 / 4); > > - if (adev->gfx.rlc.clear_state_obj == NULL) { > - r = amdgpu_bo_create(adev, dws * 4, PAGE_SIZE, > true, > - AMDGPU_GEM_DOMAIN_VRAM, > - > AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED, > - NULL, NULL, > - &adev->gfx.rlc.clear_state_obj); > - > - if (r) { > - dev_warn(adev->dev, "(%d) create RLC c bo > failed\n", r); > - gfx_v6_0_rlc_fini(adev); > - return r; > - } > - } > - r = amdgpu_bo_reserve(adev->gfx.rlc.clear_state_obj, > false); > - if (unlikely(r != 0)) { > - gfx_v6_0_rlc_fini(adev); > - return r; > - } > - r = amdgpu_bo_pin(adev->gfx.rlc.clear_state_obj, > AMDGPU_GEM_DOMAIN_VRAM, > - &adev->gfx.rlc.clear_state_gpu_addr); > + r = amdgpu_bo_create_reserved(adev, dws * 4, PAGE_SIZE, > + AMDGPU_GEM_DOMAIN_VRAM, > + &adev->gfx.rlc.clear_state_obj, > + &adev- > >gfx.rlc.clear_state_gpu_addr, > + (void **)&adev->gfx.rlc.cs_ptr); > if (r) { > - amdgpu_bo_unreserve(adev- > >gfx.rlc.clear_state_obj); > - dev_warn(adev->dev, "(%d) pin RLC c bo failed\n", > r); > + dev_warn(adev->dev, "(%d) create RLC c bo > failed\n", r); > gfx_v6_0_rlc_fini(adev); > return r; > } > > - r = amdgpu_bo_kmap(adev->gfx.rlc.clear_state_obj, (void > **)&adev->gfx.rlc.cs_ptr); > - if (r) { > - dev_warn(adev->dev, "(%d) map RLC c bo failed\n", > r); > - gfx_v6_0_rlc_fini(adev); > - return r; > - } > /* set up the cs buffer */ > dst_ptr = adev->gfx.rlc.cs_ptr; > reg_list_mc_addr = adev->gfx.rlc.clear_state_gpu_addr + > 256; > diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c > b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c > index 42b932c..6e6e952 100644 > --- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c > @@ -2823,33 +2823,14 @@ static int gfx_v7_0_mec_init(struct > amdgpu_device *adev) > /* allocate space for ALL pipes (even the ones we don't own) */ > mec_hpd_size = adev->gfx.mec.num_mec * adev- > >gfx.mec.num_pipe_per_mec > * GFX7_MEC_HPD_SIZE * 2; > - if (adev->gfx.mec.hpd_eop_obj == NULL) { > - r = amdgpu_bo_create(adev, > - mec_hpd_size, > - PAGE_SIZE, true, > - AMDGPU_GEM_DOMAIN_GTT, 0, NULL, > NULL, > - &adev->gfx.mec.hpd_eop_obj); > - if (r) { > - dev_warn(adev->dev, "(%d) create HDP EOP bo > failed\n", r); > - return r; > - } > - } > > - r = amdgpu_bo_reserve(adev->gfx.mec.hpd_eop_obj, false); > - if (unlikely(r != 0)) { > - gfx_v7_0_mec_fini(adev); > - return r; > - } > - r = amdgpu_bo_pin(adev->gfx.mec.hpd_eop_obj, > AMDGPU_GEM_DOMAIN_GTT, > - &adev->gfx.mec.hpd_eop_gpu_addr); > + r = amdgpu_bo_create_reserved(adev, mec_hpd_size, PAGE_SIZE, > + AMDGPU_GEM_DOMAIN_GTT, > + &adev->gfx.mec.hpd_eop_obj, > + &adev->gfx.mec.hpd_eop_gpu_addr, > + (void **)&hpd); > if (r) { > - dev_warn(adev->dev, "(%d) pin HDP EOP bo failed\n", r); > - gfx_v7_0_mec_fini(adev); > - return r; > - } > - r = amdgpu_bo_kmap(adev->gfx.mec.hpd_eop_obj, (void > **)&hpd); > - if (r) { > - dev_warn(adev->dev, "(%d) map HDP EOP bo failed\n", r); > + dev_warn(adev->dev, "(%d) create, pin or map of HDP EOP > bo failed\n", r); > gfx_v7_0_mec_fini(adev); > return r; > } > @@ -3108,32 +3089,12 @@ static int gfx_v7_0_compute_queue_init(struct > amdgpu_device *adev, int ring_id) > struct cik_mqd *mqd; > struct amdgpu_ring *ring = &adev->gfx.compute_ring[ring_id]; > > - if (ring->mqd_obj == NULL) { > - r = amdgpu_bo_create(adev, > - sizeof(struct cik_mqd), > - PAGE_SIZE, true, > - AMDGPU_GEM_DOMAIN_GTT, 0, NULL, > NULL, > - &ring->mqd_obj); > - if (r) { > - dev_warn(adev->dev, "(%d) create MQD bo > failed\n", r); > - return r; > - } > - } > - > - r = amdgpu_bo_reserve(ring->mqd_obj, false); > - if (unlikely(r != 0)) > - goto out; > - > - r = amdgpu_bo_pin(ring->mqd_obj, AMDGPU_GEM_DOMAIN_GTT, > - &mqd_gpu_addr); > - if (r) { > - dev_warn(adev->dev, "(%d) pin MQD bo failed\n", r); > - goto out_unreserve; > - } > - r = amdgpu_bo_kmap(ring->mqd_obj, (void **)&mqd); > + r = amdgpu_bo_create_reserved(adev, sizeof(struct cik_mqd), > PAGE_SIZE, > + AMDGPU_GEM_DOMAIN_GTT, &ring- > >mqd_obj, > + &mqd_gpu_addr, (void **)&mqd); > if (r) { > - dev_warn(adev->dev, "(%d) map MQD bo failed\n", r); > - goto out_unreserve; > + dev_warn(adev->dev, "(%d) create MQD bo failed\n", r); > + return r; > } > > mutex_lock(&adev->srbm_mutex); > @@ -3147,9 +3108,7 @@ static int gfx_v7_0_compute_queue_init(struct > amdgpu_device *adev, int ring_id) > mutex_unlock(&adev->srbm_mutex); > > amdgpu_bo_kunmap(ring->mqd_obj); > -out_unreserve: > amdgpu_bo_unreserve(ring->mqd_obj); > -out: > return 0; > } > > @@ -3432,39 +3391,17 @@ static int gfx_v7_0_rlc_init(struct amdgpu_device > *adev) > > if (src_ptr) { > /* save restore block */ > - if (adev->gfx.rlc.save_restore_obj == NULL) { > - r = amdgpu_bo_create(adev, dws * 4, PAGE_SIZE, > true, > - AMDGPU_GEM_DOMAIN_VRAM, > - > AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED | > - > AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS, > - NULL, NULL, > - &adev->gfx.rlc.save_restore_obj); > - if (r) { > - dev_warn(adev->dev, "(%d) create RLC sr bo > failed\n", r); > - return r; > - } > - } > - > - r = amdgpu_bo_reserve(adev->gfx.rlc.save_restore_obj, > false); > - if (unlikely(r != 0)) { > - gfx_v7_0_rlc_fini(adev); > - return r; > - } > - r = amdgpu_bo_pin(adev->gfx.rlc.save_restore_obj, > AMDGPU_GEM_DOMAIN_VRAM, > - &adev->gfx.rlc.save_restore_gpu_addr); > + r = amdgpu_bo_create_reserved(adev, dws * 4, PAGE_SIZE, > + AMDGPU_GEM_DOMAIN_VRAM, > + &adev->gfx.rlc.save_restore_obj, > + &adev- > >gfx.rlc.save_restore_gpu_addr, > + (void **)&adev->gfx.rlc.sr_ptr); > if (r) { > - amdgpu_bo_unreserve(adev- > >gfx.rlc.save_restore_obj); > - dev_warn(adev->dev, "(%d) pin RLC sr bo failed\n", > r); > + dev_warn(adev->dev, "(%d) create, pin or map of > RLC sr bo failed\n", r); > gfx_v7_0_rlc_fini(adev); > return r; > } > > - r = amdgpu_bo_kmap(adev->gfx.rlc.save_restore_obj, (void > **)&adev->gfx.rlc.sr_ptr); > - if (r) { > - dev_warn(adev->dev, "(%d) map RLC sr bo failed\n", > r); > - gfx_v7_0_rlc_fini(adev); > - return r; > - } > /* write the sr buffer */ > dst_ptr = adev->gfx.rlc.sr_ptr; > for (i = 0; i < adev->gfx.rlc.reg_list_size; i++) > @@ -3477,39 +3414,17 @@ static int gfx_v7_0_rlc_init(struct amdgpu_device > *adev) > /* clear state block */ > adev->gfx.rlc.clear_state_size = dws = > gfx_v7_0_get_csb_size(adev); > > - if (adev->gfx.rlc.clear_state_obj == NULL) { > - r = amdgpu_bo_create(adev, dws * 4, PAGE_SIZE, > true, > - AMDGPU_GEM_DOMAIN_VRAM, > - > AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED | > - > AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS, > - NULL, NULL, > - &adev->gfx.rlc.clear_state_obj); > - if (r) { > - dev_warn(adev->dev, "(%d) create RLC c bo > failed\n", r); > - gfx_v7_0_rlc_fini(adev); > - return r; > - } > - } > - r = amdgpu_bo_reserve(adev->gfx.rlc.clear_state_obj, > false); > - if (unlikely(r != 0)) { > - gfx_v7_0_rlc_fini(adev); > - return r; > - } > - r = amdgpu_bo_pin(adev->gfx.rlc.clear_state_obj, > AMDGPU_GEM_DOMAIN_VRAM, > - &adev->gfx.rlc.clear_state_gpu_addr); > + r = amdgpu_bo_create_reserved(adev, dws * 4, PAGE_SIZE, > + AMDGPU_GEM_DOMAIN_VRAM, > + &adev->gfx.rlc.clear_state_obj, > + &adev- > >gfx.rlc.clear_state_gpu_addr, > + (void **)&adev->gfx.rlc.cs_ptr); > if (r) { > - amdgpu_bo_unreserve(adev- > >gfx.rlc.clear_state_obj); > - dev_warn(adev->dev, "(%d) pin RLC c bo failed\n", > r); > + dev_warn(adev->dev, "(%d) create RLC c bo > failed\n", r); > gfx_v7_0_rlc_fini(adev); > return r; > } > > - r = amdgpu_bo_kmap(adev->gfx.rlc.clear_state_obj, (void > **)&adev->gfx.rlc.cs_ptr); > - if (r) { > - dev_warn(adev->dev, "(%d) map RLC c bo failed\n", > r); > - gfx_v7_0_rlc_fini(adev); > - return r; > - } > /* set up the cs buffer */ > dst_ptr = adev->gfx.rlc.cs_ptr; > gfx_v7_0_get_csb_buffer(adev, dst_ptr); > @@ -3518,37 +3433,14 @@ static int gfx_v7_0_rlc_init(struct amdgpu_device > *adev) > } > > if (adev->gfx.rlc.cp_table_size) { > - if (adev->gfx.rlc.cp_table_obj == NULL) { > - r = amdgpu_bo_create(adev, adev- > >gfx.rlc.cp_table_size, PAGE_SIZE, true, > - AMDGPU_GEM_DOMAIN_VRAM, > - > AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED | > - > AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS, > - NULL, NULL, > - &adev->gfx.rlc.cp_table_obj); > - if (r) { > - dev_warn(adev->dev, "(%d) create RLC cp > table bo failed\n", r); > - gfx_v7_0_rlc_fini(adev); > - return r; > - } > - } > > - r = amdgpu_bo_reserve(adev->gfx.rlc.cp_table_obj, false); > - if (unlikely(r != 0)) { > - dev_warn(adev->dev, "(%d) reserve RLC cp table bo > failed\n", r); > - gfx_v7_0_rlc_fini(adev); > - return r; > - } > - r = amdgpu_bo_pin(adev->gfx.rlc.cp_table_obj, > AMDGPU_GEM_DOMAIN_VRAM, > - &adev->gfx.rlc.cp_table_gpu_addr); > - if (r) { > - amdgpu_bo_unreserve(adev->gfx.rlc.cp_table_obj); > - dev_warn(adev->dev, "(%d) pin RLC cp_table bo > failed\n", r); > - gfx_v7_0_rlc_fini(adev); > - return r; > - } > - r = amdgpu_bo_kmap(adev->gfx.rlc.cp_table_obj, (void > **)&adev->gfx.rlc.cp_table_ptr); > + r = amdgpu_bo_create_reserved(adev, adev- > >gfx.rlc.cp_table_size, > + PAGE_SIZE, > AMDGPU_GEM_DOMAIN_VRAM, > + &adev->gfx.rlc.cp_table_obj, > + &adev- > >gfx.rlc.cp_table_gpu_addr, > + (void **)&adev- > >gfx.rlc.cp_table_ptr); > if (r) { > - dev_warn(adev->dev, "(%d) map RLC cp table bo > failed\n", r); > + dev_warn(adev->dev, "(%d) create RLC cp table bo > failed\n", r); > gfx_v7_0_rlc_fini(adev); > return r; > } > diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c > b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c > index b58d98d..b086f4e 100644 > --- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c > @@ -1278,39 +1278,17 @@ static int gfx_v8_0_rlc_init(struct amdgpu_device > *adev) > /* clear state block */ > adev->gfx.rlc.clear_state_size = dws = > gfx_v8_0_get_csb_size(adev); > > - if (adev->gfx.rlc.clear_state_obj == NULL) { > - r = amdgpu_bo_create(adev, dws * 4, PAGE_SIZE, > true, > - AMDGPU_GEM_DOMAIN_VRAM, > - > AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED | > - > AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS, > - NULL, NULL, > - &adev->gfx.rlc.clear_state_obj); > - if (r) { > - dev_warn(adev->dev, "(%d) create RLC c bo > failed\n", r); > - gfx_v8_0_rlc_fini(adev); > - return r; > - } > - } > - r = amdgpu_bo_reserve(adev->gfx.rlc.clear_state_obj, > false); > - if (unlikely(r != 0)) { > - gfx_v8_0_rlc_fini(adev); > - return r; > - } > - r = amdgpu_bo_pin(adev->gfx.rlc.clear_state_obj, > AMDGPU_GEM_DOMAIN_VRAM, > - &adev->gfx.rlc.clear_state_gpu_addr); > + r = amdgpu_bo_create_reserved(adev, dws * 4, PAGE_SIZE, > + AMDGPU_GEM_DOMAIN_VRAM, > + &adev->gfx.rlc.clear_state_obj, > + &adev- > >gfx.rlc.clear_state_gpu_addr, > + (void **)&adev->gfx.rlc.cs_ptr); > if (r) { > - amdgpu_bo_unreserve(adev- > >gfx.rlc.clear_state_obj); > - dev_warn(adev->dev, "(%d) pin RLC cbs bo failed\n", > r); > + dev_warn(adev->dev, "(%d) create RLC c bo > failed\n", r); > gfx_v8_0_rlc_fini(adev); > return r; > } > > - r = amdgpu_bo_kmap(adev->gfx.rlc.clear_state_obj, (void > **)&adev->gfx.rlc.cs_ptr); > - if (r) { > - dev_warn(adev->dev, "(%d) map RLC cbs bo > failed\n", r); > - gfx_v8_0_rlc_fini(adev); > - return r; > - } > /* set up the cs buffer */ > dst_ptr = adev->gfx.rlc.cs_ptr; > gfx_v8_0_get_csb_buffer(adev, dst_ptr); > @@ -1321,34 +1299,13 @@ static int gfx_v8_0_rlc_init(struct amdgpu_device > *adev) > if ((adev->asic_type == CHIP_CARRIZO) || > (adev->asic_type == CHIP_STONEY)) { > adev->gfx.rlc.cp_table_size = ALIGN(96 * 5 * 4, 2048) + (64 * > 1024); /* JT + GDS */ > - if (adev->gfx.rlc.cp_table_obj == NULL) { > - r = amdgpu_bo_create(adev, adev- > >gfx.rlc.cp_table_size, PAGE_SIZE, true, > - AMDGPU_GEM_DOMAIN_VRAM, > - > AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED | > - > AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS, > - NULL, NULL, > - &adev->gfx.rlc.cp_table_obj); > - if (r) { > - dev_warn(adev->dev, "(%d) create RLC cp > table bo failed\n", r); > - return r; > - } > - } > - > - r = amdgpu_bo_reserve(adev->gfx.rlc.cp_table_obj, false); > - if (unlikely(r != 0)) { > - dev_warn(adev->dev, "(%d) reserve RLC cp table bo > failed\n", r); > - return r; > - } > - r = amdgpu_bo_pin(adev->gfx.rlc.cp_table_obj, > AMDGPU_GEM_DOMAIN_VRAM, > - &adev->gfx.rlc.cp_table_gpu_addr); > - if (r) { > - amdgpu_bo_unreserve(adev->gfx.rlc.cp_table_obj); > - dev_warn(adev->dev, "(%d) pin RLC cp table bo > failed\n", r); > - return r; > - } > - r = amdgpu_bo_kmap(adev->gfx.rlc.cp_table_obj, (void > **)&adev->gfx.rlc.cp_table_ptr); > + r = amdgpu_bo_create_reserved(adev, adev- > >gfx.rlc.cp_table_size, > + PAGE_SIZE, > AMDGPU_GEM_DOMAIN_VRAM, > + &adev->gfx.rlc.cp_table_obj, > + &adev- > >gfx.rlc.cp_table_gpu_addr, > + (void **)&adev- > >gfx.rlc.cp_table_ptr); > if (r) { > - dev_warn(adev->dev, "(%d) map RLC cp table bo > failed\n", r); > + dev_warn(adev->dev, "(%d) create RLC cp table bo > failed\n", r); > return r; > } > > @@ -1389,34 +1346,13 @@ static int gfx_v8_0_mec_init(struct > amdgpu_device *adev) > > mec_hpd_size = adev->gfx.num_compute_rings * > GFX8_MEC_HPD_SIZE; > > - if (adev->gfx.mec.hpd_eop_obj == NULL) { > - r = amdgpu_bo_create(adev, > - mec_hpd_size, > - PAGE_SIZE, true, > - AMDGPU_GEM_DOMAIN_GTT, 0, NULL, > NULL, > - &adev->gfx.mec.hpd_eop_obj); > - if (r) { > - dev_warn(adev->dev, "(%d) create HDP EOP bo > failed\n", r); > - return r; > - } > - } > - > - r = amdgpu_bo_reserve(adev->gfx.mec.hpd_eop_obj, false); > - if (unlikely(r != 0)) { > - gfx_v8_0_mec_fini(adev); > - return r; > - } > - r = amdgpu_bo_pin(adev->gfx.mec.hpd_eop_obj, > AMDGPU_GEM_DOMAIN_GTT, > - &adev->gfx.mec.hpd_eop_gpu_addr); > - if (r) { > - dev_warn(adev->dev, "(%d) pin HDP EOP bo failed\n", r); > - gfx_v8_0_mec_fini(adev); > - return r; > - } > - r = amdgpu_bo_kmap(adev->gfx.mec.hpd_eop_obj, (void > **)&hpd); > + r = amdgpu_bo_create_reserved(adev, mec_hpd_size, PAGE_SIZE, > + AMDGPU_GEM_DOMAIN_GTT, > + &adev->gfx.mec.hpd_eop_obj, > + &adev->gfx.mec.hpd_eop_gpu_addr, > + (void **)&hpd); > if (r) { > - dev_warn(adev->dev, "(%d) map HDP EOP bo failed\n", r); > - gfx_v8_0_mec_fini(adev); > + dev_warn(adev->dev, "(%d) create HDP EOP bo failed\n", r); > return r; > } > > diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c > b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c > index 4d7f042..024eccc 100644 > --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c > @@ -772,18 +772,16 @@ static int gfx_v9_0_rlc_init(struct amdgpu_device > *adev) > if (cs_data) { > /* clear state block */ > adev->gfx.rlc.clear_state_size = dws = > gfx_v9_0_get_csb_size(adev); > - if (adev->gfx.rlc.clear_state_obj == NULL) { > - r = amdgpu_bo_create_kernel(adev, dws * 4, > PAGE_SIZE, > - > AMDGPU_GEM_DOMAIN_VRAM, > - &adev- > >gfx.rlc.clear_state_obj, > - &adev- > >gfx.rlc.clear_state_gpu_addr, > - (void **)&adev- > >gfx.rlc.cs_ptr); > - if (r) { > - dev_err(adev->dev, > - "(%d) failed to create rlc csb bo\n", > r); > - gfx_v9_0_rlc_fini(adev); > - return r; > - } > + r = amdgpu_bo_create_reserved(adev, dws * 4, PAGE_SIZE, > + AMDGPU_GEM_DOMAIN_VRAM, > + &adev->gfx.rlc.clear_state_obj, > + &adev- > >gfx.rlc.clear_state_gpu_addr, > + (void **)&adev->gfx.rlc.cs_ptr); > + if (r) { > + dev_err(adev->dev, "(%d) failed to create rlc csb > bo\n", > + r); > + gfx_v9_0_rlc_fini(adev); > + return r; > } > /* set up the cs buffer */ > dst_ptr = adev->gfx.rlc.cs_ptr; > @@ -795,18 +793,16 @@ static int gfx_v9_0_rlc_init(struct amdgpu_device > *adev) > if (adev->asic_type == CHIP_RAVEN) { > /* TODO: double check the cp_table_size for RV */ > adev->gfx.rlc.cp_table_size = ALIGN(96 * 5 * 4, 2048) + (64 * > 1024); /* JT + GDS */ > - if (adev->gfx.rlc.cp_table_obj == NULL) { > - r = amdgpu_bo_create_kernel(adev, adev- > >gfx.rlc.cp_table_size, > - PAGE_SIZE, > AMDGPU_GEM_DOMAIN_VRAM, > - &adev->gfx.rlc.cp_table_obj, > - &adev- > >gfx.rlc.cp_table_gpu_addr, > - (void **)&adev- > >gfx.rlc.cp_table_ptr); > - if (r) { > - dev_err(adev->dev, > - "(%d) failed to create cp table bo\n", > r); > - gfx_v9_0_rlc_fini(adev); > - return r; > - } > + r = amdgpu_bo_create_reserved(adev, adev- > >gfx.rlc.cp_table_size, > + PAGE_SIZE, > AMDGPU_GEM_DOMAIN_VRAM, > + &adev->gfx.rlc.cp_table_obj, > + &adev- > >gfx.rlc.cp_table_gpu_addr, > + (void **)&adev- > >gfx.rlc.cp_table_ptr); > + if (r) { > + dev_err(adev->dev, > + "(%d) failed to create cp table bo\n", r); > + gfx_v9_0_rlc_fini(adev); > + return r; > } > > rv_init_cp_jump_table(adev); > @@ -862,33 +858,13 @@ static int gfx_v9_0_mec_init(struct amdgpu_device > *adev) > amdgpu_gfx_compute_queue_acquire(adev); > mec_hpd_size = adev->gfx.num_compute_rings * > GFX9_MEC_HPD_SIZE; > > - if (adev->gfx.mec.hpd_eop_obj == NULL) { > - r = amdgpu_bo_create(adev, > - mec_hpd_size, > - PAGE_SIZE, true, > - AMDGPU_GEM_DOMAIN_GTT, 0, NULL, > NULL, > - &adev->gfx.mec.hpd_eop_obj); > - if (r) { > - dev_warn(adev->dev, "(%d) create HDP EOP bo > failed\n", r); > - return r; > - } > - } > - > - r = amdgpu_bo_reserve(adev->gfx.mec.hpd_eop_obj, false); > - if (unlikely(r != 0)) { > - gfx_v9_0_mec_fini(adev); > - return r; > - } > - r = amdgpu_bo_pin(adev->gfx.mec.hpd_eop_obj, > AMDGPU_GEM_DOMAIN_GTT, > - &adev->gfx.mec.hpd_eop_gpu_addr); > - if (r) { > - dev_warn(adev->dev, "(%d) pin HDP EOP bo failed\n", r); > - gfx_v9_0_mec_fini(adev); > - return r; > - } > - r = amdgpu_bo_kmap(adev->gfx.mec.hpd_eop_obj, (void > **)&hpd); > + r = amdgpu_bo_create_reserved(adev, mec_hpd_size, PAGE_SIZE, > + AMDGPU_GEM_DOMAIN_GTT, > + &adev->gfx.mec.hpd_eop_obj, > + &adev->gfx.mec.hpd_eop_gpu_addr, > + (void **)&hpd); > if (r) { > - dev_warn(adev->dev, "(%d) map HDP EOP bo failed\n", r); > + dev_warn(adev->dev, "(%d) create HDP EOP bo failed\n", r); > gfx_v9_0_mec_fini(adev); > return r; > } > @@ -905,42 +881,22 @@ static int gfx_v9_0_mec_init(struct amdgpu_device > *adev) > le32_to_cpu(mec_hdr- > >header.ucode_array_offset_bytes)); > fw_size = le32_to_cpu(mec_hdr->header.ucode_size_bytes) / 4; > > - if (adev->gfx.mec.mec_fw_obj == NULL) { > - r = amdgpu_bo_create(adev, > - mec_hdr->header.ucode_size_bytes, > - PAGE_SIZE, true, > - AMDGPU_GEM_DOMAIN_GTT, 0, NULL, NULL, > - &adev->gfx.mec.mec_fw_obj); > - if (r) { > - dev_warn(adev->dev, "(%d) create mec firmware bo > failed\n", r); > - return r; > - } > - } > - > - r = amdgpu_bo_reserve(adev->gfx.mec.mec_fw_obj, false); > - if (unlikely(r != 0)) { > - gfx_v9_0_mec_fini(adev); > - return r; > - } > - r = amdgpu_bo_pin(adev->gfx.mec.mec_fw_obj, > AMDGPU_GEM_DOMAIN_GTT, > - &adev->gfx.mec.mec_fw_gpu_addr); > - if (r) { > - dev_warn(adev->dev, "(%d) pin mec firmware bo failed\n", > r); > - gfx_v9_0_mec_fini(adev); > - return r; > - } > - r = amdgpu_bo_kmap(adev->gfx.mec.mec_fw_obj, (void **)&fw); > + r = amdgpu_bo_create_reserved(adev, mec_hdr- > >header.ucode_size_bytes, > + PAGE_SIZE, > AMDGPU_GEM_DOMAIN_GTT, > + &adev->gfx.mec.mec_fw_obj, > + &adev->gfx.mec.mec_fw_gpu_addr, > + (void **)&fw); > if (r) { > - dev_warn(adev->dev, "(%d) map firmware bo failed\n", r); > + dev_warn(adev->dev, "(%d) create mec firmware bo > failed\n", r); > gfx_v9_0_mec_fini(adev); > return r; > } > + > memcpy(fw, fw_data, fw_size); > > amdgpu_bo_kunmap(adev->gfx.mec.mec_fw_obj); > amdgpu_bo_unreserve(adev->gfx.mec.mec_fw_obj); > > - > return 0; > } > > -- > 2.7.4 > > _______________________________________________ > amd-gfx mailing list > [email protected] > https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
