Linux kernel stable tree (mirror) https://git.radix-linux.su/kernel/linux.git/atom?h=linux-5.9.y 2020-11-05T10:51:17+00:00 2020-11-05T10:51:17+00:00 Luben Tuikov luben.tuikov@amd.com 2020-08-11T23:59:58+00:00 urn:sha1:c1918dd9f20cb5449d172e0ab43f6bdd16a46ac0 [ Upstream commit e2d732fdb7a9e421720a644580cd6a9400f97f60 ] Remove DRM_SCHED_PRIORITY_LOW, as it was used in only one place. Rename and separate by a line DRM_SCHED_PRIORITY_MAX to DRM_SCHED_PRIORITY_COUNT as it represents a (total) count of said priorities and it is used as such in loops throughout the code. (0-based indexing is the the count number.) Remove redundant word HIGH in priority names, and rename *KERNEL* to *HIGH*, as it really means that, high. v2: Add back KERNEL and remove SW and HW, in lieu of a single HIGH between NORMAL and KERNEL. Signed-off-by: Luben Tuikov <luben.tuikov@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Sasha Levin <sashal@kernel.org> 2020-04-09T14:43:14+00:00 Nirmoy Das nirmoy.das@amd.com 2020-04-01T09:46:57+00:00 urn:sha1:1c6d567bdf73a207f51ef2e5745854ba7daa22c7 Generate HW IP's sched_list in amdgpu_ring_init() instead of amdgpu_ctx.c. This makes amdgpu_ctx_init_compute_sched(), ring.has_high_prio and amdgpu_ctx_init_sched() unnecessary. This patch also stores sched_list for all HW IPs in one big array in struct amdgpu_device which makes amdgpu_ctx_init_entity() much more leaner. v2: fix a coding style issue do not use drm hw_ip const to populate amdgpu_ring_type enum v3: remove ctx reference and move sched array and num_sched to a struct use num_scheds to detect uninitialized scheduler list v4: use array_index_nospec for user space controlled variables fix possible checkpatch.pl warnings Signed-off-by: Nirmoy Das <nirmoy.das@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> 2020-03-16T20:21:32+00:00 Nirmoy Das nirmoy.das@amd.com 2020-03-13T14:26:54+00:00 urn:sha1:4ff7d8ba4c80b8198bd4a0cc339373eb28540552 VCN HW doesn't support dynamic load balance on multiple instances for a context. This patch initializes VNC entities with only one drm_gpu_scheduler picked by drm_sched_pick_best(). Picking a drm_gpu_scheduler using drm_sched_pick_best() ensures that we do load balance among multiple contexts but not among multiple jobs in a context. Signed-off-by: Nirmoy Das <nirmoy.das@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> 2020-03-16T20:18:14+00:00 Nirmoy Das nirmoy.das@amd.com 2020-03-13T14:20:13+00:00 urn:sha1:79cb2719be26c09d34b6b4cffa19abd8f4a36644 Fix switch-case indentation in amdgpu_ctx_init_entity() Signed-off-by: Nirmoy Das <nirmoy.das@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> 2020-03-10T19:54:07+00:00 Nirmoy Das nirmoy.das@amd.com 2020-03-10T12:15:56+00:00 urn:sha1:ea29221d1d6d9d474d4770812f675cc29cde6125 If there are no high priority compute queues available then set normal priority sched array to compute_prio_sched[AMDGPU_GFX_PIPE_PRIO_HIGH] Signed-off-by: Nirmoy Das <nirmoy.das@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> 2020-03-09T17:51:42+00:00 Nirmoy Das nirmoy.das@amd.com 2020-02-27T17:18:22+00:00 urn:sha1:2316a86bde4960b8137aaa54181eea31126fd165 Switch to appropriate sched list for an entity on priority override. Signed-off-by: Nirmoy Das <nirmoy.das@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> 2020-03-09T17:51:24+00:00 Nirmoy Das nirmoy.das@amd.com 2020-02-27T12:59:08+00:00 urn:sha1:33abcb1f5a1719b1c18867e5bf24fb70efe98804 We were changing compute ring priority while rings were being used before every job submission which is not recommended. This patch sets compute queue priority at mqd initialization for gfx8, gfx9 and gfx10. Policy: make queue 0 of each pipe as high priority compute queue High/normal priority compute sched lists are generated from set of high/normal priority compute queues. At context creation, entity of compute queue get a sched list from high or normal priority depending on ctx->priority Signed-off-by: Nirmoy Das <nirmoy.das@amd.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Acked-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> 2020-01-30T22:15:42+00:00 Nirmoy Das nirmoy.das@amd.com 2020-01-21T14:53:53+00:00 urn:sha1:977f7e1068be60f3cac7d80ab18692341f3b7fc5 Currently we pre-allocate entities and fences for all the HW IPs on context creation and some of which are might never be used. This patch tries to resolve entity/fences wastage by creating entity only when needed. v2: allocate memory for entity and fences together Signed-off-by: Nirmoy Das <nirmoy.das@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> 2020-01-22T21:55:27+00:00 Nirmoy Das nirmoy.das@amd.com 2020-01-21T12:29:20+00:00 urn:sha1:63e3ab9a8226c0271e823f32fc1c3de67d142c78 Allocate fences for each entity and remove ctx->fences reference as fences should be bound to amdgpu_ctx_entity instead amdgpu_ctx. Signed-off-by: Nirmoy Das <nirmoy.das@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> 2019-12-23T19:56:09+00:00 Le Ma le.ma@amd.com 2019-12-19T11:26:02+00:00 urn:sha1:0a96afc7c56cbac075426a6a5f82a88cadb648f7 This workaround does not affect other asics because amdgpu only need expose one gfx sched to user for now. Signed-off-by: Le Ma <le.ma@amd.com> Reviewed-by: Nirmoy Das <nirmoy.das@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>