From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 1/2] Revert "drm/gem: Rename drm_gem_dumb_map_offset() to drm_gem_map_offset()" Date: Wed, 7 Aug 2019 23:01:19 +0200 Message-ID: <20190807210119.GF7444@phenom.ffwll.local> References: <20190807145253.2037-1-sean@poorly.run> <20190807145253.2037-2-sean@poorly.run> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-ed1-x541.google.com (mail-ed1-x541.google.com [IPv6:2a00:1450:4864:20::541]) by gabe.freedesktop.org (Postfix) with ESMTPS id D385B6E400 for ; Wed, 7 Aug 2019 21:01:23 +0000 (UTC) Received: by mail-ed1-x541.google.com with SMTP id r12so53058197edo.5 for ; Wed, 07 Aug 2019 14:01:23 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20190807145253.2037-2-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: Sean Paul Cc: mripard@kernel.org, dri-devel@lists.freedesktop.org, emil.velikov@collabora.com List-Id: dri-devel@lists.freedesktop.org T24gV2VkLCBBdWcgMDcsIDIwMTkgYXQgMTA6NTI6NDdBTSAtMDQwMCwgU2VhbiBQYXVsIHdyb3Rl Ogo+IEZyb206IFJvYiBIZXJyaW5nIDxyb2JoQGtlcm5lbC5vcmc+Cj4gCj4gVGhpcyByZXZlcnRz IGNvbW1pdCAyMjBkZjgzYTUzOTRmYmY3YzE0ODZiYTc4NDg3OTRiN2IzNTFkNTk4Lgo+IAo+IFR1 cm5zIG91dCBkcm1fZ2VtX2R1bWJfbWFwX29mZnNldCByZWFsbHkgb25seSB3b3JrZWQgZm9yIHRo ZSBkdW1iIGJ1ZmZlcgo+IGNhc2UsIHNvIHJldmVydCB0aGUgbmFtZSBjaGFuZ2UuCj4gCj4gU2ln bmVkLW9mZi1ieTogUm9iIEhlcnJpbmcgPHJvYmhAa2VybmVsLm9yZz4KPiBTaWduZWQtb2ZmLWJ5 OiBTZWFuIFBhdWwgPHNlYW5AcG9vcmx5LnJ1bj4KClRoaXMgcGFydCBvZiB0aGUgc2VyaWVzIHNl ZW1zIHVuZWNlc3NhcnkgdG8gcmV2ZXJ0PwoKaW93IEkgc3RpbGwgbGlrZSB0aGlzLCBhbmQgSW0g dHJ5aW5nIHRvIHNlbGwgR2VyZCBIb2ZmbWFubiBvbiBpdCBmb3Igc29tZQpvZiBoaXMgdHRtIHJl ZmFjdG9yaW5nIC4uLiByZXZlcnQgb2YgdGhlIHJldmVydCBvZiB0aGUgcmV2ZXJ0IG9mIHRoZQpy ZXZlcnQ/IFByb2JhYmx5IGJldHRlciBpZiBHZXJkIGNoZXJyeS1waWNrcyBpbnRvIGhpcyBzZXJp ZXMgKGlmIG15CnN1Z2dlc3Rpb24gd29ya3Mgb3V0KSBhbmQgbWF5YmUgcmVmZXJlbmNlcyB0aGlz IGVudGlyZSBjaGFpbiBmb3IKZW50ZXJ0YWlubWVudCBwdXJwb3NlcyA6LSkKLURhbmllbAoKPiAt LS0KPiAgZHJpdmVycy9ncHUvZHJtL2RybV9kdW1iX2J1ZmZlcnMuYyAgICAgIHwgIDQgKystLQo+ ICBkcml2ZXJzL2dwdS9kcm0vZHJtX2dlbS5jICAgICAgICAgICAgICAgfCAxMCArKystLS0tLS0t Cj4gIGRyaXZlcnMvZ3B1L2RybS9leHlub3MvZXh5bm9zX2RybV9nZW0uYyB8ICAzICsrLQo+ICBp bmNsdWRlL2RybS9kcm1fZ2VtLmggICAgICAgICAgICAgICAgICAgfCAgNCArKy0tCj4gIDQgZmls ZXMgY2hhbmdlZCwgOSBpbnNlcnRpb25zKCspLCAxMiBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9kdW1iX2J1ZmZlcnMuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9kcm1fZHVtYl9idWZmZXJzLmMKPiBpbmRleCBiNTVjZmM5ZTg3NzIuLmQxOGE3NDBmZTBmMSAx MDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2R1bWJfYnVmZmVycy5jCj4gKysrIGIv ZHJpdmVycy9ncHUvZHJtL2RybV9kdW1iX2J1ZmZlcnMuYwo+IEBAIC00OCw3ICs0OCw3IEBACj4g ICAqIFRvIHN1cHBvcnQgZHVtYiBvYmplY3RzIGRyaXZlcnMgbXVzdCBpbXBsZW1lbnQgdGhlICZk cm1fZHJpdmVyLmR1bWJfY3JlYXRlCj4gICAqIG9wZXJhdGlvbi4gJmRybV9kcml2ZXIuZHVtYl9k ZXN0cm95IGRlZmF1bHRzIHRvIGRybV9nZW1fZHVtYl9kZXN0cm95KCkgaWYKPiAgICogbm90IHNl dCBhbmQgJmRybV9kcml2ZXIuZHVtYl9tYXBfb2Zmc2V0IGRlZmF1bHRzIHRvCj4gLSAqIGRybV9n ZW1fbWFwX29mZnNldCgpLiBTZWUgdGhlIGNhbGxiYWNrcyBmb3IgZnVydGhlciBkZXRhaWxzLgo+ ICsgKiBkcm1fZ2VtX2R1bWJfbWFwX29mZnNldCgpLiBTZWUgdGhlIGNhbGxiYWNrcyBmb3IgZnVy dGhlciBkZXRhaWxzLgo+ICAgKgo+ICAgKiBOb3RlIHRoYXQgZHVtYiBvYmplY3RzIG1heSBub3Qg YmUgdXNlZCBmb3IgZ3B1IGFjY2VsZXJhdGlvbiwgYXMgaGFzIGJlZW4KPiAgICogYXR0ZW1wdGVk IG9uIHNvbWUgQVJNIGVtYmVkZGVkIHBsYXRmb3Jtcy4gU3VjaCBkcml2ZXJzIHJlYWxseSBtdXN0 IGhhdmUKPiBAQCAtMTI3LDcgKzEyNyw3IEBAIGludCBkcm1fbW9kZV9tbWFwX2R1bWJfaW9jdGwo c3RydWN0IGRybV9kZXZpY2UgKmRldiwKPiAgCQkJCQkJICAgIGFyZ3MtPmhhbmRsZSwKPiAgCQkJ CQkJICAgICZhcmdzLT5vZmZzZXQpOwo+ICAJZWxzZQo+IC0JCXJldHVybiBkcm1fZ2VtX21hcF9v ZmZzZXQoZmlsZV9wcml2LCBkZXYsIGFyZ3MtPmhhbmRsZSwKPiArCQlyZXR1cm4gZHJtX2dlbV9k dW1iX21hcF9vZmZzZXQoZmlsZV9wcml2LCBkZXYsIGFyZ3MtPmhhbmRsZSwKPiAgCQkJCQkgICAg ICAgJmFyZ3MtPm9mZnNldCk7Cj4gIH0KPiAgCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9kcm1fZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2dlbS5jCj4gaW5kZXggOGNiZmQ2MGUw OWMwLi5hZmMzOGNlY2UzZjUgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9nZW0u Ywo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZ2VtLmMKPiBAQCAtMjk4LDcgKzI5OCw3IEBA IGRybV9nZW1faGFuZGxlX2RlbGV0ZShzdHJ1Y3QgZHJtX2ZpbGUgKmZpbHAsIHUzMiBoYW5kbGUp Cj4gIEVYUE9SVF9TWU1CT0woZHJtX2dlbV9oYW5kbGVfZGVsZXRlKTsKPiAgCj4gIC8qKgo+IC0g KiBkcm1fZ2VtX21hcF9vZmZzZXQgLSByZXR1cm4gdGhlIGZha2UgbW1hcCBvZmZzZXQgZm9yIGEg Z2VtIG9iamVjdAo+ICsgKiBkcm1fZ2VtX2R1bWJfbWFwX29mZnNldCAtIHJldHVybiB0aGUgZmFr ZSBtbWFwIG9mZnNldCBmb3IgYSBnZW0gb2JqZWN0Cj4gICAqIEBmaWxlOiBkcm0gZmlsZS1wcml2 YXRlIHN0cnVjdHVyZSBjb250YWluaW5nIHRoZSBnZW0gb2JqZWN0Cj4gICAqIEBkZXY6IGNvcnJl c3BvbmRpbmcgZHJtX2RldmljZQo+ICAgKiBAaGFuZGxlOiBnZW0gb2JqZWN0IGhhbmRsZQo+IEBA IC0zMDcsMTQgKzMwNywxMCBAQCBFWFBPUlRfU1lNQk9MKGRybV9nZW1faGFuZGxlX2RlbGV0ZSk7 Cj4gICAqIFRoaXMgaW1wbGVtZW50cyB0aGUgJmRybV9kcml2ZXIuZHVtYl9tYXBfb2Zmc2V0IGtt cyBkcml2ZXIgY2FsbGJhY2sgZm9yCj4gICAqIGRyaXZlcnMgd2hpY2ggdXNlIGdlbSB0byBtYW5h Z2UgdGhlaXIgYmFja2luZyBzdG9yYWdlLgo+ICAgKgo+IC0gKiBJdCBjYW4gYWxzbyBiZSB1c2Vk IGJ5IGRyaXZlcnMgdXNpbmcgR0VNIEJPIGltcGxlbWVudGF0aW9ucyB3aGljaAo+IC0gKiBoYXZl IHNhbWUgcmVzdHJpY3Rpb24gdGhhdCBpbXBvcnRlZCBvYmplY3RzIGNhbm5vdCBiZSBtYXBwZWQu IFRoZQo+IC0gKiBzaG1lbSBiYWNrZW5kIGlzIG9uZSBleGFtcGxlLgo+IC0gKgo+ICAgKiBSZXR1 cm5zOgo+ICAgKiAwIG9uIHN1Y2Nlc3Mgb3IgYSBuZWdhdGl2ZSBlcnJvciBjb2RlIG9uIGZhaWx1 cmUuCj4gICAqLwo+IC1pbnQgZHJtX2dlbV9tYXBfb2Zmc2V0KHN0cnVjdCBkcm1fZmlsZSAqZmls ZSwgc3RydWN0IGRybV9kZXZpY2UgKmRldiwKPiAraW50IGRybV9nZW1fZHVtYl9tYXBfb2Zmc2V0 KHN0cnVjdCBkcm1fZmlsZSAqZmlsZSwgc3RydWN0IGRybV9kZXZpY2UgKmRldiwKPiAgCQkJICAg IHUzMiBoYW5kbGUsIHU2NCAqb2Zmc2V0KQo+ICB7Cj4gIAlzdHJ1Y3QgZHJtX2dlbV9vYmplY3Qg Km9iajsKPiBAQCAtMzQwLDcgKzMzNiw3IEBAIGludCBkcm1fZ2VtX21hcF9vZmZzZXQoc3RydWN0 IGRybV9maWxlICpmaWxlLCBzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAo+ICAKPiAgCXJldHVybiBy ZXQ7Cj4gIH0KPiAtRVhQT1JUX1NZTUJPTF9HUEwoZHJtX2dlbV9tYXBfb2Zmc2V0KTsKPiArRVhQ T1JUX1NZTUJPTF9HUEwoZHJtX2dlbV9kdW1iX21hcF9vZmZzZXQpOwo+ICAKPiAgLyoqCj4gICAq IGRybV9nZW1fZHVtYl9kZXN0cm95IC0gZHVtYiBmYiBjYWxsYmFjayBoZWxwZXIgZm9yIGdlbSBi YXNlZCBkcml2ZXJzCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9leHlub3MvZXh5bm9z X2RybV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9leHlub3MvZXh5bm9zX2RybV9nZW0uYwo+IGlu ZGV4IGJmMGFkOGU1YTAyYi4uZDczNGQ5ZDUxNzYyIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9leHlub3MvZXh5bm9zX2RybV9nZW0uYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9leHlu b3MvZXh5bm9zX2RybV9nZW0uYwo+IEBAIC0yNzMsNyArMjczLDggQEAgaW50IGV4eW5vc19kcm1f Z2VtX21hcF9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAo+ICB7Cj4g IAlzdHJ1Y3QgZHJtX2V4eW5vc19nZW1fbWFwICphcmdzID0gZGF0YTsKPiAgCj4gLQlyZXR1cm4g ZHJtX2dlbV9tYXBfb2Zmc2V0KGZpbGVfcHJpdiwgZGV2LCBhcmdzLT5oYW5kbGUsICZhcmdzLT5v ZmZzZXQpOwo+ICsJcmV0dXJuIGRybV9nZW1fZHVtYl9tYXBfb2Zmc2V0KGZpbGVfcHJpdiwgZGV2 LCBhcmdzLT5oYW5kbGUsCj4gKwkJCQkgICAgICAgJmFyZ3MtPm9mZnNldCk7Cj4gIH0KPiAgCj4g IHN0cnVjdCBleHlub3NfZHJtX2dlbSAqZXh5bm9zX2RybV9nZW1fZ2V0KHN0cnVjdCBkcm1fZmls ZSAqZmlscCwKPiBkaWZmIC0tZ2l0IGEvaW5jbHVkZS9kcm0vZHJtX2dlbS5oIGIvaW5jbHVkZS9k cm0vZHJtX2dlbS5oCj4gaW5kZXggMGQ2NDQ1ZmE5NTQxLi5hZTY5M2MwNjY2Y2QgMTAwNjQ0Cj4g LS0tIGEvaW5jbHVkZS9kcm0vZHJtX2dlbS5oCj4gKysrIGIvaW5jbHVkZS9kcm0vZHJtX2dlbS5o Cj4gQEAgLTQwMSw4ICs0MDEsOCBAQCBpbnQgZHJtX2dlbV9mZW5jZV9hcnJheV9hZGQoc3RydWN0 IHhhcnJheSAqZmVuY2VfYXJyYXksCj4gIGludCBkcm1fZ2VtX2ZlbmNlX2FycmF5X2FkZF9pbXBs aWNpdChzdHJ1Y3QgeGFycmF5ICpmZW5jZV9hcnJheSwKPiAgCQkJCSAgICAgc3RydWN0IGRybV9n ZW1fb2JqZWN0ICpvYmosCj4gIAkJCQkgICAgIGJvb2wgd3JpdGUpOwo+IC1pbnQgZHJtX2dlbV9t YXBfb2Zmc2V0KHN0cnVjdCBkcm1fZmlsZSAqZmlsZSwgc3RydWN0IGRybV9kZXZpY2UgKmRldiwK PiAtCQkgICAgICAgdTMyIGhhbmRsZSwgdTY0ICpvZmZzZXQpOwo+ICtpbnQgZHJtX2dlbV9kdW1i X21hcF9vZmZzZXQoc3RydWN0IGRybV9maWxlICpmaWxlLCBzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LAo+ICsJCQkgICAgdTMyIGhhbmRsZSwgdTY0ICpvZmZzZXQpOwo+ICBpbnQgZHJtX2dlbV9kdW1i X2Rlc3Ryb3koc3RydWN0IGRybV9maWxlICpmaWxlLAo+ICAJCQkgc3RydWN0IGRybV9kZXZpY2Ug KmRldiwKPiAgCQkJIHVpbnQzMl90IGhhbmRsZSk7Cj4gLS0gCj4gU2VhbiBQYXVsLCBTb2Z0d2Fy ZSBFbmdpbmVlciwgR29vZ2xlIC8gQ2hyb21pdW0gT1MKPiAKCi0tIApEYW5pZWwgVmV0dGVyClNv ZnR3YXJlIEVuZ2luZWVyLCBJbnRlbCBDb3Jwb3JhdGlvbgpodHRwOi8vYmxvZy5mZndsbC5jaApf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwg bWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw=