Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1271141
| From | John Keeping <john@metanate.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH] drm: support hotspot for universal plane cursors |
| Date | 2015-11-17 13:40 +0100 |
| Message-ID | <qvNIe-50X-9@gated-at.bofh.it> (permalink) |
| Organization | linux.* mail to news gateway |
The request's hot_x and hot_y are set correctly for both
DRM_IOCTL_MODE_CURSOR and DRM_IOCTL_MODE_CURSOR2 so we just need to save
the values and then apply the offset to the cursor plane when the cursor
moves.
Signed-off-by: John Keeping <john@metanate.com>
---
drivers/gpu/drm/drm_crtc.c | 11 +++++++----
include/drm/drm_crtc.h | 4 ++++
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 720a153..40f5b84 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -2831,6 +2831,9 @@ static int drm_mode_cursor_universal(struct drm_crtc *crtc,
DRM_DEBUG_KMS("failed to wrap cursor buffer in drm framebuffer\n");
return PTR_ERR(fb);
}
+
+ crtc->hot_x = req->hot_x;
+ crtc->hot_y = req->hot_y;
} else {
fb = NULL;
}
@@ -2841,11 +2844,11 @@ static int drm_mode_cursor_universal(struct drm_crtc *crtc,
}
if (req->flags & DRM_MODE_CURSOR_MOVE) {
- crtc_x = req->x;
- crtc_y = req->y;
+ crtc_x = req->x - crtc->hot_x;
+ crtc_y = req->y - crtc->hot_y;
} else {
- crtc_x = crtc->cursor_x;
- crtc_y = crtc->cursor_y;
+ crtc_x = crtc->cursor_x - crtc->hot_x;
+ crtc_y = crtc->cursor_y - crtc->hot_y;
}
if (fb) {
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 3f0c690..1420145 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -445,6 +445,10 @@ struct drm_crtc {
int cursor_x;
int cursor_y;
+ /* hotspot of cursor */
+ int hot_x;
+ int hot_y;
+
bool enabled;
/* Requested mode from modesetting. */
--
2.6.2.400.gcb098da
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread
[PATCH] drm: support hotspot for universal plane cursors John Keeping <john@metanate.com> - 2015-11-17 13:40 +0100
Re: [PATCH] drm: support hotspot for universal plane cursors kbuild test robot <lkp@intel.com> - 2015-11-17 14:20 +0100
[PATCH v2] drm: support hotspot for universal plane cursors John Keeping <john@metanate.com> - 2015-11-17 16:10 +0100
Re: [PATCH v2] drm: support hotspot for universal plane cursors Ville Syrjälä <ville.syrjala@linux.intel.com> - 2015-11-17 16:50 +0100
Re: [PATCH v2] drm: support hotspot for universal plane cursors John Keeping <john@metanate.com> - 2015-11-17 17:00 +0100
Re: [PATCH v2] drm: support hotspot for universal plane cursors Ville Syrjälä <ville.syrjala@linux.intel.com> - 2015-11-17 17:10 +0100
Re: [PATCH v2] drm: support hotspot for universal plane cursors Daniel Vetter <daniel@ffwll.ch> - 2015-11-17 17:30 +0100
Re: [PATCH v2] drm: support hotspot for universal plane cursors John Keeping <john@metanate.com> - 2015-11-17 18:00 +0100
Re: [PATCH v2] drm: support hotspot for universal plane cursors Daniel Vetter <daniel@ffwll.ch> - 2015-11-17 19:50 +0100
Re: [PATCH v2] drm: support hotspot for universal plane cursors Alex Deucher <alexdeucher@gmail.com> - 2015-11-17 20:20 +0100
Re: [PATCH v2] drm: support hotspot for universal plane cursors Alex Deucher <alexdeucher@gmail.com> - 2015-11-17 18:10 +0100
Re: [PATCH v2] drm: support hotspot for universal plane cursors Daniel Vetter <daniel@ffwll.ch> - 2015-11-17 19:40 +0100
Re: [PATCH v2] drm: support hotspot for universal plane cursors John Keeping <john@metanate.com> - 2015-11-17 19:50 +0100
Re: [PATCH v2] drm: support hotspot for universal plane cursors Daniel Vetter <daniel@ffwll.ch> - 2015-11-17 20:20 +0100
Re: [PATCH v2] drm: support hotspot for universal plane cursors John Keeping <john@metanate.com> - 2015-11-18 11:20 +0100
Re: [PATCH v2] drm: support hotspot for universal plane cursors Daniel Vetter <daniel@ffwll.ch> - 2015-11-18 12:10 +0100
Re: [PATCH v2] drm: support hotspot for universal plane cursors Michel Dänzer <michel@daenzer.net> - 2015-11-18 09:40 +0100
Re: [PATCH v2] drm: support hotspot for universal plane cursors Daniel Vetter <daniel@ffwll.ch> - 2015-11-18 10:00 +0100
Re: [PATCH v2] drm: support hotspot for universal plane cursors Michel Dänzer <michel@daenzer.net> - 2015-11-18 10:00 +0100
csiph-web