diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0787-drm-amdgpu-Don-t-crash-system-if-we-can-t-get-crtc.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0787-drm-amdgpu-Don-t-crash-system-if-we-can-t-get-crtc.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0787-drm-amdgpu-Don-t-crash-system-if-we-can-t-get-crtc.patch b/common/recipes-kernel/linux/files/0787-drm-amdgpu-Don-t-crash-system-if-we-can-t-get-crtc.patch new file mode 100644 index 00000000..374d30cc --- /dev/null +++ b/common/recipes-kernel/linux/files/0787-drm-amdgpu-Don-t-crash-system-if-we-can-t-get-crtc.patch @@ -0,0 +1,31 @@ +From b7ada3af55867caef6410cc2cc97d77afea33c41 Mon Sep 17 00:00:00 2001 +From: Harry Wentland <harry.wentland@amd.com> +Date: Wed, 25 Nov 2015 15:42:09 -0500 +Subject: [PATCH 0787/1050] drm/amdgpu: Don't crash system if we can't get crtc + +Signed-off-by: Harry Wentland <harry.wentland@amd.com> +Acked-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +index a571d2b..ff8f099 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +@@ -681,6 +681,12 @@ int amdgpu_get_vblank_timestamp_kms(struct drm_device *dev, int crtc, + + /* Get associated drm_crtc: */ + drmcrtc = &adev->mode_info.crtcs[crtc]->base; ++ if (!drmcrtc) { ++ /* This can occur on driver load if some component fails to ++ * initialize completely and driver is unloaded */ ++ DRM_ERROR("Uninitialized crtc %d\n", crtc); ++ return -EINVAL; ++ } + + /* Helper routine in DRM core does all the work: */ + return drm_calc_vbltimestamp_from_scanoutpos(dev, crtc, max_error, +-- +1.9.1 + |