From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH] drm: Promote drm_mm alignment to u64 Date: Tue, 19 Jan 2016 14:35:46 +0000 Message-ID: <1453214146-31112-1-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-f53.google.com (mail-wm0-f53.google.com [74.125.82.53]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3204E6E769 for ; Tue, 19 Jan 2016 06:35:58 -0800 (PST) Received: by mail-wm0-f53.google.com with SMTP id u188so145927084wmu.1 for ; Tue, 19 Jan 2016 06:35:58 -0800 (PST) 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 List-Id: dri-devel@lists.freedesktop.org SW4gcGxhY2VzIChlLmcuIGk5MTUua28pLCB0aGUgYWxpZ25tZW50IGlzIGV4cG9ydGVkIHRvIHVz ZXJzcGFjZSBhcyB1NjQKYW5kIHRoZXJlIG5vdyBleGlzdHMgaGFyZHdhcmUgZm9yIHdoaWNoIHdl IGNhbiBpbmRlZWQgdXRpbGl6ZSBhIHU2NAphbGlnbm1lbnQuIEFzIHN1Y2gsIHdlIG5lZWQgdG8g a2VlcCA2NGJpdCBpbnRlZ2VycyB0aHJvdWdob3V0IHdoZW4KaGFuZGxpbmcgYWxpZ25tZW50LgoK VGVzdGNhc2U6IGlndC9nZW1fZXhlY19hbGlnbm1lbnQKU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2ls c29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9t bS5jIHwgMzcgKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLQogaW5jbHVkZS9k cm0vZHJtX21tLmggICAgIHwgMTYgKysrKysrKystLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAy NSBpbnNlcnRpb25zKCspLCAyOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vZHJtX21tLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX21tLmMKaW5kZXggNjZjOTkzODQw ZjQ3Li4xMDk1MDg0OTQ3ZmEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fbW0uYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX21tLmMKQEAgLTkzLDEyICs5MywxMiBAQAogCiBzdGF0 aWMgc3RydWN0IGRybV9tbV9ub2RlICpkcm1fbW1fc2VhcmNoX2ZyZWVfZ2VuZXJpYyhjb25zdCBz dHJ1Y3QgZHJtX21tICptbSwKIAkJCQkJCXU2NCBzaXplLAotCQkJCQkJdW5zaWduZWQgYWxpZ25t ZW50LAorCQkJCQkJdTY0IGFsaWdubWVudCwKIAkJCQkJCXVuc2lnbmVkIGxvbmcgY29sb3IsCiAJ CQkJCQllbnVtIGRybV9tbV9zZWFyY2hfZmxhZ3MgZmxhZ3MpOwogc3RhdGljIHN0cnVjdCBkcm1f bW1fbm9kZSAqZHJtX21tX3NlYXJjaF9mcmVlX2luX3JhbmdlX2dlbmVyaWMoY29uc3Qgc3RydWN0 IGRybV9tbSAqbW0sCiAJCQkJCQl1NjQgc2l6ZSwKLQkJCQkJCXVuc2lnbmVkIGFsaWdubWVudCwK KwkJCQkJCXU2NCBhbGlnbm1lbnQsCiAJCQkJCQl1bnNpZ25lZCBsb25nIGNvbG9yLAogCQkJCQkJ dTY0IHN0YXJ0LAogCQkJCQkJdTY0IGVuZCwKQEAgLTE3Miw3ICsxNzIsNyBAQCBzdGF0aWMgdm9p ZCBkcm1fbW1faW50ZXJ2YWxfdHJlZV9hZGRfbm9kZShzdHJ1Y3QgZHJtX21tX25vZGUgKmhvbGVf bm9kZSwKIAogc3RhdGljIHZvaWQgZHJtX21tX2luc2VydF9oZWxwZXIoc3RydWN0IGRybV9tbV9u b2RlICpob2xlX25vZGUsCiAJCQkJIHN0cnVjdCBkcm1fbW1fbm9kZSAqbm9kZSwKLQkJCQkgdTY0 IHNpemUsIHVuc2lnbmVkIGFsaWdubWVudCwKKwkJCQkgdTY0IHNpemUsIHU2NCBhbGlnbm1lbnQs CiAJCQkJIHVuc2lnbmVkIGxvbmcgY29sb3IsCiAJCQkJIGVudW0gZHJtX21tX2FsbG9jYXRvcl9m bGFncyBmbGFncykKIHsKQEAgLTE5MSwxMCArMTkxLDkgQEAgc3RhdGljIHZvaWQgZHJtX21tX2lu c2VydF9oZWxwZXIoc3RydWN0IGRybV9tbV9ub2RlICpob2xlX25vZGUsCiAJCWFkal9zdGFydCA9 IGFkal9lbmQgLSBzaXplOwogCiAJaWYgKGFsaWdubWVudCkgewotCQl1NjQgdG1wID0gYWRqX3N0 YXJ0OwotCQl1bnNpZ25lZCByZW07CisJCXU2NCByZW07CiAKLQkJcmVtID0gZG9fZGl2KHRtcCwg YWxpZ25tZW50KTsKKwkJZGl2NjRfdTY0X3JlbShhZGpfc3RhcnQsIGFsaWdubWVudCwgJnJlbSk7 CiAJCWlmIChyZW0pIHsKIAkJCWlmIChmbGFncyAmIERSTV9NTV9DUkVBVEVfVE9QKQogCQkJCWFk al9zdGFydCAtPSByZW07CkBAIC0zMDgsNyArMzA3LDcgQEAgRVhQT1JUX1NZTUJPTChkcm1fbW1f cmVzZXJ2ZV9ub2RlKTsKICAqIDAgb24gc3VjY2VzcywgLUVOT1NQQyBpZiB0aGVyZSdzIG5vIHN1 aXRhYmxlIGhvbGUuCiAgKi8KIGludCBkcm1fbW1faW5zZXJ0X25vZGVfZ2VuZXJpYyhzdHJ1Y3Qg ZHJtX21tICptbSwgc3RydWN0IGRybV9tbV9ub2RlICpub2RlLAotCQkJICAgICAgIHU2NCBzaXpl LCB1bnNpZ25lZCBhbGlnbm1lbnQsCisJCQkgICAgICAgdTY0IHNpemUsIHU2NCBhbGlnbm1lbnQs CiAJCQkgICAgICAgdW5zaWduZWQgbG9uZyBjb2xvciwKIAkJCSAgICAgICBlbnVtIGRybV9tbV9z ZWFyY2hfZmxhZ3Mgc2ZsYWdzLAogCQkJICAgICAgIGVudW0gZHJtX21tX2FsbG9jYXRvcl9mbGFn cyBhZmxhZ3MpCkBAIC0zMjcsNyArMzI2LDcgQEAgRVhQT1JUX1NZTUJPTChkcm1fbW1faW5zZXJ0 X25vZGVfZ2VuZXJpYyk7CiAKIHN0YXRpYyB2b2lkIGRybV9tbV9pbnNlcnRfaGVscGVyX3Jhbmdl KHN0cnVjdCBkcm1fbW1fbm9kZSAqaG9sZV9ub2RlLAogCQkJCSAgICAgICBzdHJ1Y3QgZHJtX21t X25vZGUgKm5vZGUsCi0JCQkJICAgICAgIHU2NCBzaXplLCB1bnNpZ25lZCBhbGlnbm1lbnQsCisJ CQkJICAgICAgIHU2NCBzaXplLCB1NjQgYWxpZ25tZW50LAogCQkJCSAgICAgICB1bnNpZ25lZCBs b25nIGNvbG9yLAogCQkJCSAgICAgICB1NjQgc3RhcnQsIHU2NCBlbmQsCiAJCQkJICAgICAgIGVu dW0gZHJtX21tX2FsbG9jYXRvcl9mbGFncyBmbGFncykKQEAgLTM1MiwxMCArMzUxLDkgQEAgc3Rh dGljIHZvaWQgZHJtX21tX2luc2VydF9oZWxwZXJfcmFuZ2Uoc3RydWN0IGRybV9tbV9ub2RlICpo b2xlX25vZGUsCiAJCWFkal9zdGFydCA9IGFkal9lbmQgLSBzaXplOwogCiAJaWYgKGFsaWdubWVu dCkgewotCQl1NjQgdG1wID0gYWRqX3N0YXJ0OwotCQl1bnNpZ25lZCByZW07CisJCXU2NCByZW07 CiAKLQkJcmVtID0gZG9fZGl2KHRtcCwgYWxpZ25tZW50KTsKKwkJZGl2NjRfdTY0X3JlbShhZGpf c3RhcnQsIGFsaWdubWVudCwgJnJlbSk7CiAJCWlmIChyZW0pIHsKIAkJCWlmIChmbGFncyAmIERS TV9NTV9DUkVBVEVfVE9QKQogCQkJCWFkal9zdGFydCAtPSByZW07CkBAIC00MDksNyArNDA3LDcg QEAgc3RhdGljIHZvaWQgZHJtX21tX2luc2VydF9oZWxwZXJfcmFuZ2Uoc3RydWN0IGRybV9tbV9u b2RlICpob2xlX25vZGUsCiAgKiAwIG9uIHN1Y2Nlc3MsIC1FTk9TUEMgaWYgdGhlcmUncyBubyBz dWl0YWJsZSBob2xlLgogICovCiBpbnQgZHJtX21tX2luc2VydF9ub2RlX2luX3JhbmdlX2dlbmVy aWMoc3RydWN0IGRybV9tbSAqbW0sIHN0cnVjdCBkcm1fbW1fbm9kZSAqbm9kZSwKLQkJCQkJdTY0 IHNpemUsIHVuc2lnbmVkIGFsaWdubWVudCwKKwkJCQkJdTY0IHNpemUsIHU2NCBhbGlnbm1lbnQs CiAJCQkJCXVuc2lnbmVkIGxvbmcgY29sb3IsCiAJCQkJCXU2NCBzdGFydCwgdTY0IGVuZCwKIAkJ CQkJZW51bSBkcm1fbW1fc2VhcmNoX2ZsYWdzIHNmbGFncywKQEAgLTQ3MywxNiArNDcxLDE1IEBA IHZvaWQgZHJtX21tX3JlbW92ZV9ub2RlKHN0cnVjdCBkcm1fbW1fbm9kZSAqbm9kZSkKIH0KIEVY UE9SVF9TWU1CT0woZHJtX21tX3JlbW92ZV9ub2RlKTsKIAotc3RhdGljIGludCBjaGVja19mcmVl X2hvbGUodTY0IHN0YXJ0LCB1NjQgZW5kLCB1NjQgc2l6ZSwgdW5zaWduZWQgYWxpZ25tZW50KQor c3RhdGljIGludCBjaGVja19mcmVlX2hvbGUodTY0IHN0YXJ0LCB1NjQgZW5kLCB1NjQgc2l6ZSwg dTY0IGFsaWdubWVudCkKIHsKIAlpZiAoZW5kIC0gc3RhcnQgPCBzaXplKQogCQlyZXR1cm4gMDsK IAogCWlmIChhbGlnbm1lbnQpIHsKLQkJdTY0IHRtcCA9IHN0YXJ0OwotCQl1bnNpZ25lZCByZW07 CisJCXU2NCByZW07CiAKLQkJcmVtID0gZG9fZGl2KHRtcCwgYWxpZ25tZW50KTsKKwkJZGl2NjRf dTY0X3JlbShzdGFydCwgYWxpZ25tZW50LCAmcmVtKTsKIAkJaWYgKHJlbSkKIAkJCXN0YXJ0ICs9 IGFsaWdubWVudCAtIHJlbTsKIAl9CkBAIC00OTIsNyArNDg5LDcgQEAgc3RhdGljIGludCBjaGVj a19mcmVlX2hvbGUodTY0IHN0YXJ0LCB1NjQgZW5kLCB1NjQgc2l6ZSwgdW5zaWduZWQgYWxpZ25t ZW50KQogCiBzdGF0aWMgc3RydWN0IGRybV9tbV9ub2RlICpkcm1fbW1fc2VhcmNoX2ZyZWVfZ2Vu ZXJpYyhjb25zdCBzdHJ1Y3QgZHJtX21tICptbSwKIAkJCQkJCSAgICAgIHU2NCBzaXplLAotCQkJ CQkJICAgICAgdW5zaWduZWQgYWxpZ25tZW50LAorCQkJCQkJICAgICAgdTY0IGFsaWdubWVudCwK IAkJCQkJCSAgICAgIHVuc2lnbmVkIGxvbmcgY29sb3IsCiAJCQkJCQkgICAgICBlbnVtIGRybV9t bV9zZWFyY2hfZmxhZ3MgZmxhZ3MpCiB7CkBAIC01MzQsNyArNTMxLDcgQEAgc3RhdGljIHN0cnVj dCBkcm1fbW1fbm9kZSAqZHJtX21tX3NlYXJjaF9mcmVlX2dlbmVyaWMoY29uc3Qgc3RydWN0IGRy bV9tbSAqbW0sCiAKIHN0YXRpYyBzdHJ1Y3QgZHJtX21tX25vZGUgKmRybV9tbV9zZWFyY2hfZnJl ZV9pbl9yYW5nZV9nZW5lcmljKGNvbnN0IHN0cnVjdCBkcm1fbW0gKm1tLAogCQkJCQkJCXU2NCBz aXplLAotCQkJCQkJCXVuc2lnbmVkIGFsaWdubWVudCwKKwkJCQkJCQl1NjQgYWxpZ25tZW50LAog CQkJCQkJCXVuc2lnbmVkIGxvbmcgY29sb3IsCiAJCQkJCQkJdTY0IHN0YXJ0LAogCQkJCQkJCXU2 NCBlbmQsCkBAIC02NTIsNyArNjQ5LDcgQEAgRVhQT1JUX1NZTUJPTChkcm1fbW1fcmVwbGFjZV9u b2RlKTsKICAqLwogdm9pZCBkcm1fbW1faW5pdF9zY2FuKHN0cnVjdCBkcm1fbW0gKm1tLAogCQkg ICAgICB1NjQgc2l6ZSwKLQkJICAgICAgdW5zaWduZWQgYWxpZ25tZW50LAorCQkgICAgICB1NjQg YWxpZ25tZW50LAogCQkgICAgICB1bnNpZ25lZCBsb25nIGNvbG9yKQogewogCW1tLT5zY2FuX2Nv bG9yID0gY29sb3I7CkBAIC02ODUsNyArNjgyLDcgQEAgRVhQT1JUX1NZTUJPTChkcm1fbW1faW5p dF9zY2FuKTsKICAqLwogdm9pZCBkcm1fbW1faW5pdF9zY2FuX3dpdGhfcmFuZ2Uoc3RydWN0IGRy bV9tbSAqbW0sCiAJCQkJIHU2NCBzaXplLAotCQkJCSB1bnNpZ25lZCBhbGlnbm1lbnQsCisJCQkJ IHU2NCBhbGlnbm1lbnQsCiAJCQkJIHVuc2lnbmVkIGxvbmcgY29sb3IsCiAJCQkJIHU2NCBzdGFy dCwKIAkJCQkgdTY0IGVuZCkKZGlmZiAtLWdpdCBhL2luY2x1ZGUvZHJtL2RybV9tbS5oIGIvaW5j bHVkZS9kcm0vZHJtX21tLmgKaW5kZXggMjA1ZGRjZjZkNTVkLi44ZmI2NTlmZjY1NGYgMTAwNjQ0 Ci0tLSBhL2luY2x1ZGUvZHJtL2RybV9tbS5oCisrKyBiL2luY2x1ZGUvZHJtL2RybV9tbS5oCkBA IC04NiwxMiArODYsMTIgQEAgc3RydWN0IGRybV9tbSB7CiAJc3RydWN0IHJiX3Jvb3QgaW50ZXJ2 YWxfdHJlZTsKIAogCXVuc2lnbmVkIGludCBzY2FuX2NoZWNrX3JhbmdlIDogMTsKLQl1bnNpZ25l ZCBzY2FuX2FsaWdubWVudDsKKwl1bnNpZ25lZCBzY2FubmVkX2Jsb2NrczsKIAl1bnNpZ25lZCBs b25nIHNjYW5fY29sb3I7CisJdTY0IHNjYW5fYWxpZ25tZW50OwogCXU2NCBzY2FuX3NpemU7CiAJ dTY0IHNjYW5faGl0X3N0YXJ0OwogCXU2NCBzY2FuX2hpdF9lbmQ7Ci0JdW5zaWduZWQgc2Nhbm5l ZF9ibG9ja3M7CiAJdTY0IHNjYW5fc3RhcnQ7CiAJdTY0IHNjYW5fZW5kOwogCXN0cnVjdCBkcm1f bW1fbm9kZSAqcHJldl9zY2FubmVkX25vZGU7CkBAIC0yMjMsNyArMjIzLDcgQEAgaW50IGRybV9t bV9yZXNlcnZlX25vZGUoc3RydWN0IGRybV9tbSAqbW0sIHN0cnVjdCBkcm1fbW1fbm9kZSAqbm9k ZSk7CiBpbnQgZHJtX21tX2luc2VydF9ub2RlX2dlbmVyaWMoc3RydWN0IGRybV9tbSAqbW0sCiAJ CQkgICAgICAgc3RydWN0IGRybV9tbV9ub2RlICpub2RlLAogCQkJICAgICAgIHU2NCBzaXplLAot CQkJICAgICAgIHVuc2lnbmVkIGFsaWdubWVudCwKKwkJCSAgICAgICB1NjQgYWxpZ25tZW50LAog CQkJICAgICAgIHVuc2lnbmVkIGxvbmcgY29sb3IsCiAJCQkgICAgICAgZW51bSBkcm1fbW1fc2Vh cmNoX2ZsYWdzIHNmbGFncywKIAkJCSAgICAgICBlbnVtIGRybV9tbV9hbGxvY2F0b3JfZmxhZ3Mg YWZsYWdzKTsKQEAgLTI0Niw3ICsyNDYsNyBAQCBpbnQgZHJtX21tX2luc2VydF9ub2RlX2dlbmVy aWMoc3RydWN0IGRybV9tbSAqbW0sCiBzdGF0aWMgaW5saW5lIGludCBkcm1fbW1faW5zZXJ0X25v ZGUoc3RydWN0IGRybV9tbSAqbW0sCiAJCQkJICAgICBzdHJ1Y3QgZHJtX21tX25vZGUgKm5vZGUs CiAJCQkJICAgICB1NjQgc2l6ZSwKLQkJCQkgICAgIHVuc2lnbmVkIGFsaWdubWVudCwKKwkJCQkg ICAgIHU2NCBhbGlnbm1lbnQsCiAJCQkJICAgICBlbnVtIGRybV9tbV9zZWFyY2hfZmxhZ3MgZmxh Z3MpCiB7CiAJcmV0dXJuIGRybV9tbV9pbnNlcnRfbm9kZV9nZW5lcmljKG1tLCBub2RlLCBzaXpl LCBhbGlnbm1lbnQsIDAsIGZsYWdzLApAQCAtMjU2LDcgKzI1Niw3IEBAIHN0YXRpYyBpbmxpbmUg aW50IGRybV9tbV9pbnNlcnRfbm9kZShzdHJ1Y3QgZHJtX21tICptbSwKIGludCBkcm1fbW1faW5z ZXJ0X25vZGVfaW5fcmFuZ2VfZ2VuZXJpYyhzdHJ1Y3QgZHJtX21tICptbSwKIAkJCQkJc3RydWN0 IGRybV9tbV9ub2RlICpub2RlLAogCQkJCQl1NjQgc2l6ZSwKLQkJCQkJdW5zaWduZWQgYWxpZ25t ZW50LAorCQkJCQl1NjQgYWxpZ25tZW50LAogCQkJCQl1bnNpZ25lZCBsb25nIGNvbG9yLAogCQkJ CQl1NjQgc3RhcnQsCiAJCQkJCXU2NCBlbmQsCkBAIC0yODMsNyArMjgzLDcgQEAgaW50IGRybV9t bV9pbnNlcnRfbm9kZV9pbl9yYW5nZV9nZW5lcmljKHN0cnVjdCBkcm1fbW0gKm1tLAogc3RhdGlj IGlubGluZSBpbnQgZHJtX21tX2luc2VydF9ub2RlX2luX3JhbmdlKHN0cnVjdCBkcm1fbW0gKm1t LAogCQkJCQkgICAgICBzdHJ1Y3QgZHJtX21tX25vZGUgKm5vZGUsCiAJCQkJCSAgICAgIHU2NCBz aXplLAotCQkJCQkgICAgICB1bnNpZ25lZCBhbGlnbm1lbnQsCisJCQkJCSAgICAgIHU2NCBhbGln bm1lbnQsCiAJCQkJCSAgICAgIHU2NCBzdGFydCwKIAkJCQkJICAgICAgdTY0IGVuZCwKIAkJCQkJ ICAgICAgZW51bSBkcm1fbW1fc2VhcmNoX2ZsYWdzIGZsYWdzKQpAQCAtMzA5LDExICszMDksMTEg QEAgZHJtX21tX2ludGVydmFsX25leHQoc3RydWN0IGRybV9tbV9ub2RlICpub2RlLCB1NjQgc3Rh cnQsIHU2NCBsYXN0KTsKIAogdm9pZCBkcm1fbW1faW5pdF9zY2FuKHN0cnVjdCBkcm1fbW0gKm1t LAogCQkgICAgICB1NjQgc2l6ZSwKLQkJICAgICAgdW5zaWduZWQgYWxpZ25tZW50LAorCQkgICAg ICB1NjQgYWxpZ25tZW50LAogCQkgICAgICB1bnNpZ25lZCBsb25nIGNvbG9yKTsKIHZvaWQgZHJt X21tX2luaXRfc2Nhbl93aXRoX3JhbmdlKHN0cnVjdCBkcm1fbW0gKm1tLAogCQkJCSB1NjQgc2l6 ZSwKLQkJCQkgdW5zaWduZWQgYWxpZ25tZW50LAorCQkJCSB1NjQgYWxpZ25tZW50LAogCQkJCSB1 bnNpZ25lZCBsb25nIGNvbG9yLAogCQkJCSB1NjQgc3RhcnQsCiAJCQkJIHU2NCBlbmQpOwotLSAK Mi43LjAucmMzCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=