From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wi0-f178.google.com ([209.85.212.178]:38276 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754003AbbGNKYF (ORCPT ); Tue, 14 Jul 2015 06:24:05 -0400 Received: by wicmv11 with SMTP id mv11so10307361wic.1 for ; Tue, 14 Jul 2015 03:24:03 -0700 (PDT) Date: Tue, 14 Jul 2015 12:26:46 +0200 From: Daniel Vetter To: Tvrtko Ursulin Cc: Intel-gfx@lists.freedesktop.org, Daniel Stone , stable@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter Subject: Re: [Intel-gfx] [PATCH 2/2] drm: Provide compat ioctl for addfb2.1 Message-ID: <20150714102646.GV3736@phenom.ffwll.local> References: <1436868788-31721-1-git-send-email-tvrtko.ursulin@linux.intel.com> <1436868788-31721-2-git-send-email-tvrtko.ursulin@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1436868788-31721-2-git-send-email-tvrtko.ursulin@linux.intel.com> Sender: stable-owner@vger.kernel.org List-ID: On Tue, Jul 14, 2015 at 11:13:08AM +0100, Tvrtko Ursulin wrote: > From: Tvrtko Ursulin > > Frame buffer modifiers extensions provided in; > > commit e3eb3250d84ef97b766312345774367b6a310db8 > Author: Rob Clark > Date: Thu Feb 5 14:41:52 2015 +0000 > > drm: add support for tiled/compressed/etc modifier in addfb2 > > Missed the structure packing/alignment problem where 64-bit > members were added after the odd number of 32-bit ones. This > makes the compiler produce structures of different sizes under > 32- and 64-bit x86 targets and makes the ioctl need explicit > compat handling. > > v2: Removed the typedef. (Daniel Vetter) > > Signed-off-by: Tvrtko Ursulin > Reviewed-by: Daniel Vetter > Cc: dri-devel@lists.freedesktop.org > Cc: Rob Clark > Cc: Daniel Stone > Cc: Daniel Vetter > Cc: stable@vger.kernel.org Applied to topic/drm-fixes. I pulled in the i915 one (with cc:stable added) already. Thanks, Daniel > --- > drivers/gpu/drm/drm_ioc32.c | 60 +++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 60 insertions(+) > > diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c > index 8dcfa76b09e6..40d18d6173d9 100644 > --- a/drivers/gpu/drm/drm_ioc32.c > +++ b/drivers/gpu/drm/drm_ioc32.c > @@ -70,6 +70,8 @@ > > #define DRM_IOCTL_WAIT_VBLANK32 DRM_IOWR(0x3a, drm_wait_vblank32_t) > > +#define DRM_IOCTL_MODE_ADDFB232 DRM_IOWR(0xb8, drm_mode_fb_cmd232_t) > + > typedef struct drm_version_32 { > int version_major; /**< Major version */ > int version_minor; /**< Minor version */ > @@ -1013,6 +1015,63 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd, > return 0; > } > > +struct drm_mode_fb_cmd232 { > + u32 fb_id; > + u32 width; > + u32 height; > + u32 pixel_format; > + u32 flags; > + u32 handles[4]; > + u32 pitches[4]; > + u32 offsets[4]; > + u64 modifier[4]; > +} __attribute__((packed)); > + > +static int compat_drm_mode_addfb2(struct file *file, unsigned int cmd, > + unsigned long arg) > +{ > + struct drm_mode_fb_cmd232 __user *argp = (void __user *)arg; > + struct drm_mode_fb_cmd232 req32; > + struct drm_mode_fb_cmd2 __user *req64; > + int i; > + int err; > + > + if (copy_from_user(&req32, argp, sizeof(req32))) > + return -EFAULT; > + > + req64 = compat_alloc_user_space(sizeof(*req64)); > + > + if (!access_ok(VERIFY_WRITE, req64, sizeof(*req64)) > + || __put_user(req32.width, &req64->width) > + || __put_user(req32.height, &req64->height) > + || __put_user(req32.pixel_format, &req64->pixel_format) > + || __put_user(req32.flags, &req64->flags)) > + return -EFAULT; > + > + for (i = 0; i < 4; i++) { > + if (__put_user(req32.handles[i], &req64->handles[i])) > + return -EFAULT; > + if (__put_user(req32.pitches[i], &req64->pitches[i])) > + return -EFAULT; > + if (__put_user(req32.offsets[i], &req64->offsets[i])) > + return -EFAULT; > + if (__put_user(req32.modifier[i], &req64->modifier[i])) > + return -EFAULT; > + } > + > + err = drm_ioctl(file, DRM_IOCTL_MODE_ADDFB2, (unsigned long)req64); > + if (err) > + return err; > + > + if (__get_user(req32.fb_id, &req64->fb_id)) > + return -EFAULT; > + > + if (copy_to_user(argp, &req32, sizeof(req32))) > + return -EFAULT; > + > + return 0; > +} > + > static drm_ioctl_compat_t *drm_compat_ioctls[] = { > [DRM_IOCTL_NR(DRM_IOCTL_VERSION32)] = compat_drm_version, > [DRM_IOCTL_NR(DRM_IOCTL_GET_UNIQUE32)] = compat_drm_getunique, > @@ -1045,6 +1104,7 @@ static drm_ioctl_compat_t *drm_compat_ioctls[] = { > [DRM_IOCTL_NR(DRM_IOCTL_UPDATE_DRAW32)] = compat_drm_update_draw, > #endif > [DRM_IOCTL_NR(DRM_IOCTL_WAIT_VBLANK32)] = compat_drm_wait_vblank, > + [DRM_IOCTL_NR(DRM_IOCTL_MODE_ADDFB232)] = compat_drm_mode_addfb2, > }; > > /** > -- > 2.4.2 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 2/2] drm: Provide compat ioctl for addfb2.1 Date: Tue, 14 Jul 2015 12:26:46 +0200 Message-ID: <20150714102646.GV3736@phenom.ffwll.local> References: <1436868788-31721-1-git-send-email-tvrtko.ursulin@linux.intel.com> <1436868788-31721-2-git-send-email-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <1436868788-31721-2-git-send-email-tvrtko.ursulin@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Tvrtko Ursulin Cc: dri-devel@lists.freedesktop.org, Daniel Vetter , Intel-gfx@lists.freedesktop.org, Daniel Stone , stable@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org T24gVHVlLCBKdWwgMTQsIDIwMTUgYXQgMTE6MTM6MDhBTSArMDEwMCwgVHZydGtvIFVyc3VsaW4g d3JvdGU6Cj4gRnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4K PiAKPiBGcmFtZSBidWZmZXIgbW9kaWZpZXJzIGV4dGVuc2lvbnMgcHJvdmlkZWQgaW47Cj4gCj4g ICBjb21taXQgZTNlYjMyNTBkODRlZjk3Yjc2NjMxMjM0NTc3NDM2N2I2YTMxMGRiOAo+ICAgQXV0 aG9yOiBSb2IgQ2xhcmsgPHJvYmRjbGFya0BnbWFpbC5jb20+Cj4gICBEYXRlOiAgIFRodSBGZWIg NSAxNDo0MTo1MiAyMDE1ICswMDAwCj4gCj4gICAgICAgZHJtOiBhZGQgc3VwcG9ydCBmb3IgdGls ZWQvY29tcHJlc3NlZC9ldGMgbW9kaWZpZXIgaW4gYWRkZmIyCj4gCj4gTWlzc2VkIHRoZSBzdHJ1 Y3R1cmUgcGFja2luZy9hbGlnbm1lbnQgcHJvYmxlbSB3aGVyZSA2NC1iaXQKPiBtZW1iZXJzIHdl cmUgYWRkZWQgYWZ0ZXIgdGhlIG9kZCBudW1iZXIgb2YgMzItYml0IG9uZXMuIFRoaXMKPiBtYWtl cyB0aGUgY29tcGlsZXIgcHJvZHVjZSBzdHJ1Y3R1cmVzIG9mIGRpZmZlcmVudCBzaXplcyB1bmRl cgo+IDMyLSBhbmQgNjQtYml0IHg4NiB0YXJnZXRzIGFuZCBtYWtlcyB0aGUgaW9jdGwgbmVlZCBl eHBsaWNpdAo+IGNvbXBhdCBoYW5kbGluZy4KPiAKPiB2MjogUmVtb3ZlZCB0aGUgdHlwZWRlZi4g KERhbmllbCBWZXR0ZXIpCj4gCj4gU2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRr by51cnN1bGluQGludGVsLmNvbT4KPiBSZXZpZXdlZC1ieTogRGFuaWVsIFZldHRlciA8ZGFuaWVs LnZldHRlckBmZndsbC5jaD4KPiBDYzogZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwo+ IENjOiBSb2IgQ2xhcmsgPHJvYmRjbGFya0BnbWFpbC5jb20+Cj4gQ2M6IERhbmllbCBTdG9uZSA8 ZGFuaWVsc0Bjb2xsYWJvcmEuY29tPgo+IENjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVy QGludGVsLmNvbT4KPiBDYzogc3RhYmxlQHZnZXIua2VybmVsLm9yZwoKQXBwbGllZCB0byB0b3Bp Yy9kcm0tZml4ZXMuIEkgcHVsbGVkIGluIHRoZSBpOTE1IG9uZSAod2l0aCBjYzpzdGFibGUKYWRk ZWQpIGFscmVhZHkuCgpUaGFua3MsIERhbmllbAo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vZHJt X2lvYzMyLmMgfCA2MCArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysKPiAgMSBmaWxlIGNoYW5nZWQsIDYwIGluc2VydGlvbnMoKykKPiAKPiBkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2RybV9pb2MzMi5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9pb2MzMi5j Cj4gaW5kZXggOGRjZmE3NmIwOWU2Li40MGQxOGQ2MTczZDkgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2RybV9pb2MzMi5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9pb2MzMi5j Cj4gQEAgLTcwLDYgKzcwLDggQEAKPiAgCj4gICNkZWZpbmUgRFJNX0lPQ1RMX1dBSVRfVkJMQU5L MzIJCURSTV9JT1dSKDB4M2EsIGRybV93YWl0X3ZibGFuazMyX3QpCj4gIAo+ICsjZGVmaW5lIERS TV9JT0NUTF9NT0RFX0FEREZCMjMyCQlEUk1fSU9XUigweGI4LCBkcm1fbW9kZV9mYl9jbWQyMzJf dCkKPiArCj4gIHR5cGVkZWYgc3RydWN0IGRybV92ZXJzaW9uXzMyIHsKPiAgCWludCB2ZXJzaW9u X21ham9yOwkgIC8qKjwgTWFqb3IgdmVyc2lvbiAqLwo+ICAJaW50IHZlcnNpb25fbWlub3I7CSAg LyoqPCBNaW5vciB2ZXJzaW9uICovCj4gQEAgLTEwMTMsNiArMTAxNSw2MyBAQCBzdGF0aWMgaW50 IGNvbXBhdF9kcm1fd2FpdF92Ymxhbmsoc3RydWN0IGZpbGUgKmZpbGUsIHVuc2lnbmVkIGludCBj bWQsCj4gIAlyZXR1cm4gMDsKPiAgfQo+ICAKPiArc3RydWN0IGRybV9tb2RlX2ZiX2NtZDIzMiB7 Cj4gKwl1MzIgZmJfaWQ7Cj4gKwl1MzIgd2lkdGg7Cj4gKwl1MzIgaGVpZ2h0Owo+ICsJdTMyIHBp eGVsX2Zvcm1hdDsKPiArCXUzMiBmbGFnczsKPiArCXUzMiBoYW5kbGVzWzRdOwo+ICsJdTMyIHBp dGNoZXNbNF07Cj4gKwl1MzIgb2Zmc2V0c1s0XTsKPiArCXU2NCBtb2RpZmllcls0XTsKPiArfSBf X2F0dHJpYnV0ZV9fKChwYWNrZWQpKTsKPiArCj4gK3N0YXRpYyBpbnQgY29tcGF0X2RybV9tb2Rl X2FkZGZiMihzdHJ1Y3QgZmlsZSAqZmlsZSwgdW5zaWduZWQgaW50IGNtZCwKPiArCQkJCSAgdW5z aWduZWQgbG9uZyBhcmcpCj4gK3sKPiArCXN0cnVjdCBkcm1fbW9kZV9mYl9jbWQyMzIgX191c2Vy ICphcmdwID0gKHZvaWQgX191c2VyICopYXJnOwo+ICsJc3RydWN0IGRybV9tb2RlX2ZiX2NtZDIz MiByZXEzMjsKPiArCXN0cnVjdCBkcm1fbW9kZV9mYl9jbWQyIF9fdXNlciAqcmVxNjQ7Cj4gKwlp bnQgaTsKPiArCWludCBlcnI7Cj4gKwo+ICsJaWYgKGNvcHlfZnJvbV91c2VyKCZyZXEzMiwgYXJn cCwgc2l6ZW9mKHJlcTMyKSkpCj4gKwkJcmV0dXJuIC1FRkFVTFQ7Cj4gKwo+ICsJcmVxNjQgPSBj b21wYXRfYWxsb2NfdXNlcl9zcGFjZShzaXplb2YoKnJlcTY0KSk7Cj4gKwo+ICsJaWYgKCFhY2Nl c3Nfb2soVkVSSUZZX1dSSVRFLCByZXE2NCwgc2l6ZW9mKCpyZXE2NCkpCj4gKwkgICAgfHwgX19w dXRfdXNlcihyZXEzMi53aWR0aCwgJnJlcTY0LT53aWR0aCkKPiArCSAgICB8fCBfX3B1dF91c2Vy KHJlcTMyLmhlaWdodCwgJnJlcTY0LT5oZWlnaHQpCj4gKwkgICAgfHwgX19wdXRfdXNlcihyZXEz Mi5waXhlbF9mb3JtYXQsICZyZXE2NC0+cGl4ZWxfZm9ybWF0KQo+ICsJICAgIHx8IF9fcHV0X3Vz ZXIocmVxMzIuZmxhZ3MsICZyZXE2NC0+ZmxhZ3MpKQo+ICsJCXJldHVybiAtRUZBVUxUOwo+ICsK PiArCWZvciAoaSA9IDA7IGkgPCA0OyBpKyspIHsKPiArCQlpZiAoX19wdXRfdXNlcihyZXEzMi5o YW5kbGVzW2ldLCAmcmVxNjQtPmhhbmRsZXNbaV0pKQo+ICsJCQlyZXR1cm4gLUVGQVVMVDsKPiAr CQlpZiAoX19wdXRfdXNlcihyZXEzMi5waXRjaGVzW2ldLCAmcmVxNjQtPnBpdGNoZXNbaV0pKQo+ ICsJCQlyZXR1cm4gLUVGQVVMVDsKPiArCQlpZiAoX19wdXRfdXNlcihyZXEzMi5vZmZzZXRzW2ld LCAmcmVxNjQtPm9mZnNldHNbaV0pKQo+ICsJCQlyZXR1cm4gLUVGQVVMVDsKPiArCQlpZiAoX19w dXRfdXNlcihyZXEzMi5tb2RpZmllcltpXSwgJnJlcTY0LT5tb2RpZmllcltpXSkpCj4gKwkJCXJl dHVybiAtRUZBVUxUOwo+ICsJfQo+ICsKPiArCWVyciA9IGRybV9pb2N0bChmaWxlLCBEUk1fSU9D VExfTU9ERV9BRERGQjIsICh1bnNpZ25lZCBsb25nKXJlcTY0KTsKPiArCWlmIChlcnIpCj4gKwkJ cmV0dXJuIGVycjsKPiArCj4gKwlpZiAoX19nZXRfdXNlcihyZXEzMi5mYl9pZCwgJnJlcTY0LT5m Yl9pZCkpCj4gKwkJcmV0dXJuIC1FRkFVTFQ7Cj4gKwo+ICsJaWYgKGNvcHlfdG9fdXNlcihhcmdw LCAmcmVxMzIsIHNpemVvZihyZXEzMikpKQo+ICsJCXJldHVybiAtRUZBVUxUOwo+ICsKPiArCXJl dHVybiAwOwo+ICt9Cj4gKwo+ICBzdGF0aWMgZHJtX2lvY3RsX2NvbXBhdF90ICpkcm1fY29tcGF0 X2lvY3Rsc1tdID0gewo+ICAJW0RSTV9JT0NUTF9OUihEUk1fSU9DVExfVkVSU0lPTjMyKV0gPSBj b21wYXRfZHJtX3ZlcnNpb24sCj4gIAlbRFJNX0lPQ1RMX05SKERSTV9JT0NUTF9HRVRfVU5JUVVF MzIpXSA9IGNvbXBhdF9kcm1fZ2V0dW5pcXVlLAo+IEBAIC0xMDQ1LDYgKzExMDQsNyBAQCBzdGF0 aWMgZHJtX2lvY3RsX2NvbXBhdF90ICpkcm1fY29tcGF0X2lvY3Rsc1tdID0gewo+ICAJW0RSTV9J T0NUTF9OUihEUk1fSU9DVExfVVBEQVRFX0RSQVczMildID0gY29tcGF0X2RybV91cGRhdGVfZHJh dywKPiAgI2VuZGlmCj4gIAlbRFJNX0lPQ1RMX05SKERSTV9JT0NUTF9XQUlUX1ZCTEFOSzMyKV0g PSBjb21wYXRfZHJtX3dhaXRfdmJsYW5rLAo+ICsJW0RSTV9JT0NUTF9OUihEUk1fSU9DVExfTU9E RV9BRERGQjIzMildID0gY29tcGF0X2RybV9tb2RlX2FkZGZiMiwKPiAgfTsKPiAgCj4gIC8qKgo+ IC0tIAo+IDIuNC4yCj4gCj4gX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KPiBJbnRlbC1nZnggbWFpbGluZyBsaXN0Cj4gSW50ZWwtZ2Z4QGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwo+IGh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngKCi0tIApEYW5pZWwgVmV0dGVyClNvZnR3YXJlIEVuZ2luZWVyLCBJbnRlbCBD b3Jwb3JhdGlvbgpodHRwOi8vYmxvZy5mZndsbC5jaApfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAo=