From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gerd Hoffmann Subject: [PATCH v3 14/15] drm/bochs: drop old fbdev emulation code Date: Thu, 10 Jan 2019 09:28:44 +0100 Message-ID: <20190110082845.3453-15-kraxel@redhat.com> References: <20190110082845.3453-1-kraxel@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by gabe.freedesktop.org (Postfix) with ESMTPS id 108456ED53 for ; Thu, 10 Jan 2019 08:28:53 +0000 (UTC) In-Reply-To: <20190110082845.3453-1-kraxel@redhat.com> 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, David Airlie Cc: andr2000@gmail.com, David Airlie , Gerd Hoffmann , open list , "open list:DRM DRIVER FOR BOCHS VIRTUAL GPU" List-Id: dri-devel@lists.freedesktop.org Tm90IG5lZWRlZCBhbnkgbW9yZSwgYm9jaHMgdXNlcyB0aGUgZ2VuZXJpYyBlbXVsYXRpb24gbm93 LgoKU2lnbmVkLW9mZi1ieTogR2VyZCBIb2ZmbWFubiA8a3JheGVsQHJlZGhhdC5jb20+ClJldmll d2VkLWJ5OiBPbGVrc2FuZHIgQW5kcnVzaGNoZW5rbyA8b2xla3NhbmRyX2FuZHJ1c2hjaGVua29A ZXBhbS5jb20+CkFja2VkLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNo PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9ib2Nocy9ib2Nocy5oICAgICAgIHwgICA5IC0tLQogZHJp dmVycy9ncHUvZHJtL2JvY2hzL2JvY2hzX2Rydi5jICAgfCAgIDYgLS0KIGRyaXZlcnMvZ3B1L2Ry bS9ib2Nocy9ib2Noc19mYmRldi5jIHwgMTI5IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAxNDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2JvY2hzL2JvY2hzLmggYi9kcml2ZXJzL2dwdS9kcm0vYm9jaHMvYm9j aHMuaAppbmRleCBlZGUyMmJlYjg1Li4wMzcxMTM5NGYxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vYm9jaHMvYm9jaHMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vYm9jaHMvYm9jaHMuaApA QCAtODAsMTIgKzgwLDYgQEAgc3RydWN0IGJvY2hzX2RldmljZSB7CiAJCXN0cnVjdCB0dG1fYm9f ZGV2aWNlIGJkZXY7CiAJCWJvb2wgaW5pdGlhbGl6ZWQ7CiAJfSB0dG07Ci0KLQkvKiBmYmRldiAq LwotCXN0cnVjdCB7Ci0JCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiOwotCQlzdHJ1Y3QgZHJt X2ZiX2hlbHBlciBoZWxwZXI7Ci0JfSBmYjsKIH07CiAKIHN0cnVjdCBib2Noc19ibyB7CkBAIC0x NTcsNyArMTUxLDQgQEAgaW50IGJvY2hzX2ttc19pbml0KHN0cnVjdCBib2Noc19kZXZpY2UgKmJv Y2hzKTsKIHZvaWQgYm9jaHNfa21zX2Zpbmkoc3RydWN0IGJvY2hzX2RldmljZSAqYm9jaHMpOwog CiAvKiBib2Noc19mYmRldi5jICovCi1pbnQgYm9jaHNfZmJkZXZfaW5pdChzdHJ1Y3QgYm9jaHNf ZGV2aWNlICpib2Nocyk7Ci12b2lkIGJvY2hzX2ZiZGV2X2Zpbmkoc3RydWN0IGJvY2hzX2Rldmlj ZSAqYm9jaHMpOwotCiBleHRlcm4gY29uc3Qgc3RydWN0IGRybV9tb2RlX2NvbmZpZ19mdW5jcyBi b2Noc19tb2RlX2Z1bmNzOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2JvY2hzL2JvY2hz X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL2JvY2hzL2JvY2hzX2Rydi5jCmluZGV4IDFkODZjMGZi NWYuLmE4OTY4Y2Q4ZDUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9ib2Nocy9ib2Noc19k cnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYm9jaHMvYm9jaHNfZHJ2LmMKQEAgLTEwMiwxMiAr MTAyLDkgQEAgc3RhdGljIGludCBib2Noc19wbV9zdXNwZW5kKHN0cnVjdCBkZXZpY2UgKmRldikK IHsKIAlzdHJ1Y3QgcGNpX2RldiAqcGRldiA9IHRvX3BjaV9kZXYoZGV2KTsKIAlzdHJ1Y3QgZHJt X2RldmljZSAqZHJtX2RldiA9IHBjaV9nZXRfZHJ2ZGF0YShwZGV2KTsKLQlzdHJ1Y3QgYm9jaHNf ZGV2aWNlICpib2NocyA9IGRybV9kZXYtPmRldl9wcml2YXRlOwogCiAJZHJtX2ttc19oZWxwZXJf cG9sbF9kaXNhYmxlKGRybV9kZXYpOwogCi0JZHJtX2ZiX2hlbHBlcl9zZXRfc3VzcGVuZF91bmxv Y2tlZCgmYm9jaHMtPmZiLmhlbHBlciwgMSk7Ci0KIAlyZXR1cm4gMDsKIH0KIApAQCAtMTE1LDEy ICsxMTIsOSBAQCBzdGF0aWMgaW50IGJvY2hzX3BtX3Jlc3VtZShzdHJ1Y3QgZGV2aWNlICpkZXYp CiB7CiAJc3RydWN0IHBjaV9kZXYgKnBkZXYgPSB0b19wY2lfZGV2KGRldik7CiAJc3RydWN0IGRy bV9kZXZpY2UgKmRybV9kZXYgPSBwY2lfZ2V0X2RydmRhdGEocGRldik7Ci0Jc3RydWN0IGJvY2hz X2RldmljZSAqYm9jaHMgPSBkcm1fZGV2LT5kZXZfcHJpdmF0ZTsKIAogCWRybV9oZWxwZXJfcmVz dW1lX2ZvcmNlX21vZGUoZHJtX2Rldik7CiAKLQlkcm1fZmJfaGVscGVyX3NldF9zdXNwZW5kX3Vu bG9ja2VkKCZib2Nocy0+ZmIuaGVscGVyLCAwKTsKLQogCWRybV9rbXNfaGVscGVyX3BvbGxfZW5h YmxlKGRybV9kZXYpOwogCXJldHVybiAwOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2JvY2hzL2JvY2hzX2ZiZGV2LmMgYi9kcml2ZXJzL2dwdS9kcm0vYm9jaHMvYm9jaHNfZmJkZXYu YwppbmRleCBjY2Y3ODNiMDM4Li43Y2FjM2Y1MjUzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vYm9jaHMvYm9jaHNfZmJkZXYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYm9jaHMvYm9jaHNf ZmJkZXYuYwpAQCAtMTEsMTI0ICsxMSw2IEBACiAKIC8qIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0gKi8KIAotc3Rh dGljIGludCBib2Noc2ZiX21tYXAoc3RydWN0IGZiX2luZm8gKmluZm8sCi0JCQlzdHJ1Y3Qgdm1f YXJlYV9zdHJ1Y3QgKnZtYSkKLXsKLQlzdHJ1Y3QgZHJtX2ZiX2hlbHBlciAqZmJfaGVscGVyID0g aW5mby0+cGFyOwotCXN0cnVjdCBib2Noc19ibyAqYm8gPSBnZW1fdG9fYm9jaHNfYm8oZmJfaGVs cGVyLT5mYi0+b2JqWzBdKTsKLQotCXJldHVybiB0dG1fZmJkZXZfbW1hcCh2bWEsICZiby0+Ym8p OwotfQotCi1zdGF0aWMgc3RydWN0IGZiX29wcyBib2Noc2ZiX29wcyA9IHsKLQkub3duZXIgPSBU SElTX01PRFVMRSwKLQlEUk1fRkJfSEVMUEVSX0RFRkFVTFRfT1BTLAotCS5mYl9maWxscmVjdCA9 IGRybV9mYl9oZWxwZXJfY2ZiX2ZpbGxyZWN0LAotCS5mYl9jb3B5YXJlYSA9IGRybV9mYl9oZWxw ZXJfY2ZiX2NvcHlhcmVhLAotCS5mYl9pbWFnZWJsaXQgPSBkcm1fZmJfaGVscGVyX2NmYl9pbWFn ZWJsaXQsCi0JLmZiX21tYXAgPSBib2Noc2ZiX21tYXAsCi19OwotCi1zdGF0aWMgaW50IGJvY2hz ZmJfY3JlYXRlX29iamVjdChzdHJ1Y3QgYm9jaHNfZGV2aWNlICpib2NocywKLQkJCQkgY29uc3Qg c3RydWN0IGRybV9tb2RlX2ZiX2NtZDIgKm1vZGVfY21kLAotCQkJCSBzdHJ1Y3QgZHJtX2dlbV9v YmplY3QgKipnb2JqX3ApCi17Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGJvY2hzLT5kZXY7 Ci0Jc3RydWN0IGRybV9nZW1fb2JqZWN0ICpnb2JqOwotCXUzMiBzaXplOwotCWludCByZXQgPSAw OwotCi0Jc2l6ZSA9IG1vZGVfY21kLT5waXRjaGVzWzBdICogbW9kZV9jbWQtPmhlaWdodDsKLQly ZXQgPSBib2Noc19nZW1fY3JlYXRlKGRldiwgc2l6ZSwgdHJ1ZSwgJmdvYmopOwotCWlmIChyZXQp Ci0JCXJldHVybiByZXQ7Ci0KLQkqZ29ial9wID0gZ29iajsKLQlyZXR1cm4gcmV0OwotfQotCi1z dGF0aWMgaW50IGJvY2hzZmJfY3JlYXRlKHN0cnVjdCBkcm1fZmJfaGVscGVyICpoZWxwZXIsCi0J CQkgIHN0cnVjdCBkcm1fZmJfaGVscGVyX3N1cmZhY2Vfc2l6ZSAqc2l6ZXMpCi17Ci0Jc3RydWN0 IGJvY2hzX2RldmljZSAqYm9jaHMgPQotCQljb250YWluZXJfb2YoaGVscGVyLCBzdHJ1Y3QgYm9j aHNfZGV2aWNlLCBmYi5oZWxwZXIpOwotCXN0cnVjdCBmYl9pbmZvICppbmZvOwotCXN0cnVjdCBk cm1fZnJhbWVidWZmZXIgKmZiOwotCXN0cnVjdCBkcm1fbW9kZV9mYl9jbWQyIG1vZGVfY21kOwot CXN0cnVjdCBkcm1fZ2VtX29iamVjdCAqZ29iaiA9IE5VTEw7Ci0Jc3RydWN0IGJvY2hzX2JvICpi byA9IE5VTEw7Ci0JaW50IHNpemUsIHJldDsKLQotCWlmIChzaXplcy0+c3VyZmFjZV9icHAgIT0g MzIpCi0JCXJldHVybiAtRUlOVkFMOwotCi0JbW9kZV9jbWQud2lkdGggPSBzaXplcy0+c3VyZmFj ZV93aWR0aDsKLQltb2RlX2NtZC5oZWlnaHQgPSBzaXplcy0+c3VyZmFjZV9oZWlnaHQ7Ci0JbW9k ZV9jbWQucGl0Y2hlc1swXSA9IHNpemVzLT5zdXJmYWNlX3dpZHRoICogNDsKLQltb2RlX2NtZC5w aXhlbF9mb3JtYXQgPSBEUk1fRk9STUFUX0hPU1RfWFJHQjg4ODg7Ci0Jc2l6ZSA9IG1vZGVfY21k LnBpdGNoZXNbMF0gKiBtb2RlX2NtZC5oZWlnaHQ7Ci0KLQkvKiBhbGxvYywgcGluICYgbWFwIGJv ICovCi0JcmV0ID0gYm9jaHNmYl9jcmVhdGVfb2JqZWN0KGJvY2hzLCAmbW9kZV9jbWQsICZnb2Jq KTsKLQlpZiAocmV0KSB7Ci0JCURSTV9FUlJPUigiZmFpbGVkIHRvIGNyZWF0ZSBmYmNvbiBiYWNr aW5nIG9iamVjdCAlZFxuIiwgcmV0KTsKLQkJcmV0dXJuIHJldDsKLQl9Ci0KLQlibyA9IGdlbV90 b19ib2Noc19ibyhnb2JqKTsKLQotCXJldCA9IGJvY2hzX2JvX3BpbihibywgVFRNX1BMX0ZMQUdf VlJBTSk7Ci0JaWYgKHJldCkgewotCQlEUk1fRVJST1IoImZhaWxlZCB0byBwaW4gZmJjb25cbiIp OwotCQlyZXR1cm4gcmV0OwotCX0KLQotCXJldCA9IHR0bV9ib19rbWFwKCZiby0+Ym8sIDAsIGJv LT5iby5udW1fcGFnZXMsCi0JCQkgICZiby0+a21hcCk7Ci0JaWYgKHJldCkgewotCQlEUk1fRVJS T1IoImZhaWxlZCB0byBrbWFwIGZiY29uXG4iKTsKLQkJcmV0dXJuIHJldDsKLQl9Ci0KLQkvKiBp bml0IGZiIGRldmljZSAqLwotCWluZm8gPSBkcm1fZmJfaGVscGVyX2FsbG9jX2ZiaShoZWxwZXIp OwotCWlmIChJU19FUlIoaW5mbykpIHsKLQkJRFJNX0VSUk9SKCJGYWlsZWQgdG8gYWxsb2NhdGUg ZmJpOiAlbGRcbiIsIFBUUl9FUlIoaW5mbykpOwotCQlyZXR1cm4gUFRSX0VSUihpbmZvKTsKLQl9 Ci0KLQlpbmZvLT5wYXIgPSAmYm9jaHMtPmZiLmhlbHBlcjsKLQotCWZiID0gZHJtX2dlbV9mYmRl dl9mYl9jcmVhdGUoYm9jaHMtPmRldiwgc2l6ZXMsIDAsIGdvYmosIE5VTEwpOwotCWlmIChJU19F UlIoZmIpKSB7Ci0JCURSTV9FUlJPUigiRmFpbGVkIHRvIGNyZWF0ZSBmcmFtZWJ1ZmZlcjogJWxk XG4iLCBQVFJfRVJSKGZiKSk7Ci0JCXJldHVybiBQVFJfRVJSKGZiKTsKLQl9Ci0KLQkvKiBzZXR1 cCBoZWxwZXIgKi8KLQlib2Nocy0+ZmIuaGVscGVyLmZiID0gZmI7Ci0KLQlzdHJjcHkoaW5mby0+ Zml4LmlkLCAiYm9jaHNkcm1mYiIpOwotCi0JaW5mby0+ZmJvcHMgPSAmYm9jaHNmYl9vcHM7Ci0K LQlkcm1fZmJfaGVscGVyX2ZpbGxfZml4KGluZm8sIGZiLT5waXRjaGVzWzBdLCBmYi0+Zm9ybWF0 LT5kZXB0aCk7Ci0JZHJtX2ZiX2hlbHBlcl9maWxsX3ZhcihpbmZvLCAmYm9jaHMtPmZiLmhlbHBl ciwgc2l6ZXMtPmZiX3dpZHRoLAotCQkJICAgICAgIHNpemVzLT5mYl9oZWlnaHQpOwotCi0JaW5m by0+c2NyZWVuX2Jhc2UgPSBiby0+a21hcC52aXJ0dWFsOwotCWluZm8tPnNjcmVlbl9zaXplID0g c2l6ZTsKLQotCWRybV92bWFfb2Zmc2V0X3JlbW92ZSgmYm8tPmJvLmJkZXYtPnZtYV9tYW5hZ2Vy LCAmYm8tPmJvLnZtYV9ub2RlKTsKLQlpbmZvLT5maXguc21lbV9zdGFydCA9IDA7Ci0JaW5mby0+ Zml4LnNtZW1fbGVuID0gc2l6ZTsKLQlyZXR1cm4gMDsKLX0KLQotc3RhdGljIGNvbnN0IHN0cnVj dCBkcm1fZmJfaGVscGVyX2Z1bmNzIGJvY2hzX2ZiX2hlbHBlcl9mdW5jcyA9IHsKLQkuZmJfcHJv YmUgPSBib2Noc2ZiX2NyZWF0ZSwKLX07Ci0KIHN0YXRpYyBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVy ICoKIGJvY2hzX2dlbV9mYl9jcmVhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRy bV9maWxlICpmaWxlLAogCQkgICAgY29uc3Qgc3RydWN0IGRybV9tb2RlX2ZiX2NtZDIgKm1vZGVf Y21kKQpAQCAtMTQ1LDE0ICsyNywzIEBAIGNvbnN0IHN0cnVjdCBkcm1fbW9kZV9jb25maWdfZnVu Y3MgYm9jaHNfbW9kZV9mdW5jcyA9IHsKIAkuYXRvbWljX2NoZWNrID0gZHJtX2F0b21pY19oZWxw ZXJfY2hlY2ssCiAJLmF0b21pY19jb21taXQgPSBkcm1fYXRvbWljX2hlbHBlcl9jb21taXQsCiB9 OwotCi1pbnQgYm9jaHNfZmJkZXZfaW5pdChzdHJ1Y3QgYm9jaHNfZGV2aWNlICpib2NocykKLXsK LQlyZXR1cm4gZHJtX2ZiX2hlbHBlcl9mYmRldl9zZXR1cChib2Nocy0+ZGV2LCAmYm9jaHMtPmZi LmhlbHBlciwKLQkJCQkJICZib2Noc19mYl9oZWxwZXJfZnVuY3MsIDMyLCAxKTsKLX0KLQotdm9p ZCBib2Noc19mYmRldl9maW5pKHN0cnVjdCBib2Noc19kZXZpY2UgKmJvY2hzKQotewotCWRybV9m Yl9oZWxwZXJfZmJkZXZfdGVhcmRvd24oYm9jaHMtPmRldik7Ci19Ci0tIAoyLjkuMwoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxp bmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==