diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-11 18:10:09 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-11 18:10:09 -0400 |
| commit | fa955855c7519127ea43742d0b950521c29a3087 (patch) | |
| tree | e8a30652fe98ec2e997aed53ad8db0683cb2f0bb | |
| parent | 9d3850360659f10a3e32d3084bc456e11e850689 (diff) | |
| download | longterm-queue-4.18-fa955855c7519127ea43742d0b950521c29a3087.tar.gz | |
drm: amdgpu ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/drm-amdgpu-psp-move-psp-version-specific-function-po.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/queue/drm-amdgpu-psp-move-psp-version-specific-function-po.patch b/queue/drm-amdgpu-psp-move-psp-version-specific-function-po.patch index e4521f2..4783c73 100644 --- a/queue/drm-amdgpu-psp-move-psp-version-specific-function-po.patch +++ b/queue/drm-amdgpu-psp-move-psp-version-specific-function-po.patch @@ -1,4 +1,4 @@ -From 9d6fea5744d6798353f37ac42a8a653a2607ca69 Mon Sep 17 00:00:00 2001 +From 73d47f8cc6c584421fd38b7249aabd35932388ac Mon Sep 17 00:00:00 2001 From: Alex Deucher <alexander.deucher@amd.com> Date: Wed, 8 May 2019 21:45:06 -0500 Subject: [PATCH] drm/amdgpu/psp: move psp version specific function pointers @@ -18,10 +18,10 @@ Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c -index 905cce1814f3..05897b05766b 100644 +index 5b39d1399630..5be82e4fd1da 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c -@@ -38,18 +38,10 @@ static void psp_set_funcs(struct amdgpu_device *adev); +@@ -37,18 +37,10 @@ static void psp_set_funcs(struct amdgpu_device *adev); static int psp_early_init(void *handle) { struct amdgpu_device *adev = (struct amdgpu_device *)handle; @@ -42,8 +42,8 @@ index 905cce1814f3..05897b05766b 100644 case CHIP_VEGA10: case CHIP_VEGA12: @@ -67,6 +59,15 @@ static int psp_sw_init(void *handle) - - psp->adev = adev; + if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP) + return 0; + return 0; +} @@ -58,5 +58,5 @@ index 905cce1814f3..05897b05766b 100644 if (ret) { DRM_ERROR("Failed to load psp firmware!\n"); -- -2.9.5 +2.7.4 |