aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0151-amdgpu-dce11-Add-test-for-crtc-0-to-various-DCEv11-f.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/files/0151-amdgpu-dce11-Add-test-for-crtc-0-to-various-DCEv11-f.patch')
-rw-r--r--common/recipes-kernel/linux/files/0151-amdgpu-dce11-Add-test-for-crtc-0-to-various-DCEv11-f.patch57
1 files changed, 57 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0151-amdgpu-dce11-Add-test-for-crtc-0-to-various-DCEv11-f.patch b/common/recipes-kernel/linux/files/0151-amdgpu-dce11-Add-test-for-crtc-0-to-various-DCEv11-f.patch
new file mode 100644
index 00000000..29c8ce54
--- /dev/null
+++ b/common/recipes-kernel/linux/files/0151-amdgpu-dce11-Add-test-for-crtc-0-to-various-DCEv11-f.patch
@@ -0,0 +1,57 @@
+From 6f0803b38e7683b4fd2ac427bba91a99d1557f18 Mon Sep 17 00:00:00 2001
+From: Tom St Denis <tom.stdenis@amd.com>
+Date: Tue, 15 Dec 2015 13:03:43 -0500
+Subject: [PATCH 0151/1110] amdgpu/dce11: Add test for crtc < 0 to various
+ DCEv11 functions
+
+To be consistent with other DCE11 functions test for crtc < 0.
+
+Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
+index 80be62a..8e67249 100644
+--- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
+@@ -213,7 +213,7 @@ static void dce_v11_0_vblank_wait(struct amdgpu_device *adev, int crtc)
+ {
+ unsigned i = 100;
+
+- if (crtc >= adev->mode_info.num_crtc)
++ if (crtc < 0 || crtc >= adev->mode_info.num_crtc)
+ return;
+
+ if (!(RREG32(mmCRTC_CONTROL + crtc_offsets[crtc]) & CRTC_CONTROL__CRTC_MASTER_EN_MASK))
+@@ -241,7 +241,7 @@ static void dce_v11_0_vblank_wait(struct amdgpu_device *adev, int crtc)
+
+ static u32 dce_v11_0_vblank_get_counter(struct amdgpu_device *adev, int crtc)
+ {
+- if (crtc >= adev->mode_info.num_crtc)
++ if (crtc < 0 || crtc >= adev->mode_info.num_crtc)
+ return 0;
+ else
+ return RREG32(mmCRTC_STATUS_FRAME_COUNT + crtc_offsets[crtc]);
+@@ -3386,7 +3386,7 @@ static void dce_v11_0_crtc_vblank_int_ack(struct amdgpu_device *adev,
+ {
+ u32 tmp;
+
+- if (crtc >= adev->mode_info.num_crtc) {
++ if (crtc < 0 || crtc >= adev->mode_info.num_crtc) {
+ DRM_DEBUG("invalid crtc %d\n", crtc);
+ return;
+ }
+@@ -3401,7 +3401,7 @@ static void dce_v11_0_crtc_vline_int_ack(struct amdgpu_device *adev,
+ {
+ u32 tmp;
+
+- if (crtc >= adev->mode_info.num_crtc) {
++ if (crtc < 0 || crtc >= adev->mode_info.num_crtc) {
+ DRM_DEBUG("invalid crtc %d\n", crtc);
+ return;
+ }
+--
+2.7.4
+