From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH v2] drm: support hotspot for universal plane cursors Date: Tue, 17 Nov 2015 17:39:32 +0200 Message-ID: <20151117153932.GU4437@intel.com> References: <1447762218-11017-1-git-send-email-john@metanate.com> <1447772734-6480-1-git-send-email-john@metanate.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 537A46E411 for ; Tue, 17 Nov 2015 07:40:09 -0800 (PST) Content-Disposition: inline In-Reply-To: <1447772734-6480-1-git-send-email-john@metanate.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: John Keeping Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org T24gVHVlLCBOb3YgMTcsIDIwMTUgYXQgMDM6MDU6MzRQTSArMDAwMCwgSm9obiBLZWVwaW5nIHdy b3RlOgo+IFRoZSByZXF1ZXN0J3MgaG90X3ggYW5kIGhvdF95IGFyZSBzZXQgY29ycmVjdGx5IGZv ciBib3RoCj4gRFJNX0lPQ1RMX01PREVfQ1VSU09SIGFuZCBEUk1fSU9DVExfTU9ERV9DVVJTT1Iy IHNvIHdlIGp1c3QgbmVlZCB0byBzYXZlCj4gdGhlIHZhbHVlcyBhbmQgdGhlbiBhcHBseSB0aGUg b2Zmc2V0IHRvIHRoZSBjdXJzb3IgcGxhbmUgd2hlbiB0aGUgY3Vyc29yCj4gbW92ZXMuCj4gCj4g U2lnbmVkLW9mZi1ieTogSm9obiBLZWVwaW5nIDxqb2huQG1ldGFuYXRlLmNvbT4KPiAtLS0KPiB2 MjoKPiAgIC0gYWRkIGtlcm5lbGRvYyBmb3IgaG90X3ggYW5kIGhvdF95IGluIHN0cnVjdCBkcm1f Y3J0Ywo+IAo+ICBkcml2ZXJzL2dwdS9kcm0vZHJtX2NydGMuYyB8IDExICsrKysrKystLS0tCj4g IGluY2x1ZGUvZHJtL2RybV9jcnRjLmggICAgIHwgIDYgKysrKysrCj4gIDIgZmlsZXMgY2hhbmdl ZCwgMTMgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2RybV9jcnRjLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2NydGMuYwo+IGlu ZGV4IDcyMGExNTMuLjQwZjViODQgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9j cnRjLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2NydGMuYwo+IEBAIC0yODMxLDYgKzI4 MzEsOSBAQCBzdGF0aWMgaW50IGRybV9tb2RlX2N1cnNvcl91bml2ZXJzYWwoc3RydWN0IGRybV9j cnRjICpjcnRjLAo+ICAJCQkJRFJNX0RFQlVHX0tNUygiZmFpbGVkIHRvIHdyYXAgY3Vyc29yIGJ1 ZmZlciBpbiBkcm0gZnJhbWVidWZmZXJcbiIpOwo+ICAJCQkJcmV0dXJuIFBUUl9FUlIoZmIpOwo+ ICAJCQl9Cj4gKwo+ICsJCQljcnRjLT5ob3RfeCA9IHJlcS0+aG90X3g7Cj4gKwkJCWNydGMtPmhv dF95ID0gcmVxLT5ob3RfeTsKPiAgCQl9IGVsc2Ugewo+ICAJCQlmYiA9IE5VTEw7Cj4gIAkJfQo+ IEBAIC0yODQxLDExICsyODQ0LDExIEBAIHN0YXRpYyBpbnQgZHJtX21vZGVfY3Vyc29yX3VuaXZl cnNhbChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCj4gIAl9Cj4gIAo+ICAJaWYgKHJlcS0+ZmxhZ3Mg JiBEUk1fTU9ERV9DVVJTT1JfTU9WRSkgewo+IC0JCWNydGNfeCA9IHJlcS0+eDsKPiAtCQljcnRj X3kgPSByZXEtPnk7Cj4gKwkJY3J0Y194ID0gcmVxLT54IC0gY3J0Yy0+aG90X3g7Cj4gKwkJY3J0 Y195ID0gcmVxLT55IC0gY3J0Yy0+aG90X3k7Cj4gIAl9IGVsc2Ugewo+IC0JCWNydGNfeCA9IGNy dGMtPmN1cnNvcl94Owo+IC0JCWNydGNfeSA9IGNydGMtPmN1cnNvcl95Owo+ICsJCWNydGNfeCA9 IGNydGMtPmN1cnNvcl94IC0gY3J0Yy0+aG90X3g7Cj4gKwkJY3J0Y195ID0gY3J0Yy0+Y3Vyc29y X3kgLSBjcnRjLT5ob3RfeTsKCldoeSBkb2VzIHRoZSBsb2NhdGlvbiBvZiB0aGUgaG90c3BvdCBh ZmZlY3QgdGhlIHBsYW5lIHBvc2l0aW9uPwoKTmF0dXJhbGx5IHRoZXJlJ3Mgbm8gZG9jdW1lbnRh dGlvbiBpbiB0aGUgdWFwaSBoZWFkZXIgZm9yIGFueSBvZiB0aGlzCnN0dWZmIDooIFdvdWxkIGJl IG5pY2UgaWYgdGhlIHBvcGxlIGV4Y2l0ZWQgYWJvdXQgZG9jdW1lbnRhdGlvbiB3b3VsZApmaXgg dGhhdCBwYXJ0IGluc3RlYWQgb2YganVzdCBmb2N1c2luZyBvbiB0aGUgaW50ZXJuYWwgc3R1ZmYu Cgo+ICAJfQo+ICAKPiAgCWlmIChmYikgewo+IGRpZmYgLS1naXQgYS9pbmNsdWRlL2RybS9kcm1f Y3J0Yy5oIGIvaW5jbHVkZS9kcm0vZHJtX2NydGMuaAo+IGluZGV4IDNmMGM2OTAuLjJiZTQ0MTQg MTAwNjQ0Cj4gLS0tIGEvaW5jbHVkZS9kcm0vZHJtX2NydGMuaAo+ICsrKyBiL2luY2x1ZGUvZHJt L2RybV9jcnRjLmgKPiBAQCAtNDA0LDYgKzQwNCw4IEBAIHN0cnVjdCBkcm1fY3J0Y19mdW5jcyB7 Cj4gICAqIEBjdXJzb3I6IGN1cnNvciBwbGFuZSBmb3IgdGhpcyBDUlRDCj4gICAqIEBjdXJzb3Jf eDogY3VycmVudCB4IHBvc2l0aW9uIG9mIHRoZSBjdXJzb3IsIHVzZWQgZm9yIHVuaXZlcnNhbCBj dXJzb3IgcGxhbmVzCj4gICAqIEBjdXJzb3JfeTogY3VycmVudCB5IHBvc2l0aW9uIG9mIHRoZSBj dXJzb3IsIHVzZWQgZm9yIHVuaXZlcnNhbCBjdXJzb3IgcGxhbmVzCj4gKyAqIEBob3RfeDogeC1j b29yZGluYXRlIG9mIGN1cnNvciBob3RzcG90LCB1c2VkIGZvciB1bml2ZXJzYWwgY3Vyc29yIHBs YW5lcwo+ICsgKiBAaG90X3k6IHktY29vcmRpbmF0ZSBvZiBjdXJzb3IgaG90c3BvdCwgdXNlZCBm b3IgdW5pdmVyc2FsIGN1cnNvciBwbGFuZXMKPiAgICogQGVuYWJsZWQ6IGlzIHRoaXMgQ1JUQyBl bmFibGVkPwo+ICAgKiBAbW9kZTogY3VycmVudCBtb2RlIHRpbWluZ3MKPiAgICogQGh3bW9kZTog bW9kZSB0aW1pbmdzIGFzIHByb2dyYW1tZWQgdG8gaHcgcmVncwo+IEBAIC00NDUsNiArNDQ3LDEw IEBAIHN0cnVjdCBkcm1fY3J0YyB7Cj4gIAlpbnQgY3Vyc29yX3g7Cj4gIAlpbnQgY3Vyc29yX3k7 Cj4gIAo+ICsJLyogaG90c3BvdCBvZiBjdXJzb3IgKi8KPiArCWludCBob3RfeDsKPiArCWludCBo b3RfeTsKPiArCj4gIAlib29sIGVuYWJsZWQ7Cj4gIAo+ICAJLyogUmVxdWVzdGVkIG1vZGUgZnJv bSBtb2Rlc2V0dGluZy4gKi8KPiAtLSAKPiAyLjYuMy40NjIuZ2JlMmM5MTQKPiAKPiBfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwo+IGRyaS1kZXZlbCBtYWls aW5nIGxpc3QKPiBkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4gaHR0cDovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAoKLS0gClZpbGxlIFN5 cmrDpGzDpApJbnRlbCBPVEMKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmkt ZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753541AbbKQPkU (ORCPT ); Tue, 17 Nov 2015 10:40:20 -0500 Received: from mga14.intel.com ([192.55.52.115]:60223 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750867AbbKQPkS (ORCPT ); Tue, 17 Nov 2015 10:40:18 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,308,1444719600"; d="scan'208";a="822245734" Date: Tue, 17 Nov 2015 17:39:32 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: John Keeping Cc: David Airlie , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: Re: [PATCH v2] drm: support hotspot for universal plane cursors Message-ID: <20151117153932.GU4437@intel.com> References: <1447762218-11017-1-git-send-email-john@metanate.com> <1447772734-6480-1-git-send-email-john@metanate.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1447772734-6480-1-git-send-email-john@metanate.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Nov 17, 2015 at 03:05:34PM +0000, John Keeping wrote: > 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 > --- > v2: > - add kerneldoc for hot_x and hot_y in struct drm_crtc > > drivers/gpu/drm/drm_crtc.c | 11 +++++++---- > include/drm/drm_crtc.h | 6 ++++++ > 2 files changed, 13 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; Why does the location of the hotspot affect the plane position? Naturally there's no documentation in the uapi header for any of this stuff :( Would be nice if the pople excited about documentation would fix that part instead of just focusing on the internal stuff. > } > > if (fb) { > diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h > index 3f0c690..2be4414 100644 > --- a/include/drm/drm_crtc.h > +++ b/include/drm/drm_crtc.h > @@ -404,6 +404,8 @@ struct drm_crtc_funcs { > * @cursor: cursor plane for this CRTC > * @cursor_x: current x position of the cursor, used for universal cursor planes > * @cursor_y: current y position of the cursor, used for universal cursor planes > + * @hot_x: x-coordinate of cursor hotspot, used for universal cursor planes > + * @hot_y: y-coordinate of cursor hotspot, used for universal cursor planes > * @enabled: is this CRTC enabled? > * @mode: current mode timings > * @hwmode: mode timings as programmed to hw regs > @@ -445,6 +447,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.3.462.gbe2c914 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel -- Ville Syrjälä Intel OTC