diff options
author | Daniel Vetter | 2016-10-28 09:14:08 +0200 |
---|---|---|
committer | Daniel Vetter | 2016-10-28 09:14:08 +0200 |
commit | 96583ddbec291929880edefa2141c06c63e16aa5 (patch) | |
tree | 6ae6bd3aec381d7461a687e3314bdf949798c554 /drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | |
parent | drm/i915: Correct pipe fault reporting string (diff) | |
parent | Merge branch 'linux-4.9' of git://github.com/skeggsb/linux into drm-next (diff) | |
download | kernel-qcow2-linux-96583ddbec291929880edefa2141c06c63e16aa5.tar.gz kernel-qcow2-linux-96583ddbec291929880edefa2141c06c63e16aa5.tar.xz kernel-qcow2-linux-96583ddbec291929880edefa2141c06c63e16aa5.zip |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
Backmerge latest drm-next to pull in the s/fence/dma_fence/ rework,
needed before we merge more i915 fencing patches.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c index b13c8aaec078..1940d36bc304 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c @@ -1030,7 +1030,7 @@ static int gmc_v6_0_set_powergating_state(void *handle, return 0; } -const struct amd_ip_funcs gmc_v6_0_ip_funcs = { +static const struct amd_ip_funcs gmc_v6_0_ip_funcs = { .name = "gmc_v6_0", .early_init = gmc_v6_0_early_init, .late_init = gmc_v6_0_late_init, @@ -1069,3 +1069,11 @@ static void gmc_v6_0_set_irq_funcs(struct amdgpu_device *adev) adev->mc.vm_fault.funcs = &gmc_v6_0_irq_funcs; } +const struct amdgpu_ip_block_version gmc_v6_0_ip_block = +{ + .type = AMD_IP_BLOCK_TYPE_GMC, + .major = 6, + .minor = 0, + .rev = 0, + .funcs = &gmc_v6_0_ip_funcs, +}; |