tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

drm/amdgpu: fix incorrect VCN revision in SRIOV

Guest OS will setup VCN instance 1 which is disabled as an enabled instance and
execute initialization work on it, but this causes VCN ib ring test failure
on the disabled VCN instance during modprobe:

amdgpu 0000:00:08.0: amdgpu: ring vcn_enc_1.0 uses VM inv eng 5 on hub 1
amdgpu 0000:00:08.0: [drm:amdgpu_ib_ring_tests [amdgpu]] *ERROR* IB test failed on vcn_dec_0 (-110).
amdgpu 0000:00:08.0: [drm:amdgpu_ib_ring_tests [amdgpu]] *ERROR* IB test failed on vcn_enc_0.0 (-110).
[drm:amdgpu_device_delayed_init_work_handler [amdgpu]] *ERROR* ib ring test failed (-110).

v2: drop amdgpu_discovery_get_vcn_version and rename sriov_config to
vcn_config
v3: modify VCN's revision in SR-IOV and bare-metal

Fixes: baf3f8f3740625 ("drm/amdgpu: handle SRIOV VCN revision parsing")
Signed-off-by: Leslie Shi <Yuliang.Shi@amd.com>
Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Reviewed-by: Guchun Chen <guchun.chen@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Leslie Shi and committed by
Alex Deucher c40bdfb2 4046afce

+14 -34
+9 -20
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
··· 380 380 ip->revision); 381 381 382 382 if (le16_to_cpu(ip->hw_id) == VCN_HWID) { 383 - if (amdgpu_sriov_vf(adev)) { 384 - /* SR-IOV modifies each VCN’s revision (uint8) 385 - * Bit [5:0]: original revision value 386 - * Bit [7:6]: en/decode capability: 387 - * 0b00 : VCN function normally 388 - * 0b10 : encode is disabled 389 - * 0b01 : decode is disabled 390 - */ 391 - adev->vcn.sriov_config[adev->vcn.num_vcn_inst] = 392 - (ip->revision & 0xc0) >> 6; 393 - ip->revision &= ~0xc0; 394 - } 383 + /* Bit [5:0]: original revision value 384 + * Bit [7:6]: en/decode capability: 385 + * 0b00 : VCN function normally 386 + * 0b10 : encode is disabled 387 + * 0b01 : decode is disabled 388 + */ 389 + adev->vcn.vcn_config[adev->vcn.num_vcn_inst] = 390 + ip->revision & 0xc0; 391 + ip->revision &= ~0xc0; 395 392 adev->vcn.num_vcn_inst++; 396 393 } 397 394 if (le16_to_cpu(ip->hw_id) == SDMA0_HWID || ··· 480 483 } 481 484 482 485 return -EINVAL; 483 - } 484 - 485 - 486 - int amdgpu_discovery_get_vcn_version(struct amdgpu_device *adev, int vcn_instance, 487 - int *major, int *minor, int *revision) 488 - { 489 - return amdgpu_discovery_get_ip_version(adev, VCN_HWID, 490 - vcn_instance, major, minor, revision); 491 486 } 492 487 493 488 void amdgpu_discovery_harvest_ip(struct amdgpu_device *adev)
-2
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h
··· 33 33 int amdgpu_discovery_get_ip_version(struct amdgpu_device *adev, int hw_id, int number_instance, 34 34 int *major, int *minor, int *revision); 35 35 36 - int amdgpu_discovery_get_vcn_version(struct amdgpu_device *adev, int vcn_instance, 37 - int *major, int *minor, int *revision); 38 36 int amdgpu_discovery_get_gfx_info(struct amdgpu_device *adev); 39 37 int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev); 40 38
+4 -11
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
··· 284 284 bool amdgpu_vcn_is_disabled_vcn(struct amdgpu_device *adev, enum vcn_ring_type type, uint32_t vcn_instance) 285 285 { 286 286 bool ret = false; 287 + int vcn_config = adev->vcn.vcn_config[vcn_instance]; 287 288 288 - int major; 289 - int minor; 290 - int revision; 291 - 292 - /* if cannot find IP data, then this VCN does not exist */ 293 - if (amdgpu_discovery_get_vcn_version(adev, vcn_instance, &major, &minor, &revision) != 0) 294 - return true; 295 - 296 - if ((type == VCN_ENCODE_RING) && (revision & VCN_BLOCK_ENCODE_DISABLE_MASK)) { 289 + if ((type == VCN_ENCODE_RING) && (vcn_config & VCN_BLOCK_ENCODE_DISABLE_MASK)) { 297 290 ret = true; 298 - } else if ((type == VCN_DECODE_RING) && (revision & VCN_BLOCK_DECODE_DISABLE_MASK)) { 291 + } else if ((type == VCN_DECODE_RING) && (vcn_config & VCN_BLOCK_DECODE_DISABLE_MASK)) { 299 292 ret = true; 300 - } else if ((type == VCN_UNIFIED_RING) && (revision & VCN_BLOCK_QUEUE_DISABLE_MASK)) { 293 + } else if ((type == VCN_UNIFIED_RING) && (vcn_config & VCN_BLOCK_QUEUE_DISABLE_MASK)) { 301 294 ret = true; 302 295 } 303 296
+1 -1
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
··· 235 235 236 236 uint8_t num_vcn_inst; 237 237 struct amdgpu_vcn_inst inst[AMDGPU_MAX_VCN_INSTANCES]; 238 - uint8_t sriov_config[AMDGPU_MAX_VCN_INSTANCES]; 238 + uint8_t vcn_config[AMDGPU_MAX_VCN_INSTANCES]; 239 239 struct amdgpu_vcn_reg internal; 240 240 struct mutex vcn_pg_lock; 241 241 struct mutex vcn1_jpeg1_workaround;