drm/amdgpu/gfx9: set gfx.funcs in early init

So the callbacks are set before we use them.

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
index 0320be4a5fc6c3c3c55b9c69641eedd4b0ac9cbe..c80623c35b52ae99f6ca7ef9de1c9b3d5049280d 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
@@ -1919,8 +1919,6 @@ static int gfx_v9_0_gpu_early_init(struct amdgpu_device *adev)
        u32 gb_addr_config;
        int err;
 
-       adev->gfx.funcs = &gfx_v9_0_gfx_funcs;
-
        switch (adev->ip_versions[GC_HWIP][0]) {
        case IP_VERSION(9, 0, 1):
                adev->gfx.config.max_hw_contexts = 8;
@@ -4539,6 +4537,8 @@ static int gfx_v9_0_early_init(void *handle)
 {
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
+       adev->gfx.funcs = &gfx_v9_0_gfx_funcs;
+
        if (adev->ip_versions[GC_HWIP][0] == IP_VERSION(9, 4, 1) ||
            adev->ip_versions[GC_HWIP][0] == IP_VERSION(9, 4, 2))
                adev->gfx.num_gfx_rings = 0;