瀏覽代碼

drm/radeon: Try harder to avoid HW cursor ending on a multiple of 128 columns.

This could previously fail if either of the enabled displays was using a
horizontal resolution that is a multiple of 128, and only the leftmost column
of the cursor was (supposed to be) visible at the right edge of that display.

The solution is to move the cursor one pixel to the left in that case.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=33183

Cc: stable@vger.kernel.org
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Michel Dänzer 13 年之前
父節點
當前提交
f60ec4c7df
共有 1 個文件被更改,包括 7 次插入1 次删除
  1. 7 1
      drivers/gpu/drm/radeon/radeon_cursor.c

+ 7 - 1
drivers/gpu/drm/radeon/radeon_cursor.c

@@ -262,8 +262,14 @@ int radeon_crtc_cursor_move(struct drm_crtc *crtc,
 				if (!(cursor_end & 0x7f))
 				if (!(cursor_end & 0x7f))
 					w--;
 					w--;
 			}
 			}
-			if (w <= 0)
+			if (w <= 0) {
 				w = 1;
 				w = 1;
+				cursor_end = x - xorigin + w;
+				if (!(cursor_end & 0x7f)) {
+					x--;
+					WARN_ON_ONCE(x < 0);
+				}
+			}
 		}
 		}
 	}
 	}