From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sean Paul Subject: [PATCH 1/2] Revert "drm/gem: Rename drm_gem_dumb_map_offset() to drm_gem_map_offset()" Date: Wed, 7 Aug 2019 10:52:47 -0400 Message-ID: <20190807145253.2037-2-sean@poorly.run> References: <20190807145253.2037-1-sean@poorly.run> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-yw1-xc41.google.com (mail-yw1-xc41.google.com [IPv6:2607:f8b0:4864:20::c41]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9A2636E71A for ; Wed, 7 Aug 2019 14:53:00 +0000 (UTC) Received: by mail-yw1-xc41.google.com with SMTP id n205so32467550ywb.10 for ; Wed, 07 Aug 2019 07:53:00 -0700 (PDT) In-Reply-To: <20190807145253.2037-1-sean@poorly.run> 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, daniel@ffwll.ch, airlied@gmail.com, mripard@kernel.org, robh@kernel.org, emil.velikov@collabora.com Cc: Sean Paul List-Id: dri-devel@lists.freedesktop.org RnJvbTogUm9iIEhlcnJpbmcgPHJvYmhAa2VybmVsLm9yZz4KClRoaXMgcmV2ZXJ0cyBjb21taXQg MjIwZGY4M2E1Mzk0ZmJmN2MxNDg2YmE3ODQ4Nzk0YjdiMzUxZDU5OC4KClR1cm5zIG91dCBkcm1f Z2VtX2R1bWJfbWFwX29mZnNldCByZWFsbHkgb25seSB3b3JrZWQgZm9yIHRoZSBkdW1iIGJ1ZmZl cgpjYXNlLCBzbyByZXZlcnQgdGhlIG5hbWUgY2hhbmdlLgoKU2lnbmVkLW9mZi1ieTogUm9iIEhl cnJpbmcgPHJvYmhAa2VybmVsLm9yZz4KU2lnbmVkLW9mZi1ieTogU2VhbiBQYXVsIDxzZWFuQHBv b3JseS5ydW4+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9kdW1iX2J1ZmZlcnMuYyAgICAgIHwg IDQgKystLQogZHJpdmVycy9ncHUvZHJtL2RybV9nZW0uYyAgICAgICAgICAgICAgIHwgMTAgKysr LS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2V4eW5vcy9leHlub3NfZHJtX2dlbS5jIHwgIDMgKyst CiBpbmNsdWRlL2RybS9kcm1fZ2VtLmggICAgICAgICAgICAgICAgICAgfCAgNCArKy0tCiA0IGZp bGVzIGNoYW5nZWQsIDkgaW5zZXJ0aW9ucygrKSwgMTIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2RybV9kdW1iX2J1ZmZlcnMuYyBiL2RyaXZlcnMvZ3B1L2RybS9k cm1fZHVtYl9idWZmZXJzLmMKaW5kZXggYjU1Y2ZjOWU4NzcyLi5kMThhNzQwZmUwZjEgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fZHVtYl9idWZmZXJzLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2RybV9kdW1iX2J1ZmZlcnMuYwpAQCAtNDgsNyArNDgsNyBAQAogICogVG8gc3VwcG9y dCBkdW1iIG9iamVjdHMgZHJpdmVycyBtdXN0IGltcGxlbWVudCB0aGUgJmRybV9kcml2ZXIuZHVt Yl9jcmVhdGUKICAqIG9wZXJhdGlvbi4gJmRybV9kcml2ZXIuZHVtYl9kZXN0cm95IGRlZmF1bHRz IHRvIGRybV9nZW1fZHVtYl9kZXN0cm95KCkgaWYKICAqIG5vdCBzZXQgYW5kICZkcm1fZHJpdmVy LmR1bWJfbWFwX29mZnNldCBkZWZhdWx0cyB0bwotICogZHJtX2dlbV9tYXBfb2Zmc2V0KCkuIFNl ZSB0aGUgY2FsbGJhY2tzIGZvciBmdXJ0aGVyIGRldGFpbHMuCisgKiBkcm1fZ2VtX2R1bWJfbWFw X29mZnNldCgpLiBTZWUgdGhlIGNhbGxiYWNrcyBmb3IgZnVydGhlciBkZXRhaWxzLgogICoKICAq IE5vdGUgdGhhdCBkdW1iIG9iamVjdHMgbWF5IG5vdCBiZSB1c2VkIGZvciBncHUgYWNjZWxlcmF0 aW9uLCBhcyBoYXMgYmVlbgogICogYXR0ZW1wdGVkIG9uIHNvbWUgQVJNIGVtYmVkZGVkIHBsYXRm b3Jtcy4gU3VjaCBkcml2ZXJzIHJlYWxseSBtdXN0IGhhdmUKQEAgLTEyNyw3ICsxMjcsNyBAQCBp bnQgZHJtX21vZGVfbW1hcF9kdW1iX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJ CQkgICAgYXJncy0+aGFuZGxlLAogCQkJCQkJICAgICZhcmdzLT5vZmZzZXQpOwogCWVsc2UKLQkJ cmV0dXJuIGRybV9nZW1fbWFwX29mZnNldChmaWxlX3ByaXYsIGRldiwgYXJncy0+aGFuZGxlLAor CQlyZXR1cm4gZHJtX2dlbV9kdW1iX21hcF9vZmZzZXQoZmlsZV9wcml2LCBkZXYsIGFyZ3MtPmhh bmRsZSwKIAkJCQkJICAgICAgICZhcmdzLT5vZmZzZXQpOwogfQogCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vZHJtX2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9nZW0uYwppbmRleCA4 Y2JmZDYwZTA5YzAuLmFmYzM4Y2VjZTNmNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2Ry bV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2dlbS5jCkBAIC0yOTgsNyArMjk4LDcg QEAgZHJtX2dlbV9oYW5kbGVfZGVsZXRlKHN0cnVjdCBkcm1fZmlsZSAqZmlscCwgdTMyIGhhbmRs ZSkKIEVYUE9SVF9TWU1CT0woZHJtX2dlbV9oYW5kbGVfZGVsZXRlKTsKIAogLyoqCi0gKiBkcm1f Z2VtX21hcF9vZmZzZXQgLSByZXR1cm4gdGhlIGZha2UgbW1hcCBvZmZzZXQgZm9yIGEgZ2VtIG9i amVjdAorICogZHJtX2dlbV9kdW1iX21hcF9vZmZzZXQgLSByZXR1cm4gdGhlIGZha2UgbW1hcCBv ZmZzZXQgZm9yIGEgZ2VtIG9iamVjdAogICogQGZpbGU6IGRybSBmaWxlLXByaXZhdGUgc3RydWN0 dXJlIGNvbnRhaW5pbmcgdGhlIGdlbSBvYmplY3QKICAqIEBkZXY6IGNvcnJlc3BvbmRpbmcgZHJt X2RldmljZQogICogQGhhbmRsZTogZ2VtIG9iamVjdCBoYW5kbGUKQEAgLTMwNywxNCArMzA3LDEw IEBAIEVYUE9SVF9TWU1CT0woZHJtX2dlbV9oYW5kbGVfZGVsZXRlKTsKICAqIFRoaXMgaW1wbGVt ZW50cyB0aGUgJmRybV9kcml2ZXIuZHVtYl9tYXBfb2Zmc2V0IGttcyBkcml2ZXIgY2FsbGJhY2sg Zm9yCiAgKiBkcml2ZXJzIHdoaWNoIHVzZSBnZW0gdG8gbWFuYWdlIHRoZWlyIGJhY2tpbmcgc3Rv cmFnZS4KICAqCi0gKiBJdCBjYW4gYWxzbyBiZSB1c2VkIGJ5IGRyaXZlcnMgdXNpbmcgR0VNIEJP IGltcGxlbWVudGF0aW9ucyB3aGljaAotICogaGF2ZSBzYW1lIHJlc3RyaWN0aW9uIHRoYXQgaW1w b3J0ZWQgb2JqZWN0cyBjYW5ub3QgYmUgbWFwcGVkLiBUaGUKLSAqIHNobWVtIGJhY2tlbmQgaXMg b25lIGV4YW1wbGUuCi0gKgogICogUmV0dXJuczoKICAqIDAgb24gc3VjY2VzcyBvciBhIG5lZ2F0 aXZlIGVycm9yIGNvZGUgb24gZmFpbHVyZS4KICAqLwotaW50IGRybV9nZW1fbWFwX29mZnNldChz dHJ1Y3QgZHJtX2ZpbGUgKmZpbGUsIHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCitpbnQgZHJtX2dl bV9kdW1iX21hcF9vZmZzZXQoc3RydWN0IGRybV9maWxlICpmaWxlLCBzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LAogCQkJICAgIHUzMiBoYW5kbGUsIHU2NCAqb2Zmc2V0KQogewogCXN0cnVjdCBkcm1f Z2VtX29iamVjdCAqb2JqOwpAQCAtMzQwLDcgKzMzNiw3IEBAIGludCBkcm1fZ2VtX21hcF9vZmZz ZXQoc3RydWN0IGRybV9maWxlICpmaWxlLCBzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCiAJcmV0 dXJuIHJldDsKIH0KLUVYUE9SVF9TWU1CT0xfR1BMKGRybV9nZW1fbWFwX29mZnNldCk7CitFWFBP UlRfU1lNQk9MX0dQTChkcm1fZ2VtX2R1bWJfbWFwX29mZnNldCk7CiAKIC8qKgogICogZHJtX2dl bV9kdW1iX2Rlc3Ryb3kgLSBkdW1iIGZiIGNhbGxiYWNrIGhlbHBlciBmb3IgZ2VtIGJhc2VkIGRy aXZlcnMKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9leHlub3MvZXh5bm9zX2RybV9nZW0u YyBiL2RyaXZlcnMvZ3B1L2RybS9leHlub3MvZXh5bm9zX2RybV9nZW0uYwppbmRleCBiZjBhZDhl NWEwMmIuLmQ3MzRkOWQ1MTc2MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2V4eW5vcy9l eHlub3NfZHJtX2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9leHlub3MvZXh5bm9zX2RybV9n ZW0uYwpAQCAtMjczLDcgKzI3Myw4IEBAIGludCBleHlub3NfZHJtX2dlbV9tYXBfaW9jdGwoc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIHsKIAlzdHJ1Y3QgZHJtX2V4eW5vc19n ZW1fbWFwICphcmdzID0gZGF0YTsKIAotCXJldHVybiBkcm1fZ2VtX21hcF9vZmZzZXQoZmlsZV9w cml2LCBkZXYsIGFyZ3MtPmhhbmRsZSwgJmFyZ3MtPm9mZnNldCk7CisJcmV0dXJuIGRybV9nZW1f ZHVtYl9tYXBfb2Zmc2V0KGZpbGVfcHJpdiwgZGV2LCBhcmdzLT5oYW5kbGUsCisJCQkJICAgICAg ICZhcmdzLT5vZmZzZXQpOwogfQogCiBzdHJ1Y3QgZXh5bm9zX2RybV9nZW0gKmV4eW5vc19kcm1f Z2VtX2dldChzdHJ1Y3QgZHJtX2ZpbGUgKmZpbHAsCmRpZmYgLS1naXQgYS9pbmNsdWRlL2RybS9k cm1fZ2VtLmggYi9pbmNsdWRlL2RybS9kcm1fZ2VtLmgKaW5kZXggMGQ2NDQ1ZmE5NTQxLi5hZTY5 M2MwNjY2Y2QgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvZHJtL2RybV9nZW0uaAorKysgYi9pbmNsdWRl L2RybS9kcm1fZ2VtLmgKQEAgLTQwMSw4ICs0MDEsOCBAQCBpbnQgZHJtX2dlbV9mZW5jZV9hcnJh eV9hZGQoc3RydWN0IHhhcnJheSAqZmVuY2VfYXJyYXksCiBpbnQgZHJtX2dlbV9mZW5jZV9hcnJh eV9hZGRfaW1wbGljaXQoc3RydWN0IHhhcnJheSAqZmVuY2VfYXJyYXksCiAJCQkJICAgICBzdHJ1 Y3QgZHJtX2dlbV9vYmplY3QgKm9iaiwKIAkJCQkgICAgIGJvb2wgd3JpdGUpOwotaW50IGRybV9n ZW1fbWFwX29mZnNldChzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUsIHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYsCi0JCSAgICAgICB1MzIgaGFuZGxlLCB1NjQgKm9mZnNldCk7CitpbnQgZHJtX2dlbV9kdW1i X21hcF9vZmZzZXQoc3RydWN0IGRybV9maWxlICpmaWxlLCBzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LAorCQkJICAgIHUzMiBoYW5kbGUsIHU2NCAqb2Zmc2V0KTsKIGludCBkcm1fZ2VtX2R1bWJfZGVz dHJveShzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUsCiAJCQkgc3RydWN0IGRybV9kZXZpY2UgKmRldiwK IAkJCSB1aW50MzJfdCBoYW5kbGUpOwotLSAKU2VhbiBQYXVsLCBTb2Z0d2FyZSBFbmdpbmVlciwg R29vZ2xlIC8gQ2hyb21pdW0gT1MKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2RyaS1kZXZlbA==