From mboxrd@z Thu Jan  1 00:00:00 1970
From: Thomas Zimmermann <tzimmermann@suse.de>
Subject: [PATCH 4/4] drm/vram: Remove driver callback functions for PRIME
Date: Fri, 28 Jun 2019 14:26:59 +0200
Message-ID: <20190628122659.31887-5-tzimmermann@suse.de>
References: <20190628122659.31887-1-tzimmermann@suse.de>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <dri-devel-bounces@lists.freedesktop.org>
Received: from mx1.suse.de (mx2.suse.de [195.135.220.15])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 7A3F86E913
 for <dri-devel@lists.freedesktop.org>; Fri, 28 Jun 2019 12:27:06 +0000 (UTC)
In-Reply-To: <20190628122659.31887-1-tzimmermann@suse.de>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/dri-devel>
List-Post: <mailto:dri-devel@lists.freedesktop.org>
List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe>
Errors-To: dri-devel-bounces@lists.freedesktop.org
Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org>
To: kraxel@redhat.com, airlied@redhat.com, daniel@ffwll.ch, maarten.lankhorst@linux.intel.com, maxime.ripard@bootlin.com, sean@poorly.run, sam@ravnborg.org, dri-devel@lists.freedesktop.org, z.liuxinliang@hisilicon.com, zourongrong@gmail.com, kong.kongxinwei@hisilicon.com, puck.chen@hisilicon.com
Cc: Thomas Zimmermann <tzimmermann@suse.de>
List-Id: dri-devel@lists.freedesktop.org

