From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rob Clark Subject: [PATCH] drm/vgem: drop DRIVER_PRIME (v2) Date: Thu, 21 May 2015 11:58:30 -0400 Message-ID: <1432223910-7942-1-git-send-email-robdclark@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-qg0-f45.google.com (mail-qg0-f45.google.com [209.85.192.45]) by gabe.freedesktop.org (Postfix) with ESMTP id DBA466E94E for ; Thu, 21 May 2015 08:58:38 -0700 (PDT) Received: by qget53 with SMTP id t53so42727340qge.3 for ; Thu, 21 May 2015 08:58:38 -0700 (PDT) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: Thomas Hellstrom , Zach Reizner , =?UTF-8?q?St=C3=A9phane=20Marchesin?= List-Id: dri-devel@lists.freedesktop.org Rm9yIGFjdHVhbCBzaGFyaW5nIG9mIGJ1ZmZlcnMgd2l0aCBvdGhlciBkcml2ZXJzIChpZS4gYWN0 dWFsIGhhcmR3YXJlKQp3ZSdsbCBuZWVkIHRvIHBpbXAgdGhpbmdzIG91dCBhIGJpdCBiZXR0ZXIg dG8gZGVhbCB3LyBjYWNoaW5nLCBtdWx0aXBsZQptZW1vcnkgZG9tYWlucywgZXRjLiAgU2VlIHRo cmVhZDoKCiAgaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9hcmNoaXZlcy9kcmktZGV2ZWwv MjAxNS1NYXkvMDgzMTYwLmh0bWwKCkJ1dCBmb3IgdGhlIGxsdm1waXBlIHVzZS1jYXNlIHRoaXMg aXNuJ3QgYSBwcm9ibGVtLiAgTm9yIGRvIHdlIHJlYWxseQpuZWVkIHByaW1lL2RyaTMgKGRyaTIg aXMgc3VmZmljaWVudCkuICBTbyB1bnRpbCB0aGUgb3RoZXIgaXNzdWVzIGFyZQpzb3J0ZWQgbGV0 cyByZW1vdmUgRFJJVkVSX1BSSU1FLgoKdjI6IGFsc28gZHJvcCB0aGUgZGVhZCBjb2RlCgpTaWdu ZWQtb2ZmLWJ5OiBSb2IgQ2xhcmsgPHJvYmRjbGFya0BnbWFpbC5jb20+Ci0tLQogZHJpdmVycy9n cHUvZHJtL3ZnZW0vTWFrZWZpbGUgICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL3ZnZW0v dmdlbV9kbWFfYnVmLmMgfCA5NCAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t CiBkcml2ZXJzL2dwdS9kcm0vdmdlbS92Z2VtX2Rydi5jICAgICB8IDExICstLS0tCiBkcml2ZXJz L2dwdS9kcm0vdmdlbS92Z2VtX2Rydi5oICAgICB8IDExIC0tLS0tCiA0IGZpbGVzIGNoYW5nZWQs IDIgaW5zZXJ0aW9ucygrKSwgMTE2IGRlbGV0aW9ucygtKQogZGVsZXRlIG1vZGUgMTAwNjQ0IGRy aXZlcnMvZ3B1L2RybS92Z2VtL3ZnZW1fZG1hX2J1Zi5jCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL3ZnZW0vTWFrZWZpbGUgYi9kcml2ZXJzL2dwdS9kcm0vdmdlbS9NYWtlZmlsZQppbmRl eCAxMDU1Y2I3Li4zZjRjN2I4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdmdlbS9NYWtl ZmlsZQorKysgYi9kcml2ZXJzL2dwdS9kcm0vdmdlbS9NYWtlZmlsZQpAQCAtMSw0ICsxLDQgQEAK IGNjZmxhZ3MteSA6PSAtSWluY2x1ZGUvZHJtCi12Z2VtLXkgOj0gdmdlbV9kcnYubyB2Z2VtX2Rt YV9idWYubwordmdlbS15IDo9IHZnZW1fZHJ2Lm8KIAogb2JqLSQoQ09ORklHX0RSTV9WR0VNKQkr PSB2Z2VtLm8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS92Z2VtL3ZnZW1fZG1hX2J1Zi5j IGIvZHJpdmVycy9ncHUvZHJtL3ZnZW0vdmdlbV9kbWFfYnVmLmMKZGVsZXRlZCBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAyNTQ0MzguLjAwMDAwMDAKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3ZnZW0v dmdlbV9kbWFfYnVmLmMKKysrIC9kZXYvbnVsbApAQCAtMSw5NCArMCwwIEBACi0vKgotICogQ29w eXJpZ2h0IMKpIDIwMTIgSW50ZWwgQ29ycG9yYXRpb24KLSAqIENvcHlyaWdodCDCqSAyMDE0IFRo ZSBDaHJvbWl1bSBPUyBBdXRob3JzCi0gKgotICogUGVybWlzc2lvbiBpcyBoZXJlYnkgZ3JhbnRl ZCwgZnJlZSBvZiBjaGFyZ2UsIHRvIGFueSBwZXJzb24gb2J0YWluaW5nIGEKLSAqIGNvcHkgb2Yg dGhpcyBzb2Z0d2FyZSBhbmQgYXNzb2NpYXRlZCBkb2N1bWVudGF0aW9uIGZpbGVzICh0aGUgIlNv ZnR3YXJlIiksCi0gKiB0byBkZWFsIGluIHRoZSBTb2Z0d2FyZSB3aXRob3V0IHJlc3RyaWN0aW9u LCBpbmNsdWRpbmcgd2l0aG91dCBsaW1pdGF0aW9uCi0gKiB0aGUgcmlnaHRzIHRvIHVzZSwgY29w eSwgbW9kaWZ5LCBtZXJnZSwgcHVibGlzaCwgZGlzdHJpYnV0ZSwgc3VibGljZW5zZSwKLSAqIGFu ZC9vciBzZWxsIGNvcGllcyBvZiB0aGUgU29mdHdhcmUsIGFuZCB0byBwZXJtaXQgcGVyc29ucyB0 byB3aG9tIHRoZQotICogU29mdHdhcmUgaXMgZnVybmlzaGVkIHRvIGRvIHNvLCBzdWJqZWN0IHRv IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9uczoKLSAqCi0gKiBUaGUgYWJvdmUgY29weXJpZ2h0IG5v dGljZSBhbmQgdGhpcyBwZXJtaXNzaW9uIG5vdGljZSAoaW5jbHVkaW5nIHRoZSBuZXh0Ci0gKiBw YXJhZ3JhcGgpIHNoYWxsIGJlIGluY2x1ZGVkIGluIGFsbCBjb3BpZXMgb3Igc3Vic3RhbnRpYWwg cG9ydGlvbnMgb2YgdGhlCi0gKiBTb2Z0d2FyZS4KLSAqCi0gKiBUSEUgU09GVFdBUkUgSVMgUFJP VklERUQgIkFTIElTIiwgV0lUSE9VVCBXQVJSQU5UWSBPRiBBTlkgS0lORCwgRVhQUkVTUyBPUgot ICogSU1QTElFRCwgSU5DTFVESU5HIEJVVCBOT1QgTElNSVRFRCBUTyBUSEUgV0FSUkFOVElFUyBP RiBNRVJDSEFOVEFCSUxJVFksCi0gKiBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBB TkQgTk9OSU5GUklOR0VNRU5ULiAgSU4gTk8gRVZFTlQgU0hBTEwKLSAqIFRIRSBBVVRIT1JTIE9S IENPUFlSSUdIVCBIT0xERVJTIEJFIExJQUJMRSBGT1IgQU5ZIENMQUlNLCBEQU1BR0VTIE9SIE9U SEVSCi0gKiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQU4gQUNUSU9OIE9GIENPTlRSQUNULCBUT1JU IE9SIE9USEVSV0lTRSwgQVJJU0lORwotICogRlJPTSwgT1VUIE9GIE9SIElOIENPTk5FQ1RJT04g V0lUSCBUSEUgU09GVFdBUkUgT1IgVEhFIFVTRSBPUiBPVEhFUiBERUFMSU5HUwotICogSU4gVEhF IFNPRlRXQVJFLgotICoKLSAqIEF1dGhvcnM6Ci0gKiAgICBCZW4gV2lkYXdza3kgPGJlbkBid2lk YXdzay5uZXQ+Ci0gKgotICovCi0KLSNpbmNsdWRlIDxsaW51eC9kbWEtYnVmLmg+Ci0jaW5jbHVk ZSAidmdlbV9kcnYuaCIKLQotc3RydWN0IHNnX3RhYmxlICp2Z2VtX2dlbV9wcmltZV9nZXRfc2df dGFibGUoc3RydWN0IGRybV9nZW1fb2JqZWN0ICpnb2JqKQotewotCXN0cnVjdCBkcm1fdmdlbV9n ZW1fb2JqZWN0ICpvYmogPSB0b192Z2VtX2JvKGdvYmopOwotCUJVR19PTihvYmotPnBhZ2VzID09 IE5VTEwpOwotCi0JcmV0dXJuIGRybV9wcmltZV9wYWdlc190b19zZyhvYmotPnBhZ2VzLCBvYmot PmJhc2Uuc2l6ZSAvIFBBR0VfU0laRSk7Ci19Ci0KLWludCB2Z2VtX2dlbV9wcmltZV9waW4oc3Ry dWN0IGRybV9nZW1fb2JqZWN0ICpnb2JqKQotewotCXN0cnVjdCBkcm1fdmdlbV9nZW1fb2JqZWN0 ICpvYmogPSB0b192Z2VtX2JvKGdvYmopOwotCXJldHVybiB2Z2VtX2dlbV9nZXRfcGFnZXMob2Jq KTsKLX0KLQotdm9pZCB2Z2VtX2dlbV9wcmltZV91bnBpbihzdHJ1Y3QgZHJtX2dlbV9vYmplY3Qg KmdvYmopCi17Ci0Jc3RydWN0IGRybV92Z2VtX2dlbV9vYmplY3QgKm9iaiA9IHRvX3ZnZW1fYm8o Z29iaik7Ci0JdmdlbV9nZW1fcHV0X3BhZ2VzKG9iaik7Ci19Ci0KLXZvaWQgKnZnZW1fZ2VtX3By aW1lX3ZtYXAoc3RydWN0IGRybV9nZW1fb2JqZWN0ICpnb2JqKQotewotCXN0cnVjdCBkcm1fdmdl bV9nZW1fb2JqZWN0ICpvYmogPSB0b192Z2VtX2JvKGdvYmopOwotCUJVR19PTihvYmotPnBhZ2Vz ID09IE5VTEwpOwotCi0JcmV0dXJuIHZtYXAob2JqLT5wYWdlcywgb2JqLT5iYXNlLnNpemUgLyBQ QUdFX1NJWkUsIDAsIFBBR0VfS0VSTkVMKTsKLX0KLQotdm9pZCB2Z2VtX2dlbV9wcmltZV92dW5t YXAoc3RydWN0IGRybV9nZW1fb2JqZWN0ICpvYmosIHZvaWQgKnZhZGRyKQotewotCXZ1bm1hcCh2 YWRkcik7Ci19Ci0KLXN0cnVjdCBkcm1fZ2VtX29iamVjdCAqdmdlbV9nZW1fcHJpbWVfaW1wb3J0 KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCi0JCQkJCSAgICAgc3RydWN0IGRtYV9idWYgKmRtYV9i dWYpCi17Ci0Jc3RydWN0IGRybV92Z2VtX2dlbV9vYmplY3QgKm9iaiA9IE5VTEw7Ci0JaW50IHJl dDsKLQotCW9iaiA9IGt6YWxsb2Moc2l6ZW9mKCpvYmopLCBHRlBfS0VSTkVMKTsKLQlpZiAob2Jq ID09IE5VTEwpIHsKLQkJcmV0ID0gLUVOT01FTTsKLQkJZ290byBmYWlsOwotCX0KLQotCXJldCA9 IGRybV9nZW1fb2JqZWN0X2luaXQoZGV2LCAmb2JqLT5iYXNlLCBkbWFfYnVmLT5zaXplKTsKLQlp ZiAocmV0KSB7Ci0JCXJldCA9IC1FTk9NRU07Ci0JCWdvdG8gZmFpbF9mcmVlOwotCX0KLQotCWdl dF9kbWFfYnVmKGRtYV9idWYpOwotCi0Jb2JqLT5iYXNlLmRtYV9idWYgPSBkbWFfYnVmOwotCW9i ai0+dXNlX2RtYV9idWYgPSB0cnVlOwotCi0JcmV0dXJuICZvYmotPmJhc2U7Ci0KLWZhaWxfZnJl ZToKLQlrZnJlZShvYmopOwotZmFpbDoKLQlyZXR1cm4gRVJSX1BUUihyZXQpOwotfQpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL3ZnZW0vdmdlbV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS92 Z2VtL3ZnZW1fZHJ2LmMKaW5kZXggY2IzYjQzNS4uN2EyMDdjYSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL3ZnZW0vdmdlbV9kcnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdmdlbS92Z2Vt X2Rydi5jCkBAIC0zMDIsMjIgKzMwMiwxMyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGZpbGVfb3Bl cmF0aW9ucyB2Z2VtX2RyaXZlcl9mb3BzID0gewogfTsKIAogc3RhdGljIHN0cnVjdCBkcm1fZHJp dmVyIHZnZW1fZHJpdmVyID0gewotCS5kcml2ZXJfZmVhdHVyZXMJCT0gRFJJVkVSX0dFTSB8IERS SVZFUl9QUklNRSwKKwkuZHJpdmVyX2ZlYXR1cmVzCQk9IERSSVZFUl9HRU0sCiAJLmdlbV9mcmVl X29iamVjdAkJPSB2Z2VtX2dlbV9mcmVlX29iamVjdCwKIAkuZ2VtX3ZtX29wcwkJCT0gJnZnZW1f Z2VtX3ZtX29wcywKIAkuaW9jdGxzCQkJCT0gdmdlbV9pb2N0bHMsCiAJLmZvcHMJCQkJPSAmdmdl bV9kcml2ZXJfZm9wcywKIAkuZHVtYl9jcmVhdGUJCQk9IHZnZW1fZ2VtX2R1bWJfY3JlYXRlLAog CS5kdW1iX21hcF9vZmZzZXQJCT0gdmdlbV9nZW1fZHVtYl9tYXAsCi0JLnByaW1lX2hhbmRsZV90 b19mZAkJPSBkcm1fZ2VtX3ByaW1lX2hhbmRsZV90b19mZCwKLQkucHJpbWVfZmRfdG9faGFuZGxl CQk9IGRybV9nZW1fcHJpbWVfZmRfdG9faGFuZGxlLAotCS5nZW1fcHJpbWVfZXhwb3J0CQk9IGRy bV9nZW1fcHJpbWVfZXhwb3J0LAotCS5nZW1fcHJpbWVfaW1wb3J0CQk9IHZnZW1fZ2VtX3ByaW1l X2ltcG9ydCwKLQkuZ2VtX3ByaW1lX3BpbgkJCT0gdmdlbV9nZW1fcHJpbWVfcGluLAotCS5nZW1f cHJpbWVfdW5waW4JCT0gdmdlbV9nZW1fcHJpbWVfdW5waW4sCi0JLmdlbV9wcmltZV9nZXRfc2df dGFibGUJCT0gdmdlbV9nZW1fcHJpbWVfZ2V0X3NnX3RhYmxlLAotCS5nZW1fcHJpbWVfdm1hcAkJ CT0gdmdlbV9nZW1fcHJpbWVfdm1hcCwKLQkuZ2VtX3ByaW1lX3Z1bm1hcAkJPSB2Z2VtX2dlbV9w cmltZV92dW5tYXAsCiAJLm5hbWUJPSBEUklWRVJfTkFNRSwKIAkuZGVzYwk9IERSSVZFUl9ERVND LAogCS5kYXRlCT0gRFJJVkVSX0RBVEUsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdmdl bS92Z2VtX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL3ZnZW0vdmdlbV9kcnYuaAppbmRleCA1N2Fi NGQ4Li5lOWY5MmY3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdmdlbS92Z2VtX2Rydi5o CisrKyBiL2RyaXZlcnMvZ3B1L2RybS92Z2VtL3ZnZW1fZHJ2LmgKQEAgLTQzLDE1ICs0Myw0IEBA IHN0cnVjdCBkcm1fdmdlbV9nZW1fb2JqZWN0IHsKIGV4dGVybiB2b2lkIHZnZW1fZ2VtX3B1dF9w YWdlcyhzdHJ1Y3QgZHJtX3ZnZW1fZ2VtX29iamVjdCAqb2JqKTsKIGV4dGVybiBpbnQgdmdlbV9n ZW1fZ2V0X3BhZ2VzKHN0cnVjdCBkcm1fdmdlbV9nZW1fb2JqZWN0ICpvYmopOwogCi0vKiB2Z2Vt X2RtYV9idWYuYyAqLwotZXh0ZXJuIHN0cnVjdCBzZ190YWJsZSAqdmdlbV9nZW1fcHJpbWVfZ2V0 X3NnX3RhYmxlKAotCQkJc3RydWN0IGRybV9nZW1fb2JqZWN0ICpnb2JqKTsKLWV4dGVybiBpbnQg dmdlbV9nZW1fcHJpbWVfcGluKHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqZ29iaik7Ci1leHRlcm4g dm9pZCB2Z2VtX2dlbV9wcmltZV91bnBpbihzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKmdvYmopOwot ZXh0ZXJuIHZvaWQgKnZnZW1fZ2VtX3ByaW1lX3ZtYXAoc3RydWN0IGRybV9nZW1fb2JqZWN0ICpn b2JqKTsKLWV4dGVybiB2b2lkIHZnZW1fZ2VtX3ByaW1lX3Z1bm1hcChzdHJ1Y3QgZHJtX2dlbV9v YmplY3QgKm9iaiwgdm9pZCAqdmFkZHIpOwotZXh0ZXJuIHN0cnVjdCBkcm1fZ2VtX29iamVjdCAq dmdlbV9nZW1fcHJpbWVfaW1wb3J0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCi0JCQkJCQkgICAg c3RydWN0IGRtYV9idWYgKmRtYV9idWYpOwotCi0KICNlbmRpZgotLSAKMi40LjEKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5n IGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==