From: Thomas Zimmermann Subject: [PATCH 3/6] drm/gma500: Replace struct psb_framebuffer with struct drm_framebuffer Date: Fri, 22 Nov 2019 11:05:42 +0100 Message-ID: <20191122100545.16812-4-tzimmermann@suse.de> References: <20191122100545.16812-1-tzimmermann@suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx1.suse.de (mx2.suse.de [195.135.220.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3BD6E6EEC0 for ; Fri, 22 Nov 2019 10:05:49 +0000 (UTC) In-Reply-To: <20191122100545.16812-1-tzimmermann@suse.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: patrik.r.jakobsson@gmail.com, airlied@linux.ie, daniel@ffwll.ch Cc: Thomas Zimmermann , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org QWZ0ZXIgcmVtb3ZpbmcgYWxsIHVubmVjZXNzYXJ5IGZpZWxkcywgc3RydWN0IHBzYl9mcmFtZWJ1 ZmZlciBpcyBqdXN0IGEKd3JhcHBlciBhcm91bmQgc3RydWN0IGRybV9mcmFtZWJ1ZmZlci4gU28g d2UgY2FuIHJlcGxhY2UgdGhlIGZvcm1lciB3aXRoCnRoZSBsYXR0ZXIuCgpTaWduZWQtb2ZmLWJ5 OiBUaG9tYXMgWmltbWVybWFubiA8dHppbW1lcm1hbm5Ac3VzZS5kZT4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vZ21hNTAwL2FjY2VsXzJkLmMgICAgfCAgNiArKy0tCiBkcml2ZXJzL2dwdS9kcm0vZ21h NTAwL2ZyYW1lYnVmZmVyLmMgfCA0OCArKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tCiBkcml2 ZXJzL2dwdS9kcm0vZ21hNTAwL2ZyYW1lYnVmZmVyLmggfCAgOCArLS0tLQogMyBmaWxlcyBjaGFu Z2VkLCAyNSBpbnNlcnRpb25zKCspLCAzNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vZ21hNTAwL2FjY2VsXzJkLmMgYi9kcml2ZXJzL2dwdS9kcm0vZ21hNTAwL2Fj Y2VsXzJkLmMKaW5kZXggNDVhZDVmZmVkYzkzLi4zZDFhZDJmODU2MjggMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9nbWE1MDAvYWNjZWxfMmQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZ21h NTAwL2FjY2VsXzJkLmMKQEAgLTIyNyw4ICsyMjcsNyBAQCBzdGF0aWMgdm9pZCBwc2JmYl9jb3B5 YXJlYV9hY2NlbChzdHJ1Y3QgZmJfaW5mbyAqaW5mbywKIAkJCQkgY29uc3Qgc3RydWN0IGZiX2Nv cHlhcmVhICphKQogewogCXN0cnVjdCBwc2JfZmJkZXYgKmZiZGV2ID0gaW5mby0+cGFyOwotCXN0 cnVjdCBwc2JfZnJhbWVidWZmZXIgKnBzYmZiID0gJmZiZGV2LT5wZmI7Ci0Jc3RydWN0IGRybV9k ZXZpY2UgKmRldiA9IHBzYmZiLT5iYXNlLmRldjsKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0g ZmJkZXYtPmZiLmRldjsKIAlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IGZiZGV2LT5wc2Jf ZmJfaGVscGVyLmZiOwogCXN0cnVjdCBkcm1fcHNiX3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5k ZXZfcHJpdmF0ZTsKIAl1aW50MzJfdCBvZmZzZXQ7CkBAIC0zMTAsOCArMzA5LDcgQEAgdm9pZCBw c2JmYl9jb3B5YXJlYShzdHJ1Y3QgZmJfaW5mbyAqaW5mbywKIGludCBwc2JmYl9zeW5jKHN0cnVj dCBmYl9pbmZvICppbmZvKQogewogCXN0cnVjdCBwc2JfZmJkZXYgKmZiZGV2ID0gaW5mby0+cGFy OwotCXN0cnVjdCBwc2JfZnJhbWVidWZmZXIgKnBzYmZiID0gJmZiZGV2LT5wZmI7Ci0Jc3RydWN0 IGRybV9kZXZpY2UgKmRldiA9IHBzYmZiLT5iYXNlLmRldjsKKwlzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2ID0gZmJkZXYtPmZiLmRldjsKIAlzdHJ1Y3QgZHJtX3BzYl9wcml2YXRlICpkZXZfcHJpdiA9 IGRldi0+ZGV2X3ByaXZhdGU7CiAJdW5zaWduZWQgbG9uZyBfZW5kID0gamlmZmllcyArIEhaOwog CWludCBidXN5ID0gMDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9nbWE1MDAvZnJhbWVi dWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9nbWE1MDAvZnJhbWVidWZmZXIuYwppbmRleCBmNTZh MWZjZjU4YWIuLmIwZjRiNjE5NGJkYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2dtYTUw MC9mcmFtZWJ1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9nbWE1MDAvZnJhbWVidWZmZXIu YwpAQCAtNzgsOSArNzgsOSBAQCBzdGF0aWMgaW50IHBzYmZiX3NldGNvbHJlZyh1bnNpZ25lZCBy ZWdubywgdW5zaWduZWQgcmVkLCB1bnNpZ25lZCBncmVlbiwKIHN0YXRpYyBpbnQgcHNiZmJfcGFu KHN0cnVjdCBmYl92YXJfc2NyZWVuaW5mbyAqdmFyLCBzdHJ1Y3QgZmJfaW5mbyAqaW5mbykKIHsK IAlzdHJ1Y3QgcHNiX2ZiZGV2ICpmYmRldiA9IGluZm8tPnBhcjsKLQlzdHJ1Y3QgcHNiX2ZyYW1l YnVmZmVyICpwc2JmYiA9ICZmYmRldi0+cGZiOwotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBw c2JmYi0+YmFzZS5kZXY7Ci0Jc3RydWN0IGd0dF9yYW5nZSAqZ3R0ID0gdG9fZ3R0X3JhbmdlKHBz YmZiLT5iYXNlLm9ialswXSk7CisJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIgPSAmZmJkZXYt PmZiOworCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBmYi0+ZGV2OworCXN0cnVjdCBndHRfcmFu Z2UgKmd0dCA9IHRvX2d0dF9yYW5nZShmYi0+b2JqWzBdKTsKIAogCS8qCiAJICoJV2UgaGF2ZSB0 byBwb2tlIG91ciBub3NlIGluIGhlcmUuIFRoZSBjb3JlIGZiIGNvZGUgYXNzdW1lcwpAQCAtOTks MTAgKzk5LDEwIEBAIHN0YXRpYyBpbnQgcHNiZmJfcGFuKHN0cnVjdCBmYl92YXJfc2NyZWVuaW5m byAqdmFyLCBzdHJ1Y3QgZmJfaW5mbyAqaW5mbykKIHN0YXRpYyB2bV9mYXVsdF90IHBzYmZiX3Zt X2ZhdWx0KHN0cnVjdCB2bV9mYXVsdCAqdm1mKQogewogCXN0cnVjdCB2bV9hcmVhX3N0cnVjdCAq dm1hID0gdm1mLT52bWE7Ci0Jc3RydWN0IHBzYl9mcmFtZWJ1ZmZlciAqcHNiZmIgPSB2bWEtPnZt X3ByaXZhdGVfZGF0YTsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gcHNiZmItPmJhc2UuZGV2 OworCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0gdm1hLT52bV9wcml2YXRlX2RhdGE7CisJ c3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGZiLT5kZXY7CiAJc3RydWN0IGRybV9wc2JfcHJpdmF0 ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwotCXN0cnVjdCBndHRfcmFuZ2UgKmd0dCA9 IHRvX2d0dF9yYW5nZShwc2JmYi0+YmFzZS5vYmpbMF0pOworCXN0cnVjdCBndHRfcmFuZ2UgKmd0 dCA9IHRvX2d0dF9yYW5nZShmYi0+b2JqWzBdKTsKIAlpbnQgcGFnZV9udW07CiAJaW50IGk7CiAJ dW5zaWduZWQgbG9uZyBhZGRyZXNzOwpAQCAtMTQ2LDcgKzE0Niw3IEBAIHN0YXRpYyBjb25zdCBz dHJ1Y3Qgdm1fb3BlcmF0aW9uc19zdHJ1Y3QgcHNiZmJfdm1fb3BzID0gewogc3RhdGljIGludCBw c2JmYl9tbWFwKHN0cnVjdCBmYl9pbmZvICppbmZvLCBzdHJ1Y3Qgdm1fYXJlYV9zdHJ1Y3QgKnZt YSkKIHsKIAlzdHJ1Y3QgcHNiX2ZiZGV2ICpmYmRldiA9IGluZm8tPnBhcjsKLQlzdHJ1Y3QgcHNi X2ZyYW1lYnVmZmVyICpwc2JmYiA9ICZmYmRldi0+cGZiOworCXN0cnVjdCBkcm1fZnJhbWVidWZm ZXIgKmZiID0gJmZiZGV2LT5mYjsKIAogCWlmICh2bWEtPnZtX3Bnb2ZmICE9IDApCiAJCXJldHVy biAtRUlOVkFMOwpAQCAtMTU5LDcgKzE1OSw3IEBAIHN0YXRpYyBpbnQgcHNiZmJfbW1hcChzdHJ1 Y3QgZmJfaW5mbyAqaW5mbywgc3RydWN0IHZtX2FyZWFfc3RydWN0ICp2bWEpCiAJICogc3VpdGFi bGUgZm9yIG91ciBtbWFwIHdvcmsKIAkgKi8KIAl2bWEtPnZtX29wcyA9ICZwc2JmYl92bV9vcHM7 Ci0Jdm1hLT52bV9wcml2YXRlX2RhdGEgPSAodm9pZCAqKXBzYmZiOworCXZtYS0+dm1fcHJpdmF0 ZV9kYXRhID0gKHZvaWQgKilmYjsKIAl2bWEtPnZtX2ZsYWdzIHw9IFZNX0lPIHwgVk1fTUlYRURN QVAgfCBWTV9ET05URVhQQU5EIHwgVk1fRE9OVERVTVA7CiAJcmV0dXJuIDA7CiB9CkBAIC0yMDcs NyArMjA3LDcgQEAgc3RhdGljIHN0cnVjdCBmYl9vcHMgcHNiZmJfdW5hY2NlbF9vcHMgPSB7CiAg KgkwIG9uIHN1Y2Nlc3Mgb3IgYW4gZXJyb3IgY29kZSBpZiB3ZSBmYWlsLgogICovCiBzdGF0aWMg aW50IHBzYl9mcmFtZWJ1ZmZlcl9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCi0JCQkJCXN0 cnVjdCBwc2JfZnJhbWVidWZmZXIgKmZiLAorCQkJCQlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpm YiwKIAkJCQkJY29uc3Qgc3RydWN0IGRybV9tb2RlX2ZiX2NtZDIgKm1vZGVfY21kLAogCQkJCQlz dHJ1Y3QgZ3R0X3JhbmdlICpndCkKIHsKQEAgLTIyNSw5ICsyMjUsOSBAQCBzdGF0aWMgaW50IHBz Yl9mcmFtZWJ1ZmZlcl9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJaWYgKG1vZGVfY21k LT5waXRjaGVzWzBdICYgNjMpCiAJCXJldHVybiAtRUlOVkFMOwogCi0JZHJtX2hlbHBlcl9tb2Rl X2ZpbGxfZmJfc3RydWN0KGRldiwgJmZiLT5iYXNlLCBtb2RlX2NtZCk7Ci0JZmItPmJhc2Uub2Jq WzBdID0gJmd0LT5nZW07Ci0JcmV0ID0gZHJtX2ZyYW1lYnVmZmVyX2luaXQoZGV2LCAmZmItPmJh c2UsICZwc2JfZmJfZnVuY3MpOworCWRybV9oZWxwZXJfbW9kZV9maWxsX2ZiX3N0cnVjdChkZXYs IGZiLCBtb2RlX2NtZCk7CisJZmItPm9ialswXSA9ICZndC0+Z2VtOworCXJldCA9IGRybV9mcmFt ZWJ1ZmZlcl9pbml0KGRldiwgZmIsICZwc2JfZmJfZnVuY3MpOwogCWlmIChyZXQpIHsKIAkJZGV2 X2VycihkZXYtPmRldiwgImZyYW1lYnVmZmVyIGluaXQgZmFpbGVkOiAlZFxuIiwgcmV0KTsKIAkJ cmV0dXJuIHJldDsKQEAgLTI1Miw3ICsyNTIsNyBAQCBzdGF0aWMgc3RydWN0IGRybV9mcmFtZWJ1 ZmZlciAqcHNiX2ZyYW1lYnVmZmVyX2NyZWF0ZQogCQkJIGNvbnN0IHN0cnVjdCBkcm1fbW9kZV9m Yl9jbWQyICptb2RlX2NtZCwKIAkJCSBzdHJ1Y3QgZ3R0X3JhbmdlICpndCkKIHsKLQlzdHJ1Y3Qg cHNiX2ZyYW1lYnVmZmVyICpmYjsKKwlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYjsKIAlpbnQg cmV0OwogCiAJZmIgPSBremFsbG9jKHNpemVvZigqZmIpLCBHRlBfS0VSTkVMKTsKQEAgLTI2NCw3 ICsyNjQsNyBAQCBzdGF0aWMgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqcHNiX2ZyYW1lYnVmZmVy X2NyZWF0ZQogCQlrZnJlZShmYik7CiAJCXJldHVybiBFUlJfUFRSKHJldCk7CiAJfQotCXJldHVy biAmZmItPmJhc2U7CisJcmV0dXJuIGZiOwogfQogCiAvKioKQEAgLTMwNCw4ICszMDQsNyBAQCBz dGF0aWMgaW50IHBzYmZiX2NyZWF0ZShzdHJ1Y3QgcHNiX2ZiZGV2ICpmYmRldiwKIAlzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2ID0gZmJkZXYtPnBzYl9mYl9oZWxwZXIuZGV2OwogCXN0cnVjdCBkcm1f cHNiX3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgZmJfaW5m byAqaW5mbzsKLQlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYjsKLQlzdHJ1Y3QgcHNiX2ZyYW1l YnVmZmVyICpwc2JmYiA9ICZmYmRldi0+cGZiOworCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZi ID0gJmZiZGV2LT5mYjsKIAlzdHJ1Y3QgZHJtX21vZGVfZmJfY21kMiBtb2RlX2NtZDsKIAlpbnQg c2l6ZTsKIAlpbnQgcmV0OwpAQCAtMzc4LDEyICszNzcsMTAgQEAgc3RhdGljIGludCBwc2JmYl9j cmVhdGUoc3RydWN0IHBzYl9mYmRldiAqZmJkZXYsCiAKIAltb2RlX2NtZC5waXhlbF9mb3JtYXQg PSBkcm1fbW9kZV9sZWdhY3lfZmJfZm9ybWF0KGJwcCwgZGVwdGgpOwogCi0JcmV0ID0gcHNiX2Zy YW1lYnVmZmVyX2luaXQoZGV2LCBwc2JmYiwgJm1vZGVfY21kLCBiYWNraW5nKTsKKwlyZXQgPSBw c2JfZnJhbWVidWZmZXJfaW5pdChkZXYsIGZiLCAmbW9kZV9jbWQsIGJhY2tpbmcpOwogCWlmIChy ZXQpCiAJCWdvdG8gb3V0OwogCi0JZmIgPSAmcHNiZmItPmJhc2U7Ci0KIAlmYmRldi0+cHNiX2Zi X2hlbHBlci5mYiA9IGZiOwogCiAJaWYgKGRldl9wcml2LT5vcHMtPmFjY2VsXzJkICYmIHBpdGNo X2xpbmVzID4gOCkJLyogMkQgZW5naW5lICovCkBAIC00MTUsOCArNDEyLDcgQEAgc3RhdGljIGlu dCBwc2JmYl9jcmVhdGUoc3RydWN0IHBzYl9mYmRldiAqZmJkZXYsCiAKIAkvKiBVc2UgZGVmYXVs dCBzY3JhdGNoIHBpeG1hcCAoaW5mby0+cGl4bWFwLmZsYWdzID0gRkJfUElYTUFQX1NZU1RFTSkg Ki8KIAotCWRldl9kYmcoZGV2LT5kZXYsICJhbGxvY2F0ZWQgJWR4JWQgZmJcbiIsCi0JCQkJCXBz YmZiLT5iYXNlLndpZHRoLCBwc2JmYi0+YmFzZS5oZWlnaHQpOworCWRldl9kYmcoZGV2LT5kZXYs ICJhbGxvY2F0ZWQgJWR4JWQgZmJcbiIsIGZiLT53aWR0aCwgZmItPmhlaWdodCk7CiAKIAlyZXR1 cm4gMDsKIG91dDoKQEAgLTQ4MywxNiArNDc5LDE2IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJt X2ZiX2hlbHBlcl9mdW5jcyBwc2JfZmJfaGVscGVyX2Z1bmNzID0gewogCiBzdGF0aWMgaW50IHBz Yl9mYmRldl9kZXN0cm95KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBwc2JfZmJkZXYg KmZiZGV2KQogewotCXN0cnVjdCBwc2JfZnJhbWVidWZmZXIgKnBzYmZiID0gJmZiZGV2LT5wZmI7 CisJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIgPSAmZmJkZXYtPmZiOwogCiAJZHJtX2ZiX2hl bHBlcl91bnJlZ2lzdGVyX2ZiaSgmZmJkZXYtPnBzYl9mYl9oZWxwZXIpOwogCiAJZHJtX2ZiX2hl bHBlcl9maW5pKCZmYmRldi0+cHNiX2ZiX2hlbHBlcik7Ci0JZHJtX2ZyYW1lYnVmZmVyX3VucmVn aXN0ZXJfcHJpdmF0ZSgmcHNiZmItPmJhc2UpOwotCWRybV9mcmFtZWJ1ZmZlcl9jbGVhbnVwKCZw c2JmYi0+YmFzZSk7CisJZHJtX2ZyYW1lYnVmZmVyX3VucmVnaXN0ZXJfcHJpdmF0ZShmYik7CisJ ZHJtX2ZyYW1lYnVmZmVyX2NsZWFudXAoZmIpOwogCi0JaWYgKHBzYmZiLT5iYXNlLm9ialswXSkK LQkJZHJtX2dlbV9vYmplY3RfcHV0X3VubG9ja2VkKHBzYmZiLT5iYXNlLm9ialswXSk7CisJaWYg KGZiLT5vYmpbMF0pCisJCWRybV9nZW1fb2JqZWN0X3B1dF91bmxvY2tlZChmYi0+b2JqWzBdKTsK IAlyZXR1cm4gMDsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2dtYTUwMC9mcmFt ZWJ1ZmZlci5oIGIvZHJpdmVycy9ncHUvZHJtL2dtYTUwMC9mcmFtZWJ1ZmZlci5oCmluZGV4IDk1 ZDQ0ODVkYzg2MC4uYWUxMjgwMTgyOWIyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZ21h NTAwL2ZyYW1lYnVmZmVyLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2dtYTUwMC9mcmFtZWJ1ZmZl ci5oCkBAIC0xMywxNyArMTMsMTEgQEAKIAogI2luY2x1ZGUgInBzYl9kcnYuaCIKIAotc3RydWN0 IHBzYl9mcmFtZWJ1ZmZlciB7Ci0Jc3RydWN0IGRybV9mcmFtZWJ1ZmZlciBiYXNlOwotfTsKLQog c3RydWN0IHBzYl9mYmRldiB7CiAJc3RydWN0IGRybV9mYl9oZWxwZXIgcHNiX2ZiX2hlbHBlcjsg LyogbXVzdCBiZSBmaXJzdCAqLwotCXN0cnVjdCBwc2JfZnJhbWVidWZmZXIgcGZiOworCXN0cnVj dCBkcm1fZnJhbWVidWZmZXIgZmI7CiB9OwogCi0jZGVmaW5lIHRvX3BzYl9mYih4KSBjb250YWlu ZXJfb2YoeCwgc3RydWN0IHBzYl9mcmFtZWJ1ZmZlciwgYmFzZSkKLQogZXh0ZXJuIGludCBnbWFf Y29ubmVjdG9yX2Nsb25lcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgdHlwZV9tYXNrKTsK IAogI2VuZGlmCi0tIAoyLjIzLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2RyaS1kZXZlbA==