UFJJTUUgZnVuY3Rpb25hbGl0eSBpcyBub3cgcHJvdmlkZWQgYnkgR0VNIG9iamVjdCBmdW5jdGlv
bnMuIFRoZSBkcml2ZXIKY2FsbGJhY2sgZnVuY3Rpb25zIGFyZSBvYnNvbGV0ZS4KClNpZ25lZC1v
ZmYtYnk6IFRob21hcyBaaW1tZXJtYW5uIDx0emltbWVybWFubkBzdXNlLmRlPgotLS0KIERvY3Vt
ZW50YXRpb24vZ3B1L3RvZG8ucnN0ICAgICAgICAgICAgfCAgIDQgKy0KIGRyaXZlcnMvZ3B1L2Ry
bS9kcm1fZ2VtX3ZyYW1faGVscGVyLmMgfCAxMTggLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0K
IGluY2x1ZGUvZHJtL2RybV9nZW1fdnJhbV9oZWxwZXIuaCAgICAgfCAgMjIgLS0tLS0KIDMgZmls
ZXMgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDE0MyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg
YS9Eb2N1bWVudGF0aW9uL2dwdS90b2RvLnJzdCBiL0RvY3VtZW50YXRpb24vZ3B1L3RvZG8ucnN0
CmluZGV4IGQ0OWMxY2M2ZGMyOC4uM2Y2ZWNmODQ2MjYzIDEwMDY0NAotLS0gYS9Eb2N1bWVudGF0
aW9uL2dwdS90b2RvLnJzdAorKysgYi9Eb2N1bWVudGF0aW9uL2dwdS90b2RvLnJzdApAQCAtMjIx
LDkgKzIyMSw3IEBAIHN0cnVjdCBkcm1fZ2VtX29iamVjdF9mdW5jcwogR0VNIG9iamVjdHMgY2Fu
IG5vdyBoYXZlIGEgZnVuY3Rpb24gdGFibGUgaW5zdGVhZCBvZiBoYXZpbmcgdGhlIGNhbGxiYWNr
cyBvbiB0aGUKIERSTSBkcml2ZXIgc3RydWN0LiBUaGlzIGlzIG5vdyB0aGUgcHJlZmVycmVkIHdh
eSBhbmQgZHJpdmVycyBjYW4gYmUgbW92ZWQgb3Zlci4KIAotRFJNX0dFTV9DTUFfVk1BUF9EUklW
RVJfT1BTLCBEUk1fR0VNX1NITUVNX0RSSVZFUl9PUFMgYWxyZWFkeSBzdXBwb3J0IHRoaXMsIGJ1
dAotRFJNX0dFTV9WUkFNX0RSSVZFUl9QUklNRSBkb2VzIG5vdCB5ZXQgYW5kIG5lZWRzIHRvIGJl
IGFsaWduZWQgd2l0aCB0aGUgcHJldmlvdXMKLXR3by4gV2UgYWxzbyBuZWVkIGEgMm5kIHZlcnNp
b24gb2YgdGhlIENNQSBkZWZpbmUgdGhhdCBkb2Vzbid0IHJlcXVpcmUgdGhlCitXZSBhbHNvIG5l
ZWQgYSAybmQgdmVyc2lvbiBvZiB0aGUgQ01BIGRlZmluZSB0aGF0IGRvZXNuJ3QgcmVxdWlyZSB0
aGUKIHZtYXBwaW5nIHRvIGJlIHByZXNlbnQgKGRpZmZlcmVudCBob29rIGZvciBwcmltZSBpbXBv
cnRpbmcpLiBQbHVzIHRoaXMgbmVlZHMgdG8KIGJlIHJvbGxlZCBvdXQgdG8gYWxsIGRyaXZlcnMg
dXNpbmcgdGhlaXIgb3duIGltcGxlbWVudGF0aW9ucywgdG9vLgogCmRpZmYgLS1naXQgYS9kcml2
ZXJzL2dwdS9kcm0vZHJtX2dlbV92cmFtX2hlbHBlci5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9n
ZW1fdnJhbV9oZWxwZXIuYwppbmRleCBkZDIyMDc5NWU3MjUuLmYwMDc2NDkzNGZiNiAxMDA2NDQK
LS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9nZW1fdnJhbV9oZWxwZXIuYworKysgYi9kcml2ZXJz
L2dwdS9kcm0vZHJtX2dlbV92cmFtX2hlbHBlci5jCkBAIC01MzMsMTkgKzUzMyw2IEBAIEVYUE9S
VF9TWU1CT0woZHJtX2dlbV92cmFtX21tX2Z1bmNzKTsKICAqIEhlbHBlcnMgZm9yIHN0cnVjdCBk
cm1fZHJpdmVyCiAgKi8KIAotLyoqCi0gKiBkcm1fZ2VtX3ZyYW1fZHJpdmVyX2dlbV9mcmVlX29i
amVjdF91bmxvY2tlZCgpIC0gXAotCUltcGxlbWVudHMgJnN0cnVjdCBkcm1fZHJpdmVyLmdlbV9m
cmVlX29iamVjdF91bmxvY2tlZAotICogQGdlbToJR0VNIG9iamVjdC4gUmVmZXJzIHRvICZzdHJ1
Y3QgZHJtX2dlbV92cmFtX29iamVjdC5nZW0KLSAqLwotdm9pZCBkcm1fZ2VtX3ZyYW1fZHJpdmVy
X2dlbV9mcmVlX29iamVjdF91bmxvY2tlZChzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKmdlbSkKLXsK
LQlzdHJ1Y3QgZHJtX2dlbV92cmFtX29iamVjdCAqZ2JvID0gZHJtX2dlbV92cmFtX29mX2dlbShn
ZW0pOwotCi0JZHJtX2dlbV92cmFtX3B1dChnYm8pOwotfQotRVhQT1JUX1NZTUJPTChkcm1fZ2Vt
X3ZyYW1fZHJpdmVyX2dlbV9mcmVlX29iamVjdF91bmxvY2tlZCk7Ci0KIC8qKgogICogZHJtX2dl
bV92cmFtX2RyaXZlcl9jcmVhdGVfZHVtYigpIC0gXAogCUltcGxlbWVudHMgJnN0cnVjdCBkcm1f
ZHJpdmVyLmR1bWJfY3JlYXRlCkBAIC02MDQsMTA4ICs1OTEsMyBAQCBpbnQgZHJtX2dlbV92cmFt
X2RyaXZlcl9kdW1iX21tYXBfb2Zmc2V0KHN0cnVjdCBkcm1fZmlsZSAqZmlsZSwKIAlyZXR1cm4g
MDsKIH0KIEVYUE9SVF9TWU1CT0woZHJtX2dlbV92cmFtX2RyaXZlcl9kdW1iX21tYXBfb2Zmc2V0
KTsKLQotLyoKLSAqIFBSSU1FIGhlbHBlcnMgZm9yIHN0cnVjdCBkcm1fZHJpdmVyCi0gKi8KLQot
LyoqCi0gKiBkcm1fZ2VtX3ZyYW1fZHJpdmVyX2dlbV9wcmltZV9waW4oKSAtIFwKLQlJbXBsZW1l
bnRzICZzdHJ1Y3QgZHJtX2RyaXZlci5nZW1fcHJpbWVfcGluCi0gKiBAZ2VtOglUaGUgR0VNIG9i
amVjdCB0byBwaW4KLSAqCi0gKiBSZXR1cm5zOgotICogMCBvbiBzdWNjZXNzLCBvcgotICogYSBu
ZWdhdGl2ZSBlcnJubyBjb2RlIG90aGVyd2lzZS4KLSAqLwotaW50IGRybV9nZW1fdnJhbV9kcml2
ZXJfZ2VtX3ByaW1lX3BpbihzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKmdlbSkKLXsKLQlzdHJ1Y3Qg
ZHJtX2dlbV92cmFtX29iamVjdCAqZ2JvID0gZHJtX2dlbV92cmFtX29mX2dlbShnZW0pOwotCi0J
LyogRmJkZXYgY29uc29sZSBlbXVsYXRpb24gaXMgdGhlIHVzZSBjYXNlIG9mIHRoZXNlIFBSSU1F
Ci0JICogaGVscGVycy4gVGhpcyBtYXkgaW52b2x2ZSB1cGRhdGluZyBhIGhhcmR3YXJlIGJ1ZmZl
ciBmcm9tCi0JICogYSBzaGFkb3cgRkIuIFdlIHBpbiB0aGUgYnVmZmVyIHRvIGl0J3MgY3VycmVu
dCBsb2NhdGlvbgotCSAqIChlaXRoZXIgdmlkZW8gUkFNIG9yIHN5c3RlbSBtZW1vcnkpIHRvIHBy
ZXZlbnQgaXQgZnJvbQotCSAqIGJlaW5nIHJlbG9jYXRlZCBkdXJpbmcgdGhlIHVwZGF0ZSBvcGVy
YXRpb24uIElmIHlvdSByZXF1aXJlCi0JICogdGhlIGJ1ZmZlciB0byBiZSBwaW5uZWQgdG8gVlJB
TSwgaW1wbGVtZW50IGEgY2FsbGJhY2sgdGhhdAotCSAqIHNldHMgdGhlIGZsYWdzIGFjY29yZGlu
Z2x5LgotCSAqLwotCXJldHVybiBkcm1fZ2VtX3ZyYW1fcGluKGdibywgMCk7Ci19Ci1FWFBPUlRf
U1lNQk9MKGRybV9nZW1fdnJhbV9kcml2ZXJfZ2VtX3ByaW1lX3Bpbik7Ci0KLS8qKgotICogZHJt
X2dlbV92cmFtX2RyaXZlcl9nZW1fcHJpbWVfdW5waW4oKSAtIFwKLQlJbXBsZW1lbnRzICZzdHJ1
Y3QgZHJtX2RyaXZlci5nZW1fcHJpbWVfdW5waW4KLSAqIEBnZW06CVRoZSBHRU0gb2JqZWN0IHRv
IHVucGluCi0gKi8KLXZvaWQgZHJtX2dlbV92cmFtX2RyaXZlcl9nZW1fcHJpbWVfdW5waW4oc3Ry
dWN0IGRybV9nZW1fb2JqZWN0ICpnZW0pCi17Ci0Jc3RydWN0IGRybV9nZW1fdnJhbV9vYmplY3Qg
KmdibyA9IGRybV9nZW1fdnJhbV9vZl9nZW0oZ2VtKTsKLQotCWRybV9nZW1fdnJhbV91bnBpbihn
Ym8pOwotfQotRVhQT1JUX1NZTUJPTChkcm1fZ2VtX3ZyYW1fZHJpdmVyX2dlbV9wcmltZV91bnBp
bik7Ci0KLS8qKgotICogZHJtX2dlbV92cmFtX2RyaXZlcl9nZW1fcHJpbWVfdm1hcCgpIC0gXAot
CUltcGxlbWVudHMgJnN0cnVjdCBkcm1fZHJpdmVyLmdlbV9wcmltZV92bWFwCi0gKiBAZ2VtOglU
aGUgR0VNIG9iamVjdCB0byBtYXAKLSAqCi0gKiBSZXR1cm5zOgotICogVGhlIGJ1ZmZlcnMgdmly
dHVhbCBhZGRyZXNzIG9uIHN1Y2Nlc3MsIG9yCi0gKiBOVUxMIG90aGVyd2lzZS4KLSAqLwotdm9p
ZCAqZHJtX2dlbV92cmFtX2RyaXZlcl9nZW1fcHJpbWVfdm1hcChzdHJ1Y3QgZHJtX2dlbV9vYmpl
Y3QgKmdlbSkKLXsKLQlzdHJ1Y3QgZHJtX2dlbV92cmFtX29iamVjdCAqZ2JvID0gZHJtX2dlbV92
cmFtX29mX2dlbShnZW0pOwotCWludCByZXQ7Ci0Jdm9pZCAqYmFzZTsKLQotCXJldCA9IGRybV9n
ZW1fdnJhbV9waW4oZ2JvLCAwKTsKLQlpZiAocmV0KQotCQlyZXR1cm4gTlVMTDsKLQliYXNlID0g
ZHJtX2dlbV92cmFtX2ttYXAoZ2JvLCB0cnVlLCBOVUxMKTsKLQlpZiAoSVNfRVJSKGJhc2UpKSB7
Ci0JCWRybV9nZW1fdnJhbV91bnBpbihnYm8pOwotCQlyZXR1cm4gTlVMTDsKLQl9Ci0JcmV0dXJu
IGJhc2U7Ci19Ci1FWFBPUlRfU1lNQk9MKGRybV9nZW1fdnJhbV9kcml2ZXJfZ2VtX3ByaW1lX3Zt
YXApOwotCi0vKioKLSAqIGRybV9nZW1fdnJhbV9kcml2ZXJfZ2VtX3ByaW1lX3Z1bm1hcCgpIC0g
XAotCUltcGxlbWVudHMgJnN0cnVjdCBkcm1fZHJpdmVyLmdlbV9wcmltZV92dW5tYXAKLSAqIEBn
ZW06CVRoZSBHRU0gb2JqZWN0IHRvIHVubWFwCi0gKiBAdmFkZHI6CVRoZSBtYXBwaW5nJ3MgYmFz
ZSBhZGRyZXNzCi0gKi8KLXZvaWQgZHJtX2dlbV92cmFtX2RyaXZlcl9nZW1fcHJpbWVfdnVubWFw
KHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqZ2VtLAotCQkJCQkgIHZvaWQgKnZhZGRyKQotewotCXN0
cnVjdCBkcm1fZ2VtX3ZyYW1fb2JqZWN0ICpnYm8gPSBkcm1fZ2VtX3ZyYW1fb2ZfZ2VtKGdlbSk7
Ci0KLQlkcm1fZ2VtX3ZyYW1fa3VubWFwKGdibyk7Ci0JZHJtX2dlbV92cmFtX3VucGluKGdibyk7
Ci19Ci1FWFBPUlRfU1lNQk9MKGRybV9nZW1fdnJhbV9kcml2ZXJfZ2VtX3ByaW1lX3Z1bm1hcCk7
Ci0KLS8qKgotICogZHJtX2dlbV92cmFtX2RyaXZlcl9nZW1fcHJpbWVfbW1hcCgpIC0gXAotCUlt
cGxlbWVudHMgJnN0cnVjdCBkcm1fZHJpdmVyLmdlbV9wcmltZV9tbWFwCi0gKiBAZ2VtOglUaGUg
R0VNIG9iamVjdCB0byBtYXAKLSAqIEB2bWE6CVRoZSBWTUEgZGVzY3JpYmluZyB0aGUgbWFwcGlu
ZwotICoKLSAqIFJldHVybnM6Ci0gKiAwIG9uIHN1Y2Nlc3MsIG9yCi0gKiBhIG5lZ2F0aXZlIGVy
cm5vIGNvZGUgb3RoZXJ3aXNlLgotICovCi1pbnQgZHJtX2dlbV92cmFtX2RyaXZlcl9nZW1fcHJp
bWVfbW1hcChzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKmdlbSwKLQkJCQkgICAgICAgc3RydWN0IHZt
X2FyZWFfc3RydWN0ICp2bWEpCi17Ci0Jc3RydWN0IGRybV9nZW1fdnJhbV9vYmplY3QgKmdibyA9
IGRybV9nZW1fdnJhbV9vZl9nZW0oZ2VtKTsKLQotCWdiby0+Z2VtLnZtYV9ub2RlLnZtX25vZGUu
c3RhcnQgPSBnYm8tPmJvLnZtYV9ub2RlLnZtX25vZGUuc3RhcnQ7Ci0JcmV0dXJuIGRybV9nZW1f
cHJpbWVfbW1hcChnZW0sIHZtYSk7Ci19Ci1FWFBPUlRfU1lNQk9MKGRybV9nZW1fdnJhbV9kcml2
ZXJfZ2VtX3ByaW1lX21tYXApOwpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9kcm0vZHJtX2dlbV92cmFt
X2hlbHBlci5oIGIvaW5jbHVkZS9kcm0vZHJtX2dlbV92cmFtX2hlbHBlci5oCmluZGV4IGJjOGZl
OWZlZWUzYi4uYjQxZDkzMmViNTNhIDEwMDY0NAotLS0gYS9pbmNsdWRlL2RybS9kcm1fZ2VtX3Zy
YW1faGVscGVyLmgKKysrIGIvaW5jbHVkZS9kcm0vZHJtX2dlbV92cmFtX2hlbHBlci5oCkBAIC0x
MDgsNyArMTA4LDYgQEAgZXh0ZXJuIGNvbnN0IHN0cnVjdCBkcm1fdnJhbV9tbV9mdW5jcyBkcm1f
Z2VtX3ZyYW1fbW1fZnVuY3M7CiAgKiBIZWxwZXJzIGZvciBzdHJ1Y3QgZHJtX2RyaXZlcgogICov
CiAKLXZvaWQgZHJtX2dlbV92cmFtX2RyaXZlcl9nZW1fZnJlZV9vYmplY3RfdW5sb2NrZWQoc3Ry
dWN0IGRybV9nZW1fb2JqZWN0ICpnZW0pOwogaW50IGRybV9nZW1fdnJhbV9kcml2ZXJfZHVtYl9j
cmVhdGUoc3RydWN0IGRybV9maWxlICpmaWxlLAogCQkJCSAgICBzdHJ1Y3QgZHJtX2RldmljZSAq
ZGV2LAogCQkJCSAgICBzdHJ1Y3QgZHJtX21vZGVfY3JlYXRlX2R1bWIgKmFyZ3MpOwpAQCAtMTI0
LDI5ICsxMjMsOCBAQCBpbnQgZHJtX2dlbV92cmFtX2RyaXZlcl9kdW1iX21tYXBfb2Zmc2V0KHN0
cnVjdCBkcm1fZmlsZSAqZmlsZSwKICAqICZzdHJ1Y3QgZHJtX2RyaXZlciB3aXRoIGRlZmF1bHQg
ZnVuY3Rpb25zLgogICovCiAjZGVmaW5lIERSTV9HRU1fVlJBTV9EUklWRVIgXAotCS5nZW1fZnJl
ZV9vYmplY3RfdW5sb2NrZWQgPSBcCi0JCWRybV9nZW1fdnJhbV9kcml2ZXJfZ2VtX2ZyZWVfb2Jq
ZWN0X3VubG9ja2VkLCBcCiAJLmR1bWJfY3JlYXRlCQkgID0gZHJtX2dlbV92cmFtX2RyaXZlcl9k
dW1iX2NyZWF0ZSwgXAogCS5kdW1iX21hcF9vZmZzZXQJICA9IGRybV9nZW1fdnJhbV9kcml2ZXJf
ZHVtYl9tbWFwX29mZnNldCwgXAogCS5nZW1fcHJpbWVfbW1hcAkJICA9IGRybV9nZW1fcHJpbWVf
bW1hcAogCi0vKgotICogUFJJTUUgaGVscGVycyBmb3Igc3RydWN0IGRybV9kcml2ZXIKLSAqLwot
Ci1pbnQgZHJtX2dlbV92cmFtX2RyaXZlcl9nZW1fcHJpbWVfcGluKHN0cnVjdCBkcm1fZ2VtX29i
amVjdCAqb2JqKTsKLXZvaWQgZHJtX2dlbV92cmFtX2RyaXZlcl9nZW1fcHJpbWVfdW5waW4oc3Ry
dWN0IGRybV9nZW1fb2JqZWN0ICpvYmopOwotdm9pZCAqZHJtX2dlbV92cmFtX2RyaXZlcl9nZW1f
cHJpbWVfdm1hcChzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaik7Ci12b2lkIGRybV9nZW1fdnJh
bV9kcml2ZXJfZ2VtX3ByaW1lX3Z1bm1hcChzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaiwKLQkJ
CQkJICB2b2lkICp2YWRkcik7Ci1pbnQgZHJtX2dlbV92cmFtX2RyaXZlcl9nZW1fcHJpbWVfbW1h
cChzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaiwKLQkJCQkgICAgICAgc3RydWN0IHZtX2FyZWFf
c3RydWN0ICp2bWEpOwotCi0jZGVmaW5lIERSTV9HRU1fVlJBTV9EUklWRVJfUFJJTUUgXAotCS5n
ZW1fcHJpbWVfcGluCSAgPSBkcm1fZ2VtX3ZyYW1fZHJpdmVyX2dlbV9wcmltZV9waW4sIFwKLQku
Z2VtX3ByaW1lX3VucGluICA9IGRybV9nZW1fdnJhbV9kcml2ZXJfZ2VtX3ByaW1lX3VucGluLCBc
Ci0JLmdlbV9wcmltZV92bWFwCSAgPSBkcm1fZ2VtX3ZyYW1fZHJpdmVyX2dlbV9wcmltZV92bWFw
LCBcCi0JLmdlbV9wcmltZV92dW5tYXAgPSBkcm1fZ2VtX3ZyYW1fZHJpdmVyX2dlbV9wcmltZV92
dW5tYXAsIFwKLQkuZ2VtX3ByaW1lX21tYXAJICA9IGRybV9nZW1fdnJhbV9kcml2ZXJfZ2VtX3By
aW1lX21tYXAKLQogI2VuZGlmCi0tIAoyLjIxLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxp
c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu
L2xpc3RpbmZvL2RyaS1kZXZlbA==