From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Subject: [PATCH xf86-video-amdgpu] Adapt to PixmapDirtyUpdateRec::src being a DrawablePtr Date: Tue, 18 Apr 2017 19:07:54 +0900 Message-ID: <20170418100754.14621-2-michel@daenzer.net> References: <20170418100754.14621-1-michel@daenzer.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170418100754.14621-1-michel-otUistvHUpPR7s880joybQ@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Nouveau" To: xorg-devel-go0+a7rfsptAfugRpC6u6w@public.gmane.org Cc: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, intel-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogTWljaGVsIETDpG56ZXIgPG1pY2hlbC5kYWVuemVyQGFtZC5jb20+CgpTaWduZWQtb2Zm LWJ5OiBNaWNoZWwgRMOkbnplciA8bWljaGVsLmRhZW56ZXJAYW1kLmNvbT4KLS0tCgpDaHJpcyAv IElsaWEgLyBCZW4sIHRoaXMgc2hvdWxkIGJlIG1hbmFnZWFibGUgZm9yIHRoZSBpbnRlbC9ub3V2 ZWF1CmRyaXZlcnMsIHJpZ2h0PwoKIHNyYy9hbWRncHVfZHJ2LmggICAgICB8IDI2ICsrKysrKysr KysrKysrKysrKysrKysrKysrCiBzcmMvYW1kZ3B1X2ttcy5jICAgICAgfCAxOCArKysrKysrKyst LS0tLS0tLS0KIHNyYy9kcm1tb2RlX2Rpc3BsYXkuYyB8ICA4ICsrKysrKy0tCiAzIGZpbGVzIGNo YW5nZWQsIDQxIGluc2VydGlvbnMoKyksIDExIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Ny Yy9hbWRncHVfZHJ2LmggYi9zcmMvYW1kZ3B1X2Rydi5oCmluZGV4IGU1YzQ0ZGMzNi4uOWUwODhl NzFhIDEwMDY0NAotLS0gYS9zcmMvYW1kZ3B1X2Rydi5oCisrKyBiL3NyYy9hbWRncHVfZHJ2LmgK QEAgLTE3MCw2ICsxNzAsMzIgQEAgdHlwZWRlZiBlbnVtIHsKICNkZWZpbmUgQU1ER1BVX1BJWE1B UF9TSEFSSU5HIDEKICNkZWZpbmUgYW1kZ3B1X2lzX2dwdV9zY3JlZW4oc2NyZWVuKSAoc2NyZWVu KS0+aXNHUFUKICNkZWZpbmUgYW1kZ3B1X2lzX2dwdV9zY3JuKHNjcm4pIChzY3JuKS0+aXNfZ3B1 CisKK3N0YXRpYyBpbmxpbmUgU2NyZWVuUHRyCithbWRncHVfZGlydHlfbWFzdGVyKFBpeG1hcERp cnR5VXBkYXRlUHRyIGRpcnR5KQoreworI2lmZGVmIEhBU19ESVJUWVRSQUNLSU5HX0RSQVdBQkxF X1NSQworCVNjcmVlblB0ciBzY3JlZW4gPSBkaXJ0eS0+c3JjLT5wU2NyZWVuOworI2Vsc2UKKwlT Y3JlZW5QdHIgc2NyZWVuID0gZGlydHktPnNyYy0+ZHJhd2FibGUucFNjcmVlbjsKKyNlbmRpZgor CisJaWYgKHNjcmVlbi0+Y3VycmVudF9tYXN0ZXIpCisJCXJldHVybiBzY3JlZW4tPmN1cnJlbnRf bWFzdGVyOworCisJcmV0dXJuIHNjcmVlbjsKK30KKworc3RhdGljIGlubGluZSBCb29sCithbWRn cHVfZGlydHlfc3JjX2VxdWFscyhQaXhtYXBEaXJ0eVVwZGF0ZVB0ciBkaXJ0eSwgUGl4bWFwUHRy IHBpeG1hcCkKK3sKKyNpZmRlZiBIQVNfRElSVFlUUkFDS0lOR19EUkFXQUJMRV9TUkMKKwlyZXR1 cm4gZGlydHktPnNyYyA9PSAmcGl4bWFwLT5kcmF3YWJsZTsKKyNlbHNlCisJcmV0dXJuIGRpcnR5 LT5zcmMgPT0gcGl4bWFwOworI2VuZGlmCit9CisKICNlbHNlCiAjZGVmaW5lIGFtZGdwdV9pc19n cHVfc2NyZWVuKHNjcmVlbikgMAogI2RlZmluZSBhbWRncHVfaXNfZ3B1X3Njcm4oc2NybikgMApk aWZmIC0tZ2l0IGEvc3JjL2FtZGdwdV9rbXMuYyBiL3NyYy9hbWRncHVfa21zLmMKaW5kZXggMDE4 MmNiZTBhLi4yOWQzZDA3NmYgMTAwNjQ0Ci0tLSBhL3NyYy9hbWRncHVfa21zLmMKKysrIGIvc3Jj L2FtZGdwdV9rbXMuYwpAQCAtNDQ4LDcgKzQ0OCw3IEBAIGRpcnR5X3JlZ2lvbihQaXhtYXBEaXJ0 eVVwZGF0ZVB0ciBkaXJ0eSkKIHN0YXRpYyB2b2lkCiByZWRpc3BsYXlfZGlydHkoUGl4bWFwRGly dHlVcGRhdGVQdHIgZGlydHksIFJlZ2lvblB0ciByZWdpb24pCiB7Ci0JU2NybkluZm9QdHIgc2Ny biA9IHhmODZTY3JlZW5Ub1Njcm4oZGlydHktPnNyYy0+ZHJhd2FibGUucFNjcmVlbik7CisJU2Ny bkluZm9QdHIgc2NybiA9IHhmODZTY3JlZW5Ub1Njcm4oZGlydHktPnNsYXZlX2RzdC0+ZHJhd2Fi bGUucFNjcmVlbik7CiAKIAlpZiAoUmVnaW9uTmlsKHJlZ2lvbikpCiAJCWdvdG8gb3V0OwpAQCAt NDgxLDEyICs0ODEsMTIgQEAgYW1kZ3B1X3ByaW1lX3NjYW5vdXRfdXBkYXRlX2Fib3J0KHhmODZD cnRjUHRyIGNydGMsIHZvaWQgKmV2ZW50X2RhdGEpCiB2b2lkCiBhbWRncHVfc3luY19zaGFyZWRf cGl4bWFwKFBpeG1hcERpcnR5VXBkYXRlUHRyIGRpcnR5KQogewotCVNjcmVlblB0ciBtYXN0ZXJf c2NyZWVuID0gZGlydHktPnNyYy0+bWFzdGVyX3BpeG1hcC0+ZHJhd2FibGUucFNjcmVlbjsKKwlT Y3JlZW5QdHIgbWFzdGVyX3NjcmVlbiA9IGFtZGdwdV9kaXJ0eV9tYXN0ZXIoZGlydHkpOwogCVBp eG1hcERpcnR5VXBkYXRlUHRyIGVudDsKIAlSZWdpb25QdHIgcmVnaW9uOwogCiAJeG9yZ19saXN0 X2Zvcl9lYWNoX2VudHJ5KGVudCwgJm1hc3Rlcl9zY3JlZW4tPnBpeG1hcF9kaXJ0eV9saXN0LCBl bnQpIHsKLQkJaWYgKGVudC0+c2xhdmVfZHN0ICE9IGRpcnR5LT5zcmMpCisJCWlmICghYW1kZ3B1 X2RpcnR5X3NyY19lcXVhbHMoZGlydHksIGVudC0+c2xhdmVfZHN0KSkKIAkJCWNvbnRpbnVlOwog CiAJCXJlZ2lvbiA9IGRpcnR5X3JlZ2lvbihlbnQpOwpAQCAtNTAxLDcgKzUwMSw3IEBAIGFtZGdw dV9zeW5jX3NoYXJlZF9waXhtYXAoUGl4bWFwRGlydHlVcGRhdGVQdHIgZGlydHkpCiBzdGF0aWMg Qm9vbAogbWFzdGVyX2hhc19zeW5jX3NoYXJlZF9waXhtYXAoU2NybkluZm9QdHIgc2NybiwgUGl4 bWFwRGlydHlVcGRhdGVQdHIgZGlydHkpCiB7Ci0JU2NyZWVuUHRyIG1hc3Rlcl9zY3JlZW4gPSBk aXJ0eS0+c3JjLT5tYXN0ZXJfcGl4bWFwLT5kcmF3YWJsZS5wU2NyZWVuOworCVNjcmVlblB0ciBt YXN0ZXJfc2NyZWVuID0gYW1kZ3B1X2RpcnR5X21hc3RlcihkaXJ0eSk7CiAKIAlyZXR1cm4gbWFz dGVyX3NjcmVlbi0+U3luY1NoYXJlZFBpeG1hcCAhPSBOVUxMOwogfQpAQCAtNTE3LDcgKzUxNyw3 IEBAIHNsYXZlX2hhc19zeW5jX3NoYXJlZF9waXhtYXAoU2NybkluZm9QdHIgc2NybiwgUGl4bWFw RGlydHlVcGRhdGVQdHIgZGlydHkpCiBzdGF0aWMgdm9pZAogY2FsbF9zeW5jX3NoYXJlZF9waXht YXAoUGl4bWFwRGlydHlVcGRhdGVQdHIgZGlydHkpCiB7Ci0JU2NyZWVuUHRyIG1hc3Rlcl9zY3Jl ZW4gPSBkaXJ0eS0+c3JjLT5tYXN0ZXJfcGl4bWFwLT5kcmF3YWJsZS5wU2NyZWVuOworCVNjcmVl blB0ciBtYXN0ZXJfc2NyZWVuID0gYW1kZ3B1X2RpcnR5X21hc3RlcihkaXJ0eSk7CiAKIAltYXN0 ZXJfc2NyZWVuLT5TeW5jU2hhcmVkUGl4bWFwKGRpcnR5KTsKIH0KQEAgLTUyNyw3ICs1MjcsNyBA QCBjYWxsX3N5bmNfc2hhcmVkX3BpeG1hcChQaXhtYXBEaXJ0eVVwZGF0ZVB0ciBkaXJ0eSkKIHN0 YXRpYyBCb29sCiBtYXN0ZXJfaGFzX3N5bmNfc2hhcmVkX3BpeG1hcChTY3JuSW5mb1B0ciBzY3Ju LCBQaXhtYXBEaXJ0eVVwZGF0ZVB0ciBkaXJ0eSkKIHsKLQlTY3JuSW5mb1B0ciBtYXN0ZXJfc2Ny biA9IHhmODZTY3JlZW5Ub1Njcm4oZGlydHktPnNyYy0+bWFzdGVyX3BpeG1hcC0+ZHJhd2FibGUu cFNjcmVlbik7CisJU2NybkluZm9QdHIgbWFzdGVyX3Njcm4gPSB4Zjg2U2NyZWVuVG9TY3JuKGFt ZGdwdV9kaXJ0eV9tYXN0ZXIoZGlydHkpKTsKIAogCXJldHVybiBtYXN0ZXJfc2Nybi0+ZHJpdmVy TmFtZSA9PSBzY3JuLT5kcml2ZXJOYW1lOwogfQpAQCAtNTgxLDcgKzU4MSw3IEBAIGFtZGdwdV9w cmltZV9zY2Fub3V0X2RvX3VwZGF0ZSh4Zjg2Q3J0Y1B0ciBjcnRjLCB1bnNpZ25lZCBzY2Fub3V0 X2lkKQogCUJvb2wgcmV0ID0gRkFMU0U7CiAKIAl4b3JnX2xpc3RfZm9yX2VhY2hfZW50cnkoZGly dHksICZzY3JlZW4tPnBpeG1hcF9kaXJ0eV9saXN0LCBlbnQpIHsKLQkJaWYgKGRpcnR5LT5zcmMg PT0gc2Nhbm91dHBpeCAmJiBkaXJ0eS0+c2xhdmVfZHN0ID09CisJCWlmIChhbWRncHVfZGlydHlf c3JjX2VxdWFscyhkaXJ0eSwgc2Nhbm91dHBpeCkgJiYgZGlydHktPnNsYXZlX2RzdCA9PQogCQkg ICAgZHJtbW9kZV9jcnRjLT5zY2Fub3V0W3NjYW5vdXRfaWQgXiBkcm1tb2RlX2NydGMtPnRlYXJf ZnJlZV0ucGl4bWFwKSB7CiAJCQlSZWdpb25QdHIgcmVnaW9uOwogCkBAIC03MzgsMTAgKzczOCwx MCBAQCBhbWRncHVfZGlydHlfdXBkYXRlKFNjcm5JbmZvUHRyIHNjcm4pCiAJCQlQaXhtYXBEaXJ0 eVVwZGF0ZVB0ciByZWdpb25fZW50ID0gZW50OwogCiAJCQlpZiAobWFzdGVyX2hhc19zeW5jX3No YXJlZF9waXhtYXAoc2NybiwgZW50KSkgewotCQkJCVNjcmVlblB0ciBtYXN0ZXJfc2NyZWVuID0g ZW50LT5zcmMtPm1hc3Rlcl9waXhtYXAtPmRyYXdhYmxlLnBTY3JlZW47CisJCQkJU2NyZWVuUHRy IG1hc3Rlcl9zY3JlZW4gPSBhbWRncHVfZGlydHlfbWFzdGVyKGVudCk7CiAKIAkJCQl4b3JnX2xp c3RfZm9yX2VhY2hfZW50cnkocmVnaW9uX2VudCwgJm1hc3Rlcl9zY3JlZW4tPnBpeG1hcF9kaXJ0 eV9saXN0LCBlbnQpIHsKLQkJCQkJaWYgKHJlZ2lvbl9lbnQtPnNsYXZlX2RzdCA9PSBlbnQtPnNy YykKKwkJCQkJaWYgKGFtZGdwdV9kaXJ0eV9zcmNfZXF1YWxzKGVudCwgcmVnaW9uX2VudC0+c2xh dmVfZHN0KSkKIAkJCQkJCWJyZWFrOwogCQkJCX0KIAkJCX0KZGlmZiAtLWdpdCBhL3NyYy9kcm1t b2RlX2Rpc3BsYXkuYyBiL3NyYy9kcm1tb2RlX2Rpc3BsYXkuYwppbmRleCA1ZTBjNDEzM2IuLjA2 MTAzZWQ1NiAxMDA2NDQKLS0tIGEvc3JjL2RybW1vZGVfZGlzcGxheS5jCisrKyBiL3NyYy9kcm1t b2RlX2Rpc3BsYXkuYwpAQCAtNjgxLDcgKzY4MSw3IEBAIGRybW1vZGVfY3J0Y19wcmltZV9zY2Fu b3V0X3VwZGF0ZSh4Zjg2Q3J0Y1B0ciBjcnRjLCBEaXNwbGF5TW9kZVB0ciBtb2RlLAogCiAJCXhv cmdfbGlzdF9mb3JfZWFjaF9lbnRyeShkaXJ0eSwgJnNjcmVlbi0+cGl4bWFwX2RpcnR5X2xpc3Qs CiAJCQkJCSBlbnQpIHsKLQkJCWlmIChkaXJ0eS0+c3JjID09IGNydGMtPnJhbmRyX2NydGMtPnNj YW5vdXRfcGl4bWFwICYmCisJCQlpZiAoYW1kZ3B1X2RpcnR5X3NyY19lcXVhbHMoZGlydHksIGNy dGMtPnJhbmRyX2NydGMtPnNjYW5vdXRfcGl4bWFwKSAmJgogCQkJICAgIGRpcnR5LT5zbGF2ZV9k c3QgPT0KIAkJCSAgICBkcm1tb2RlX2NydGMtPnNjYW5vdXRbZHJtbW9kZV9jcnRjLT5zY2Fub3V0 X2lkXS5waXhtYXApIHsKIAkJCQlkaXJ0eS0+c2xhdmVfZHN0ID0KQEAgLTEyMTYsNyArMTIxNiwx MSBAQCBzdGF0aWMgQm9vbCBkcm1tb2RlX3NldF9zY2Fub3V0X3BpeG1hcCh4Zjg2Q3J0Y1B0ciBj cnRjLCBQaXhtYXBQdHIgcHBpeCkKIAkJcmV0dXJuIEZBTFNFOwogCX0KIAotI2lmZGVmIEhBU19E SVJUWVRSQUNLSU5HX1JPVEFUSU9OCisjaWZkZWYgSEFTX0RJUlRZVFJBQ0tJTkdfRFJBV0FCTEVf U1JDCisJUGl4bWFwU3RhcnREaXJ0eVRyYWNraW5nKCZwcGl4LT5kcmF3YWJsZSwKKwkJCQkgZHJt bW9kZV9jcnRjLT5zY2Fub3V0W3NjYW5vdXRfaWRdLnBpeG1hcCwKKwkJCQkgMCwgMCwgMCwgMCwg UlJfUm90YXRlXzApOworI2VsaWYgZGVmaW5lZChIQVNfRElSVFlUUkFDS0lOR19ST1RBVElPTikK IAlQaXhtYXBTdGFydERpcnR5VHJhY2tpbmcocHBpeCwgZHJtbW9kZV9jcnRjLT5zY2Fub3V0W3Nj YW5vdXRfaWRdLnBpeG1hcCwKIAkJCQkgMCwgMCwgMCwgMCwgUlJfUm90YXRlXzApOwogI2VsaWYg ZGVmaW5lZChIQVNfRElSVFlUUkFDS0lORzIpCi0tIAoyLjExLjAKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCk5vdXZlYXUgbWFpbGluZyBsaXN0Ck5vdXZl YXVAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vbm91dmVhdQo=