Skip to content

Commit

Permalink
drm/amdgpu: use amdxcp platform device as spatial partition
Browse files Browse the repository at this point in the history
Use amdxcp platform device as spatial partition device.

-v2: remove unused variable

Signed-off-by: James Zhu <James.Zhu@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  • Loading branch information
James Zhu authored and Alex Deucher committed Jun 9, 2023
1 parent ab1270a commit 9938333
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 2 additions & 0 deletions drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
Original file line number Diff line number Diff line change
@@ -50,6 +50,7 @@
#include "amdgpu_ras.h"
#include "amdgpu_xgmi.h"
#include "amdgpu_reset.h"
#include "../amdxcp/amdgpu_xcp_drv.h"

/*
* KMS wrapper.
@@ -2948,6 +2949,7 @@ static void __exit amdgpu_exit(void)
amdgpu_sync_fini();
amdgpu_fence_slab_fini();
mmu_notifier_synchronize();
amdgpu_xcp_drv_release();
}

module_init(amdgpu_init);
12 changes: 5 additions & 7 deletions drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c
Original file line number Diff line number Diff line change
@@ -25,6 +25,7 @@
#include "amdgpu_drv.h"

#include <drm/drm_drv.h>
#include "../amdxcp/amdgpu_xcp_drv.h"

static int __amdgpu_xcp_run(struct amdgpu_xcp_mgr *xcp_mgr,
struct amdgpu_xcp_ip *xcp_ip, int xcp_state)
@@ -226,18 +227,15 @@ int amdgpu_xcp_query_partition_mode(struct amdgpu_xcp_mgr *xcp_mgr, u32 flags)
static int amdgpu_xcp_dev_alloc(struct amdgpu_device *adev)
{
struct drm_device *p_ddev;
struct pci_dev *pdev;
struct drm_device *ddev;
int i;
int i, ret;

pdev = adev->pdev;
ddev = adev_to_drm(adev);

for (i = 0; i < MAX_XCP; i++) {
p_ddev = drm_dev_alloc(&amdgpu_partition_driver,
&pci_upstream_bridge(pdev)->dev);
if (IS_ERR(p_ddev))
return PTR_ERR(p_ddev);
ret = amdgpu_xcp_drm_dev_alloc(&p_ddev);
if (ret)
return ret;

/* Redirect all IOCTLs to the primary device */
adev->xcp_mgr->xcp[i].rdev = p_ddev->render->dev;

0 comments on commit 9938333

Please sign in to comment.