Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b1f42d8 authored by Lucas Stach's avatar Lucas Stach Committed by Alex Deucher
Browse files

drm: move amd_gpu_scheduler into common location 



This moves and renames the AMDGPU scheduler to a common location in DRM
in order to facilitate re-use by other drivers. This is mostly a straight
forward rename with no code changes.

One notable exception is the function to_drm_sched_fence(), which is no
longer a inline header function to avoid the need to export the
drm_sched_fence_ops_scheduled and drm_sched_fence_ops_finished structures.

Reviewed-by: default avatarChunming Zhou <david1.zhou@amd.com>
Tested-by: default avatarDieter Nützel <Dieter@nuetzel-hh.de>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarLucas Stach <l.stach@pengutronix.de>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9ce6aae1

drivers/gpu/drm/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -149,6 +149,10 @@ config DRM_VM 
	bool

	depends on DRM && MMU



config DRM_SCHED

	tristate

	depends on DRM



source "drivers/gpu/drm/i2c/Kconfig"



source "drivers/gpu/drm/arm/Kconfig"
@@ -178,6 +182,7 @@ config DRM_AMDGPU 
	depends on DRM && PCI && MMU

	select FW_LOADER

        select DRM_KMS_HELPER

	select DRM_SCHED

        select DRM_TTM

	select POWER_SUPPLY

	select HWMON

drivers/gpu/drm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -101,3 +101,4 @@ obj-$(CONFIG_DRM_MXSFB) += mxsfb/ 
obj-$(CONFIG_DRM_TINYDRM) += tinydrm/

obj-$(CONFIG_DRM_PL111) += pl111/

obj-$(CONFIG_DRM_TVE200) += tve200/

obj-$(CONFIG_DRM_SCHED)	+= scheduler/

drivers/gpu/drm/amd/amdgpu/Makefile

+1 −4
Original line number Diff line number Diff line
@@ -135,10 +135,7 @@ amdgpu-y += \ 
amdgpu-y += amdgpu_cgs.o



# GPU scheduler

amdgpu-y += \

	../scheduler/gpu_scheduler.o \

	../scheduler/sched_fence.o \

	amdgpu_job.o

amdgpu-y += amdgpu_job.o



# ACP componet

ifneq ($(CONFIG_DRM_AMD_ACP),)

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

+8 −8
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#include <drm/drmP.h>

#include <drm/drm_gem.h>

#include <drm/amdgpu_drm.h>

#include <drm/gpu_scheduler.h>



#include <kgd_kfd_interface.h>

#include "dm_pp_interface.h"
@@ -68,7 +69,6 @@ 
#include "amdgpu_vcn.h"

#include "amdgpu_mn.h"

#include "amdgpu_dm.h"

#include "gpu_scheduler.h"

#include "amdgpu_virt.h"

#include "amdgpu_gart.h"
@@ -689,7 +689,7 @@ struct amdgpu_ib { 
	uint32_t			flags;

};



extern const struct amd_sched_backend_ops amdgpu_sched_ops;

extern const struct drm_sched_backend_ops amdgpu_sched_ops;



int amdgpu_job_alloc(struct amdgpu_device *adev, unsigned num_ibs,

		     struct amdgpu_job **job, struct amdgpu_vm *vm);
@@ -699,7 +699,7 @@ int amdgpu_job_alloc_with_ib(struct amdgpu_device *adev, unsigned size, 
void amdgpu_job_free_resources(struct amdgpu_job *job);

void amdgpu_job_free(struct amdgpu_job *job);

int amdgpu_job_submit(struct amdgpu_job *job, struct amdgpu_ring *ring,

		      struct amd_sched_entity *entity, void *owner,

		      struct drm_sched_entity *entity, void *owner,

		      struct dma_fence **f);



/*
@@ -732,7 +732,7 @@ int amdgpu_queue_mgr_map(struct amdgpu_device *adev, 
struct amdgpu_ctx_ring {

	uint64_t		sequence;

	struct dma_fence	**fences;

	struct amd_sched_entity	entity;

	struct drm_sched_entity	entity;

};



struct amdgpu_ctx {
@@ -746,8 +746,8 @@ struct amdgpu_ctx { 
	struct dma_fence	**fences;

	struct amdgpu_ctx_ring	rings[AMDGPU_MAX_RINGS];

	bool			preamble_presented;

	enum amd_sched_priority init_priority;

	enum amd_sched_priority override_priority;

	enum drm_sched_priority init_priority;

	enum drm_sched_priority override_priority;

	struct mutex            lock;

	atomic_t	guilty;

};
@@ -767,7 +767,7 @@ int amdgpu_ctx_add_fence(struct amdgpu_ctx *ctx, struct amdgpu_ring *ring, 
struct dma_fence *amdgpu_ctx_get_fence(struct amdgpu_ctx *ctx,

				   struct amdgpu_ring *ring, uint64_t seq);

void amdgpu_ctx_priority_override(struct amdgpu_ctx *ctx,

				  enum amd_sched_priority priority);

				  enum drm_sched_priority priority);



int amdgpu_ctx_ioctl(struct drm_device *dev, void *data,

		     struct drm_file *filp);
@@ -1116,7 +1116,7 @@ struct amdgpu_cs_parser { 
#define AMDGPU_HAVE_CTX_SWITCH              (1 << 2) /* bit set means context switch occured */



struct amdgpu_job {

	struct amd_sched_job    base;

	struct drm_sched_job    base;

	struct amdgpu_device	*adev;

	struct amdgpu_vm	*vm;

	struct amdgpu_ring	*ring;

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

+3 −3
Original line number Diff line number Diff line
@@ -1150,7 +1150,7 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p, 
			    union drm_amdgpu_cs *cs)

{

	struct amdgpu_ring *ring = p->job->ring;

	struct amd_sched_entity *entity = &p->ctx->rings[ring->idx].entity;

	struct drm_sched_entity *entity = &p->ctx->rings[ring->idx].entity;

	struct amdgpu_job *job;

	unsigned i;

	uint64_t seq;
@@ -1173,7 +1173,7 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p, 
	job = p->job;

	p->job = NULL;



	r = amd_sched_job_init(&job->base, &ring->sched, entity, p->filp);

	r = drm_sched_job_init(&job->base, &ring->sched, entity, p->filp);

	if (r) {

		amdgpu_job_free(job);

		amdgpu_mn_unlock(p->mn);
@@ -1202,7 +1202,7 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p, 
	amdgpu_ring_priority_get(job->ring, job->base.s_priority);



	trace_amdgpu_cs_ioctl(job);

	amd_sched_entity_push_job(&job->base, entity);

	drm_sched_entity_push_job(&job->base, entity);



	ttm_eu_fence_buffer_objects(&p->ticket, &p->validated, p->fence);

	amdgpu_mn_unlock(p->mn);