From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: [PATCH] drm/vmwgfx: Fix fbdev emulation using legacy functions Date: Thu, 6 Apr 2017 22:02:56 +0200 Message-ID: <20170406200256.26040-1-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wr0-x244.google.com (mail-wr0-x244.google.com [IPv6:2a00:1450:400c:c0c::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 34B1C6EA14 for ; Thu, 6 Apr 2017 20:03:04 +0000 (UTC) Received: by mail-wr0-x244.google.com with SMTP id u18so6366512wrc.1 for ; Thu, 06 Apr 2017 13:03:04 -0700 (PDT) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: DRI Development Cc: Daniel Vetter , Thomas Hellstrom , Daniel Vetter List-Id: dri-devel@lists.freedesktop.org SSd2ZSBicm9rZW4gdGhpcyBieSByZW1vdmluZyB0aGUgYmFja29mZiBoYW5kbGluZyBmcm9tIHRo ZQpzZXRfY29uZmlnMmF0b21pYyBoZWxwZXIgaW4KCmNvbW1pdCAzOGI2NDQxZTRlNzVjMGIzMTlj ZmU0ZDkzNjRjMTA1OWZjMWUzYzJiCkF1dGhvcjogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRl ckBmZndsbC5jaD4KRGF0ZTogICBXZWQgTWFyIDIyIDIyOjUwOjU4IDIwMTcgKzAxMDAKCiAgICBk cm0vYXRvbWljLWhlbHBlcjogUmVtb3ZlIHRoZSBiYWNrb2ZmIGhhY2sgZnJvbSBzZXRfY29uZmln CgpGaXhpbmcgdGhpcyBwcm9wZXJseSB3b3VsZCBtZWFuIHdlIGdldCB0byB3aXJlIHRoZSBhY3F1 aXJlX2N0eCBhbGwgdGhlCndheSB0aHJvdWdoIHZtd2dmeCBmYmRldiBjb2RlLCBhbmQgZG9pbmcg dGhlIHNhbWUgd2FzIHRyaWNreSBmb3IgdGhlCnNoYXJlZCBmYmRldiBsYXllci4gUHJvYmFibHkg bXVjaCBiZXR0ZXIgdG8gbG9vayBpbnRvIHJlZmFjdG9yaW5nIHRoZQplbnRpcmUgY29kZSB0byB1 c2UgdGhlIGhlbHBlcnMsIGJ1dCBzaW5jZSB0aGF0J3Mgbm90IGEgdmlhYmxlCmxvbmctdGVybSBz b2x1dGlvbiBmaXggdGhlIGlzc3VlIGJ5IG9wZW4tY29kaW5nIGEgdm13Z2Z4IHZlcnNpb24gb2YK c2V0X2NvbmZpZywgdGhhdCBkb2VzIHRoZSBsZWdhY3kgYmFja29mZiBkYW5jZSBpbnRlcm5hbGx5 LgoKTm90ZTogSnVzdCBjb21waWxlLXRlc3RlZC4gVGhlIGlkZWEgaXMgdG8gdGFrZQpkcm1fbW9k ZV9zZXRfY29uZmlnX2ludGVybmFsKCksIHJlbW92ZSB0aGUgImlzIHRoaXMgYSBsZWdhY3kgZHJp dmVyIgpjaGVjaywgYW5kIHdoYWNrIHRoZSBkcm1fYXRvbWljX2xlZ2FjeV9iYWNrb2ZmIHRyaWNr ZXJ5IGF0IHRoZSBlbmQuClNpbmNlIGRybV9hdG9taWNfbGVnYWN5X2JhY2tvZmYgaXMgZm9yIGF0 b21pYyBjb21taXRzIG9ubHkgd2UgbmVlZCB0bwpvcGVuLWNvZGUgaXQuCgpDYzogVGhvbWFzIEhl bGxzdHJvbSA8dGhlbGxzdHJvbUB2bXdhcmUuY29tPgpTaWduZWQtb2ZmLWJ5OiBEYW5pZWwgVmV0 dGVyIDxkYW5pZWwudmV0dGVyQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vdm13Z2Z4 L3Ztd2dmeF9mYi5jIHwgNTggKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0K IDEgZmlsZSBjaGFuZ2VkLCA1NiBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X2ZiLmMgYi9kcml2ZXJzL2dwdS9k cm0vdm13Z2Z4L3Ztd2dmeF9mYi5jCmluZGV4IDA5ZTEyMGQ1MGU2NS4uNmY0Y2I0Njc4Y2JjIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9mYi5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X2ZiLmMKQEAgLTQxOCw2ICs0MTgsNjAgQEAgc3RhdGlj IGludCB2bXdfZmJfY29tcHV0ZV9kZXB0aChzdHJ1Y3QgZmJfdmFyX3NjcmVlbmluZm8gKnZhciwK IAlyZXR1cm4gMDsKIH0KIAorc3RhdGljIGludCB2bXdnZnhfc2V0X2NvbmZpZ19pbnRlcm5hbChz dHJ1Y3QgZHJtX21vZGVfc2V0ICpzZXQpCit7CisJc3RydWN0IGRybV9jcnRjICpjcnRjID0gc2V0 LT5jcnRjOworCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiOworCXN0cnVjdCBkcm1fY3J0YyAq dG1wOworCXN0cnVjdCBkcm1fbW9kZXNldF9hY3F1aXJlX2N0eCAqY3R4OworCXN0cnVjdCBkcm1f ZGV2aWNlICpkZXYgPSBzZXQtPmNydGMtPmRldjsKKwlpbnQgcmV0OworCisJY3R4ID0gZGV2LT5t b2RlX2NvbmZpZy5hY3F1aXJlX2N0eDsKKworcmVzdGFydDoKKwkvKgorCSAqIE5PVEU6IC0+c2V0 X2NvbmZpZyBjYW4gYWxzbyBkaXNhYmxlIG90aGVyIGNydGNzIChpZiB3ZSBzdGVhbCBhbGwKKwkg KiBjb25uZWN0b3JzIGZyb20gaXQpLCBoZW5jZSB3ZSBuZWVkIHRvIHJlZmNvdW50IHRoZSBmYnMg YWNyb3NzIGFsbAorCSAqIGNydGNzLiBBdG9taWMgbW9kZXNldCB3aWxsIGhhdmUgc2FuZXIgc2Vt YW50aWNzIC4uLgorCSAqLworCWRybV9mb3JfZWFjaF9jcnRjKHRtcCwgZGV2KQorCQl0bXAtPnBy aW1hcnktPm9sZF9mYiA9IHRtcC0+cHJpbWFyeS0+ZmI7CisKKwlmYiA9IHNldC0+ZmI7CisKKwly ZXQgPSBjcnRjLT5mdW5jcy0+c2V0X2NvbmZpZyhzZXQsIGN0eCk7CisJaWYgKHJldCA9PSAwKSB7 CisJCWNydGMtPnByaW1hcnktPmNydGMgPSBjcnRjOworCQljcnRjLT5wcmltYXJ5LT5mYiA9IGZi OworCX0KKworCWRybV9mb3JfZWFjaF9jcnRjKHRtcCwgZGV2KSB7CisJCWlmICh0bXAtPnByaW1h cnktPmZiKQorCQkJZHJtX2ZyYW1lYnVmZmVyX2dldCh0bXAtPnByaW1hcnktPmZiKTsKKwkJaWYg KHRtcC0+cHJpbWFyeS0+b2xkX2ZiKQorCQkJZHJtX2ZyYW1lYnVmZmVyX3B1dCh0bXAtPnByaW1h cnktPm9sZF9mYik7CisJCXRtcC0+cHJpbWFyeS0+b2xkX2ZiID0gTlVMTDsKKwl9CisKKwlpZiAo cmV0ID09IC1FREVBRExLKSB7CisJCWRldi0+bW9kZV9jb25maWcuYWNxdWlyZV9jdHggPSBOVUxM OworCityZXRyeV9sb2NraW5nOgorCQlkcm1fbW9kZXNldF9iYWNrb2ZmKGN0eCk7CisKKwkJcmV0 ID0gZHJtX21vZGVzZXRfbG9ja19hbGxfY3R4KGRldiwgY3R4KTsKKwkJaWYgKHJldCkKKwkJCWdv dG8gcmV0cnlfbG9ja2luZzsKKworCQlkZXYtPm1vZGVfY29uZmlnLmFjcXVpcmVfY3R4ID0gY3R4 OworCisJCWdvdG8gcmVzdGFydDsKKwl9CisKKwlyZXR1cm4gcmV0OworfQorCiBzdGF0aWMgaW50 IHZtd19mYl9rbXNfZGV0YWNoKHN0cnVjdCB2bXdfZmJfcGFyICpwYXIsCiAJCQkgICAgIGJvb2wg ZGV0YWNoX2JvLAogCQkJICAgICBib29sIHVucmVmX2JvKQpAQCAtNDM2LDcgKzQ5MCw3IEBAIHN0 YXRpYyBpbnQgdm13X2ZiX2ttc19kZXRhY2goc3RydWN0IHZtd19mYl9wYXIgKnBhciwKIAkJc2V0 LmZiID0gTlVMTDsKIAkJc2V0Lm51bV9jb25uZWN0b3JzID0gMDsKIAkJc2V0LmNvbm5lY3RvcnMg PSAmcGFyLT5jb247Ci0JCXJldCA9IGRybV9tb2RlX3NldF9jb25maWdfaW50ZXJuYWwoJnNldCk7 CisJCXJldCA9IHZtd2dmeF9zZXRfY29uZmlnX2ludGVybmFsKCZzZXQpOwogCQlpZiAocmV0KSB7 CiAJCQlEUk1fRVJST1IoIkNvdWxkIG5vdCB1bnNldCBhIG1vZGUuXG4iKTsKIAkJCXJldHVybiBy ZXQ7CkBAIC01NzgsNyArNjMyLDcgQEAgc3RhdGljIGludCB2bXdfZmJfc2V0X3BhcihzdHJ1Y3Qg ZmJfaW5mbyAqaW5mbykKIAlzZXQubnVtX2Nvbm5lY3RvcnMgPSAxOwogCXNldC5jb25uZWN0b3Jz ID0gJnBhci0+Y29uOwogCi0JcmV0ID0gZHJtX21vZGVfc2V0X2NvbmZpZ19pbnRlcm5hbCgmc2V0 KTsKKwlyZXQgPSB2bXdnZnhfc2V0X2NvbmZpZ19pbnRlcm5hbCgmc2V0KTsKIAlpZiAocmV0KQog CQlnb3RvIG91dF91bmxvY2s7CiAKLS0gCjIuMTEuMAoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vZHJpLWRldmVsCg==