Skip to content

Commit 02ff519

Browse files
committed
drm/amdgpu: make mcbp a per device setting
So we can selectively enable it on certain devices. No intended functional change. Reviewed-and-tested-by: Jiadong Zhu <Jiadong.Zhu@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 5efe0f3 commit 02ff519

7 files changed

Lines changed: 22 additions & 13 deletions

File tree

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

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2552,7 +2552,7 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev)
25522552
adev->ip_blocks[i].status.hw = true;
25532553

25542554
/* right after GMC hw init, we create CSA */
2555-
if (amdgpu_mcbp) {
2555+
if (adev->gfx.mcbp) {
25562556
r = amdgpu_allocate_static_csa(adev, &adev->virt.csa_obj,
25572557
AMDGPU_GEM_DOMAIN_VRAM |
25582558
AMDGPU_GEM_DOMAIN_GTT,
@@ -3673,6 +3673,18 @@ static const struct attribute *amdgpu_dev_attributes[] = {
36733673
NULL
36743674
};
36753675

3676+
static void amdgpu_device_set_mcbp(struct amdgpu_device *adev)
3677+
{
3678+
if (amdgpu_mcbp == 1)
3679+
adev->gfx.mcbp = true;
3680+
3681+
if (amdgpu_sriov_vf(adev))
3682+
adev->gfx.mcbp = true;
3683+
3684+
if (adev->gfx.mcbp)
3685+
DRM_INFO("MCBP is enabled\n");
3686+
}
3687+
36763688
/**
36773689
* amdgpu_device_init - initialize the driver
36783690
*
@@ -3824,9 +3836,6 @@ int amdgpu_device_init(struct amdgpu_device *adev,
38243836
DRM_INFO("register mmio base: 0x%08X\n", (uint32_t)adev->rmmio_base);
38253837
DRM_INFO("register mmio size: %u\n", (unsigned)adev->rmmio_size);
38263838

3827-
if (amdgpu_mcbp)
3828-
DRM_INFO("MCBP is enabled\n");
3829-
38303839
/*
38313840
* Reset domain needs to be present early, before XGMI hive discovered
38323841
* (if any) and intitialized to use reset sem and in_gpu reset flag
@@ -3852,6 +3861,8 @@ int amdgpu_device_init(struct amdgpu_device *adev,
38523861
if (r)
38533862
return r;
38543863

3864+
amdgpu_device_set_mcbp(adev);
3865+
38553866
/* Get rid of things like offb */
38563867
r = drm_aperture_remove_conflicting_pci_framebuffers(adev->pdev, &amdgpu_kms_driver);
38573868
if (r)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,7 @@ struct amdgpu_gfx {
434434
uint16_t xcc_mask;
435435
uint32_t num_xcc_per_xcp;
436436
struct mutex partition_mutex;
437+
bool mcbp; /* mid command buffer preemption */
437438
};
438439

439440
struct amdgpu_gfx_ras_reg_entry {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -805,7 +805,7 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
805805
dev_info->ids_flags = 0;
806806
if (adev->flags & AMD_IS_APU)
807807
dev_info->ids_flags |= AMDGPU_IDS_FLAGS_FUSION;
808-
if (amdgpu_mcbp)
808+
if (adev->gfx.mcbp)
809809
dev_info->ids_flags |= AMDGPU_IDS_FLAGS_PREEMPTION;
810810
if (amdgpu_is_tmz(adev))
811811
dev_info->ids_flags |= AMDGPU_IDS_FLAGS_TMZ;
@@ -1247,7 +1247,7 @@ int amdgpu_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)
12471247
goto error_vm;
12481248
}
12491249

1250-
if (amdgpu_mcbp) {
1250+
if (adev->gfx.mcbp) {
12511251
uint64_t csa_addr = amdgpu_csa_vaddr(adev) & AMDGPU_GMC_HOLE_MASK;
12521252

12531253
r = amdgpu_map_static_csa(adev, &fpriv->vm, adev->virt.csa_obj,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ uint64_t amdgpu_sdma_get_csa_mc_addr(struct amdgpu_ring *ring,
7272
int r;
7373

7474
/* don't enable OS preemption on SDMA under SRIOV */
75-
if (amdgpu_sriov_vf(adev) || vmid == 0 || !amdgpu_mcbp)
75+
if (amdgpu_sriov_vf(adev) || vmid == 0 || !adev->gfx.mcbp)
7676
return 0;
7777

7878
if (ring->is_mes_queue) {

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,6 @@ void amdgpu_virt_init_setting(struct amdgpu_device *adev)
6666
adev->cg_flags = 0;
6767
adev->pg_flags = 0;
6868

69-
/* enable mcbp for sriov */
70-
amdgpu_mcbp = 1;
71-
7269
/* Reduce kcq number to 2 to reduce latency */
7370
if (amdgpu_num_kcq == -1)
7471
amdgpu_num_kcq = 2;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8307,7 +8307,7 @@ static void gfx_v10_0_ring_emit_ib_gfx(struct amdgpu_ring *ring,
83078307

83088308
control |= ib->length_dw | (vmid << 24);
83098309

8310-
if (amdgpu_mcbp && (ib->flags & AMDGPU_IB_FLAG_PREEMPT)) {
8310+
if (ring->adev->gfx.mcbp && (ib->flags & AMDGPU_IB_FLAG_PREEMPT)) {
83118311
control |= INDIRECT_BUFFER_PRE_ENB(1);
83128312

83138313
if (flags & AMDGPU_IB_PREEMPTED)
@@ -8482,7 +8482,7 @@ static void gfx_v10_0_ring_emit_cntxcntl(struct amdgpu_ring *ring,
84828482
{
84838483
uint32_t dw2 = 0;
84848484

8485-
if (amdgpu_mcbp)
8485+
if (ring->adev->gfx.mcbp)
84868486
gfx_v10_0_ring_emit_ce_meta(ring,
84878487
(!amdgpu_sriov_vf(ring->adev) && flags & AMDGPU_IB_PREEMPTED) ? true : false);
84888488

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5311,7 +5311,7 @@ static void gfx_v11_0_ring_emit_ib_gfx(struct amdgpu_ring *ring,
53115311

53125312
control |= ib->length_dw | (vmid << 24);
53135313

5314-
if (amdgpu_mcbp && (ib->flags & AMDGPU_IB_FLAG_PREEMPT)) {
5314+
if (ring->adev->gfx.mcbp && (ib->flags & AMDGPU_IB_FLAG_PREEMPT)) {
53155315
control |= INDIRECT_BUFFER_PRE_ENB(1);
53165316

53175317
if (flags & AMDGPU_IB_PREEMPTED)

0 commit comments

Comments
 (0)