From mboxrd@z Thu Jan 1 00:00:00 1970 From: Keith Packard Subject: [PATCH 2/8] dri/intel: Split out DRI2 buffer update code to separate function Date: Mon, 4 Nov 2013 18:23:22 -0800 Message-ID: <1383618208-21310-3-git-send-email-keithp@keithp.com> References: <1383618208-21310-1-git-send-email-keithp@keithp.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from keithp.com (home.keithp.com [63.227.221.253]) by gabe.freedesktop.org (Postfix) with ESMTP id 33092EF52B for ; Mon, 4 Nov 2013 18:23:41 -0800 (PST) In-Reply-To: <1383618208-21310-1-git-send-email-keithp@keithp.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org To: mesa3d-dev@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org TWFrZSBhbiBlYXN5IHBsYWNlIHRvIHNwbGljZSBpbiBhIERSSTMgdmVyc2lvbiBvZiB0aGlzIGZ1 bmN0aW9uCgpTaWduZWQtb2ZmLWJ5OiBLZWl0aCBQYWNrYXJkIDxrZWl0aHBAa2VpdGhwLmNvbT4K UmV2aWV3ZWQtYnk6IEtyaXN0aWFuIEjDuGdzYmVyZyA8a3JoQGJpdHBsYW5ldC5uZXQ+Ci0tLQog c3JjL21lc2EvZHJpdmVycy9kcmkvaTkxNS9pbnRlbF9jb250ZXh0LmMgfCA5MCArKysrKysrKysr KysrKysrKy0tLS0tLS0tLS0tLS0tCiBzcmMvbWVzYS9kcml2ZXJzL2RyaS9pOTY1L2Jyd19jb250 ZXh0LmMgICB8IDIyICsrKysrKy0tCiAyIGZpbGVzIGNoYW5nZWQsIDY4IGluc2VydGlvbnMoKyks IDQ0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3NyYy9tZXNhL2RyaXZlcnMvZHJpL2k5MTUv aW50ZWxfY29udGV4dC5jIGIvc3JjL21lc2EvZHJpdmVycy9kcmkvaTkxNS9pbnRlbF9jb250ZXh0 LmMKaW5kZXggMjc0ODUxNC4uMTc5OGJjNyAxMDA2NDQKLS0tIGEvc3JjL21lc2EvZHJpdmVycy9k cmkvaTkxNS9pbnRlbF9jb250ZXh0LmMKKysrIGIvc3JjL21lc2EvZHJpdmVycy9kcmkvaTkxNS9p bnRlbF9jb250ZXh0LmMKQEAgLTEzMywxNSArMTMzLDU4IEBAIGludGVsX3Byb2Nlc3NfZHJpMl9i dWZmZXIoc3RydWN0IGludGVsX2NvbnRleHQgKmludGVsLAogCQkJICBzdHJ1Y3QgaW50ZWxfcmVu ZGVyYnVmZmVyICpyYiwKIAkJCSAgY29uc3QgY2hhciAqYnVmZmVyX25hbWUpOwogCi12b2lkCi1p bnRlbF91cGRhdGVfcmVuZGVyYnVmZmVycyhfX0RSSWNvbnRleHQgKmNvbnRleHQsIF9fRFJJZHJh d2FibGUgKmRyYXdhYmxlKQorc3RhdGljIHZvaWQKK2ludGVsX3VwZGF0ZV9kcmkyX2J1ZmZlcnMo c3RydWN0IGludGVsX2NvbnRleHQgKmludGVsLCBfX0RSSWRyYXdhYmxlICpkcmF3YWJsZSkKIHsK LSAgIHN0cnVjdCBnbF9mcmFtZWJ1ZmZlciAqZmIgPSBkcmF3YWJsZS0+ZHJpdmVyUHJpdmF0ZTsK LSAgIHN0cnVjdCBpbnRlbF9yZW5kZXJidWZmZXIgKnJiOwotICAgc3RydWN0IGludGVsX2NvbnRl eHQgKmludGVsID0gY29udGV4dC0+ZHJpdmVyUHJpdmF0ZTsKICAgIF9fRFJJYnVmZmVyICpidWZm ZXJzID0gTlVMTDsKICAgIGludCBpLCBjb3VudDsKICAgIGNvbnN0IGNoYXIgKnJlZ2lvbl9uYW1l OworICAgc3RydWN0IGludGVsX3JlbmRlcmJ1ZmZlciAqcmI7CisgICBzdHJ1Y3QgZ2xfZnJhbWVi dWZmZXIgKmZiID0gZHJhd2FibGUtPmRyaXZlclByaXZhdGU7CisKKyAgIGludGVsX3F1ZXJ5X2Ry aTJfYnVmZmVycyhpbnRlbCwgZHJhd2FibGUsICZidWZmZXJzLCAmY291bnQpOworCisgICBpZiAo YnVmZmVycyA9PSBOVUxMKQorICAgICAgcmV0dXJuOworCisgICBmb3IgKGkgPSAwOyBpIDwgY291 bnQ7IGkrKykgeworICAgICAgc3dpdGNoIChidWZmZXJzW2ldLmF0dGFjaG1lbnQpIHsKKyAgICAg IGNhc2UgX19EUklfQlVGRkVSX0ZST05UX0xFRlQ6CisgICAgICAgICByYiA9IGludGVsX2dldF9y ZW5kZXJidWZmZXIoZmIsIEJVRkZFUl9GUk9OVF9MRUZUKTsKKyAgICAgICAgIHJlZ2lvbl9uYW1l ID0gImRyaTIgZnJvbnQgYnVmZmVyIjsKKyAgICAgICAgIGJyZWFrOworCisgICAgICBjYXNlIF9f RFJJX0JVRkZFUl9GQUtFX0ZST05UX0xFRlQ6CisgICAgICAgICByYiA9IGludGVsX2dldF9yZW5k ZXJidWZmZXIoZmIsIEJVRkZFUl9GUk9OVF9MRUZUKTsKKyAgICAgICAgIHJlZ2lvbl9uYW1lID0g ImRyaTIgZmFrZSBmcm9udCBidWZmZXIiOworICAgICAgICAgYnJlYWs7CisKKyAgICAgIGNhc2Ug X19EUklfQlVGRkVSX0JBQ0tfTEVGVDoKKyAgICAgICAgIHJiID0gaW50ZWxfZ2V0X3JlbmRlcmJ1 ZmZlcihmYiwgQlVGRkVSX0JBQ0tfTEVGVCk7CisgICAgICAgICByZWdpb25fbmFtZSA9ICJkcmky IGJhY2sgYnVmZmVyIjsKKyAgICAgICAgIGJyZWFrOworCisgICAgICBjYXNlIF9fRFJJX0JVRkZF Ul9ERVBUSDoKKyAgICAgIGNhc2UgX19EUklfQlVGRkVSX0hJWjoKKyAgICAgIGNhc2UgX19EUklf QlVGRkVSX0RFUFRIX1NURU5DSUw6CisgICAgICBjYXNlIF9fRFJJX0JVRkZFUl9TVEVOQ0lMOgor ICAgICAgY2FzZSBfX0RSSV9CVUZGRVJfQUNDVU06CisgICAgICBkZWZhdWx0OgorICAgICAgICAg ZnByaW50ZihzdGRlcnIsCisgICAgICAgICAgICAgICAgICJ1bmhhbmRsZWQgYnVmZmVyIGF0dGFj aCBldmVudCwgYXR0YWNobWVudCB0eXBlICVkXG4iLAorICAgICAgICAgICAgICAgICBidWZmZXJz W2ldLmF0dGFjaG1lbnQpOworICAgICAgICAgcmV0dXJuOworICAgICAgfQorCisgICAgICBpbnRl bF9wcm9jZXNzX2RyaTJfYnVmZmVyKGludGVsLCBkcmF3YWJsZSwgJmJ1ZmZlcnNbaV0sIHJiLCBy ZWdpb25fbmFtZSk7CisgICB9Cit9CisKK3ZvaWQKK2ludGVsX3VwZGF0ZV9yZW5kZXJidWZmZXJz KF9fRFJJY29udGV4dCAqY29udGV4dCwgX19EUklkcmF3YWJsZSAqZHJhd2FibGUpCit7CisgICBz dHJ1Y3QgaW50ZWxfY29udGV4dCAqaW50ZWwgPSBjb250ZXh0LT5kcml2ZXJQcml2YXRlOworICAg X19EUklzY3JlZW4gKnNjcmVlbiA9IGludGVsLT5pbnRlbFNjcmVlbi0+ZHJpU2NyblByaXY7CiAK ICAgIC8qIFNldCB0aGlzIHVwIGZyb250LCBzbyB0aGF0IGluIGNhc2Ugb3VyIGJ1ZmZlcnMgZ2V0 IGludmFsaWRhdGVkCiAgICAgKiB3aGlsZSB3ZSdyZSBnZXR0aW5nIG5ldyBidWZmZXJzLCB3ZSBk b24ndCBjbG9iYmVyIHRoZSBzdGFtcCBhbmQKQEAgLTE1MSw0MiArMTk0LDcgQEAgaW50ZWxfdXBk YXRlX3JlbmRlcmJ1ZmZlcnMoX19EUkljb250ZXh0ICpjb250ZXh0LCBfX0RSSWRyYXdhYmxlICpk cmF3YWJsZSkKICAgIGlmICh1bmxpa2VseShJTlRFTF9ERUJVRyAmIERFQlVHX0RSSSkpCiAgICAg ICBmcHJpbnRmKHN0ZGVyciwgImVudGVyICVzLCBkcmF3YWJsZSAlcFxuIiwgX19mdW5jX18sIGRy YXdhYmxlKTsKIAotICAgaW50ZWxfcXVlcnlfZHJpMl9idWZmZXJzKGludGVsLCBkcmF3YWJsZSwg JmJ1ZmZlcnMsICZjb3VudCk7Ci0KLSAgIGlmIChidWZmZXJzID09IE5VTEwpCi0gICAgICByZXR1 cm47Ci0KLSAgIGZvciAoaSA9IDA7IGkgPCBjb3VudDsgaSsrKSB7Ci0gICAgICAgc3dpdGNoIChi dWZmZXJzW2ldLmF0dGFjaG1lbnQpIHsKLSAgICAgICBjYXNlIF9fRFJJX0JVRkZFUl9GUk9OVF9M RUZUOgotCSAgIHJiID0gaW50ZWxfZ2V0X3JlbmRlcmJ1ZmZlcihmYiwgQlVGRkVSX0ZST05UX0xF RlQpOwotCSAgIHJlZ2lvbl9uYW1lID0gImRyaTIgZnJvbnQgYnVmZmVyIjsKLQkgICBicmVhazsK LQotICAgICAgIGNhc2UgX19EUklfQlVGRkVSX0ZBS0VfRlJPTlRfTEVGVDoKLQkgICByYiA9IGlu dGVsX2dldF9yZW5kZXJidWZmZXIoZmIsIEJVRkZFUl9GUk9OVF9MRUZUKTsKLQkgICByZWdpb25f bmFtZSA9ICJkcmkyIGZha2UgZnJvbnQgYnVmZmVyIjsKLQkgICBicmVhazsKLQotICAgICAgIGNh c2UgX19EUklfQlVGRkVSX0JBQ0tfTEVGVDoKLQkgICByYiA9IGludGVsX2dldF9yZW5kZXJidWZm ZXIoZmIsIEJVRkZFUl9CQUNLX0xFRlQpOwotCSAgIHJlZ2lvbl9uYW1lID0gImRyaTIgYmFjayBi dWZmZXIiOwotCSAgIGJyZWFrOwotCi0gICAgICAgY2FzZSBfX0RSSV9CVUZGRVJfREVQVEg6Ci0g ICAgICAgY2FzZSBfX0RSSV9CVUZGRVJfSElaOgotICAgICAgIGNhc2UgX19EUklfQlVGRkVSX0RF UFRIX1NURU5DSUw6Ci0gICAgICAgY2FzZSBfX0RSSV9CVUZGRVJfU1RFTkNJTDoKLSAgICAgICBj YXNlIF9fRFJJX0JVRkZFUl9BQ0NVTToKLSAgICAgICBkZWZhdWx0OgotCSAgIGZwcmludGYoc3Rk ZXJyLAotCQkgICAidW5oYW5kbGVkIGJ1ZmZlciBhdHRhY2ggZXZlbnQsIGF0dGFjaG1lbnQgdHlw ZSAlZFxuIiwKLQkJICAgYnVmZmVyc1tpXS5hdHRhY2htZW50KTsKLQkgICByZXR1cm47Ci0gICAg ICAgfQotCi0gICAgICAgaW50ZWxfcHJvY2Vzc19kcmkyX2J1ZmZlcihpbnRlbCwgZHJhd2FibGUs ICZidWZmZXJzW2ldLCByYiwgcmVnaW9uX25hbWUpOwotICAgfQorICAgaW50ZWxfdXBkYXRlX2Ry aTJfYnVmZmVycyhpbnRlbCwgZHJhd2FibGUpOwogCiAgICBkcmlVcGRhdGVGcmFtZWJ1ZmZlclNp emUoJmludGVsLT5jdHgsIGRyYXdhYmxlKTsKIH0KZGlmZiAtLWdpdCBhL3NyYy9tZXNhL2RyaXZl cnMvZHJpL2k5NjUvYnJ3X2NvbnRleHQuYyBiL3NyYy9tZXNhL2RyaXZlcnMvZHJpL2k5NjUvYnJ3 X2NvbnRleHQuYwppbmRleCAxMzU2OWFkLi4yNTU3ZDEwIDEwMDY0NAotLS0gYS9zcmMvbWVzYS9k cml2ZXJzL2RyaS9pOTY1L2Jyd19jb250ZXh0LmMKKysrIGIvc3JjL21lc2EvZHJpdmVycy9kcmkv aTk2NS9icndfY29udGV4dC5jCkBAIC05NzgsMTIgKzk3OCwxMSBAQCBpbnRlbF9wcm9jZXNzX2Ry aTJfYnVmZmVyKHN0cnVjdCBicndfY29udGV4dCAqYnJ3LAogICAgICAgICAgICAgICAgICAgICAg ICAgICBzdHJ1Y3QgaW50ZWxfcmVuZGVyYnVmZmVyICpyYiwKICAgICAgICAgICAgICAgICAgICAg ICAgICAgY29uc3QgY2hhciAqYnVmZmVyX25hbWUpOwogCi12b2lkCi1pbnRlbF91cGRhdGVfcmVu ZGVyYnVmZmVycyhfX0RSSWNvbnRleHQgKmNvbnRleHQsIF9fRFJJZHJhd2FibGUgKmRyYXdhYmxl KQorc3RhdGljIHZvaWQKK2ludGVsX3VwZGF0ZV9kcmkyX2J1ZmZlcnMoc3RydWN0IGJyd19jb250 ZXh0ICpicncsIF9fRFJJZHJhd2FibGUgKmRyYXdhYmxlKQogewogICAgc3RydWN0IGdsX2ZyYW1l YnVmZmVyICpmYiA9IGRyYXdhYmxlLT5kcml2ZXJQcml2YXRlOwogICAgc3RydWN0IGludGVsX3Jl bmRlcmJ1ZmZlciAqcmI7Ci0gICBzdHJ1Y3QgYnJ3X2NvbnRleHQgKmJydyA9IGNvbnRleHQtPmRy aXZlclByaXZhdGU7CiAgICBfX0RSSWJ1ZmZlciAqYnVmZmVycyA9IE5VTEw7CiAgICBpbnQgaSwg Y291bnQ7CiAgICBjb25zdCBjaGFyICpyZWdpb25fbmFtZTsKQEAgLTEwMzMsNiArMTAzMiwyMyBA QCBpbnRlbF91cGRhdGVfcmVuZGVyYnVmZmVycyhfX0RSSWNvbnRleHQgKmNvbnRleHQsIF9fRFJJ ZHJhd2FibGUgKmRyYXdhYmxlKQogICAgICAgIGludGVsX3Byb2Nlc3NfZHJpMl9idWZmZXIoYnJ3 LCBkcmF3YWJsZSwgJmJ1ZmZlcnNbaV0sIHJiLCByZWdpb25fbmFtZSk7CiAgICB9CiAKK30KKwor dm9pZAoraW50ZWxfdXBkYXRlX3JlbmRlcmJ1ZmZlcnMoX19EUkljb250ZXh0ICpjb250ZXh0LCBf X0RSSWRyYXdhYmxlICpkcmF3YWJsZSkKK3sKKyAgIHN0cnVjdCBicndfY29udGV4dCAqYnJ3ID0g Y29udGV4dC0+ZHJpdmVyUHJpdmF0ZTsKKworICAgLyogU2V0IHRoaXMgdXAgZnJvbnQsIHNvIHRo YXQgaW4gY2FzZSBvdXIgYnVmZmVycyBnZXQgaW52YWxpZGF0ZWQKKyAgICAqIHdoaWxlIHdlJ3Jl IGdldHRpbmcgbmV3IGJ1ZmZlcnMsIHdlIGRvbid0IGNsb2JiZXIgdGhlIHN0YW1wIGFuZAorICAg ICogdGh1cyBpZ25vcmUgdGhlIGludmFsaWRhdGUuICovCisgICBkcmF3YWJsZS0+bGFzdFN0YW1w ID0gZHJhd2FibGUtPmRyaTIuc3RhbXA7CisKKyAgIGlmICh1bmxpa2VseShJTlRFTF9ERUJVRyAm IERFQlVHX0RSSSkpCisgICAgICBmcHJpbnRmKHN0ZGVyciwgImVudGVyICVzLCBkcmF3YWJsZSAl cFxuIiwgX19mdW5jX18sIGRyYXdhYmxlKTsKKworICAgaW50ZWxfdXBkYXRlX2RyaTJfYnVmZmVy cyhicncsIGRyYXdhYmxlKTsKKwogICAgZHJpVXBkYXRlRnJhbWVidWZmZXJTaXplKCZicnctPmN0 eCwgZHJhd2FibGUpOwogfQogCi0tIAoxLjguNC4yCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2RyaS1kZXZlbAo=