From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 11/18] drm/i915: Pass drm_frambuffer to intel_compute_page_offset() Date: Wed, 20 Jan 2016 21:05:32 +0200 Message-ID: <1453316739-13296-12-git-send-email-ville.syrjala@linux.intel.com> References: <1453316739-13296-1-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id B76348984E for ; Wed, 20 Jan 2016 11:06:14 -0800 (PST) In-Reply-To: <1453316739-13296-1-git-send-email-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCmlu dGVsX2NvbXB1dGVfcGFnZV9vZmZzZXRzKCkgZ2V0cyBwYXNzZWQgYSBidW5jaCBvZiB0aGUgZnJh bWVidWZmZXIKbWV0YWRhdGUgc2VwZWFyYXRlbHkuIEp1c3QgcGFzcyB0aGUgZnJhbWVidWZmZXIg aXRzZWxmIHRvIG1ha2UgbGlmZQpzaW1wbGVyIGZvciB0aGUgY2FsbGVyLCBhbmQgbWFrZSBpdCBs ZXNzIGxpa2VseSB0aGV5IHdvdWxkIG1ha2UgYQptaXN0YWtlIGluIHRoZSBvcmRlciBvZiB0aGUg YXJndW1lbnRzIChhcyBtb3N0IGFzIGp1c3QgdW5zaWduZWQgaW50cyBhbmQKc3VjaCkuCgpXZSBz dGlsbCBwYXNzIHRoZSBwaXRjaCBleHBsaWNpdGx5IHNpbmNlIGZvciA5MC8yNzAgZGVncmVlIHJv dGF0aW9uCnRoZSBjYWxsZXIgaGFzIHRvIHBhc3MgaW4gdGhlIHJpZ2h0IHRoaW5nLgoKU2lnbmVk LW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4K UmV2aWV3ZWQtYnk6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMTUgKysrKysrKy0tLS0tLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgNiArKy0tLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jICB8ICA5ICsrKy0tLS0tLQogMyBmaWxlcyBj aGFuZ2VkLCAxMiBpbnNlcnRpb25zKCspLCAxOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggMjk3ODdlZTg4OGQzLi4wODRjOGFlMzY2OGYgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTI0OTEsMTMgKzI0OTEsMTQgQEAgc3Rh dGljIHZvaWQgaW50ZWxfYWRqdXN0X3RpbGVfb2Zmc2V0KGludCAqeCwgaW50ICp5LAogICogdG8g YmUgYWxyZWFkeSByb3RhdGVkIHRvIG1hdGNoIHRoZSByb3RhdGVkIEdUVCB2aWV3LCBhbmQKICAq IHBpdGNoIGlzIHRoZSB0aWxlX2hlaWdodCBhbGlnbmVkIGZyYW1lYnVmZmVyIGhlaWdodC4KICAq LwotdTMyIGludGVsX2NvbXB1dGVfdGlsZV9vZmZzZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2LAotCQkJICAgICAgaW50ICp4LCBpbnQgKnksCi0JCQkgICAgICB1aW50NjRfdCBm Yl9tb2RpZmllciwKLQkJCSAgICAgIHVuc2lnbmVkIGludCBjcHAsCit1MzIgaW50ZWxfY29tcHV0 ZV90aWxlX29mZnNldChpbnQgKngsIGludCAqeSwKKwkJCSAgICAgIGNvbnN0IHN0cnVjdCBkcm1f ZnJhbWVidWZmZXIgKmZiLCBpbnQgcGxhbmUsCiAJCQkgICAgICB1bnNpZ25lZCBpbnQgcGl0Y2gs CiAJCQkgICAgICB1bnNpZ25lZCBpbnQgcm90YXRpb24pCiB7CisJY29uc3Qgc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShmYi0+ZGV2KTsKKwl1aW50NjRfdCBmYl9t b2RpZmllciA9IGZiLT5tb2RpZmllcltwbGFuZV07CisJdW5zaWduZWQgaW50IGNwcCA9IGRybV9m b3JtYXRfcGxhbmVfY3BwKGZiLT5waXhlbF9mb3JtYXQsIHBsYW5lKTsKIAl1bnNpZ25lZCBpbnQg b2Zmc2V0LCBhbGlnbm1lbnQ7CiAKIAlhbGlnbm1lbnQgPSBpbnRlbF9zdXJmX2FsaWdubWVudChk ZXZfcHJpdiwgZmJfbW9kaWZpZXIpOwpAQCAtMjgzMyw4ICsyODM0LDcgQEAgc3RhdGljIHZvaWQg aTl4eF91cGRhdGVfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwcmltYXJ5LAogCiAJ aWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDQpIHsKIAkJaW50ZWxfY3J0Yy0+ZHNwYWRkcl9v ZmZzZXQgPQotCQkJaW50ZWxfY29tcHV0ZV90aWxlX29mZnNldChkZXZfcHJpdiwgJngsICZ5LAot CQkJCQkJICBmYi0+bW9kaWZpZXJbMF0sIGNwcCwKKwkJCWludGVsX2NvbXB1dGVfdGlsZV9vZmZz ZXQoJngsICZ5LCBmYiwgMCwKIAkJCQkJCSAgZmItPnBpdGNoZXNbMF0sIHJvdGF0aW9uKTsKIAkJ bGluZWFyX29mZnNldCAtPSBpbnRlbF9jcnRjLT5kc3BhZGRyX29mZnNldDsKIAl9IGVsc2UgewpA QCAtMjk0MSw4ICsyOTQxLDcgQEAgc3RhdGljIHZvaWQgaXJvbmxha2VfdXBkYXRlX3ByaW1hcnlf cGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcHJpbWFyeSwKIAogCWxpbmVhcl9vZmZzZXQgPSB5ICog ZmItPnBpdGNoZXNbMF0gKyB4ICogY3BwOwogCWludGVsX2NydGMtPmRzcGFkZHJfb2Zmc2V0ID0K LQkJaW50ZWxfY29tcHV0ZV90aWxlX29mZnNldChkZXZfcHJpdiwgJngsICZ5LAotCQkJCQkgIGZi LT5tb2RpZmllclswXSwgY3BwLAorCQlpbnRlbF9jb21wdXRlX3RpbGVfb2Zmc2V0KCZ4LCAmeSwg ZmIsIDAsCiAJCQkJCSAgZmItPnBpdGNoZXNbMF0sIHJvdGF0aW9uKTsKIAlsaW5lYXJfb2Zmc2V0 IC09IGludGVsX2NydGMtPmRzcGFkZHJfb2Zmc2V0OwogCWlmIChyb3RhdGlvbiA9PSBCSVQoRFJN X1JPVEFURV8xODApKSB7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDJkM2VjYjU5MmE5 MS4uYjllZjlkNWYxMDQxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtMTE3MSwxMCAr MTE3MSw4IEBAIHZvaWQgYXNzZXJ0X2ZkaV9yeF9wbGwoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2LAogdm9pZCBhc3NlcnRfcGlwZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsIGVudW0gcGlwZSBwaXBlLCBib29sIHN0YXRlKTsKICNkZWZpbmUgYXNzZXJ0X3BpcGVf ZW5hYmxlZChkLCBwKSBhc3NlcnRfcGlwZShkLCBwLCB0cnVlKQogI2RlZmluZSBhc3NlcnRfcGlw ZV9kaXNhYmxlZChkLCBwKSBhc3NlcnRfcGlwZShkLCBwLCBmYWxzZSkKLXUzMiBpbnRlbF9jb21w dXRlX3RpbGVfb2Zmc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKLQkJCSAg ICAgIGludCAqeCwgaW50ICp5LAotCQkJICAgICAgdWludDY0X3QgZmJfbW9kaWZpZXIsCi0JCQkg ICAgICB1bnNpZ25lZCBpbnQgY3BwLAordTMyIGludGVsX2NvbXB1dGVfdGlsZV9vZmZzZXQoaW50 ICp4LCBpbnQgKnksCisJCQkgICAgICBjb25zdCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwg aW50IHBsYW5lLAogCQkJICAgICAgdW5zaWduZWQgaW50IHBpdGNoLAogCQkJICAgICAgdW5zaWdu ZWQgaW50IHJvdGF0aW9uKTsKIHZvaWQgaW50ZWxfcHJlcGFyZV9yZXNldChzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0 ZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKaW5kZXggN2RjMmI4YjJh NGFjLi44ODIxNTMzNTYxYjEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3Nwcml0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCkBAIC00 MjMsOCArNDIzLDcgQEAgdmx2X3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpkcGxhbmUs CiAJY3J0Y19oLS07CiAKIAlsaW5lYXJfb2Zmc2V0ID0geSAqIGZiLT5waXRjaGVzWzBdICsgeCAq IGNwcDsKLQlzcHJzdXJmX29mZnNldCA9IGludGVsX2NvbXB1dGVfdGlsZV9vZmZzZXQoZGV2X3By aXYsICZ4LCAmeSwKLQkJCQkJCSAgIGZiLT5tb2RpZmllclswXSwgY3BwLAorCXNwcnN1cmZfb2Zm c2V0ID0gaW50ZWxfY29tcHV0ZV90aWxlX29mZnNldCgmeCwgJnksIGZiLCAwLAogCQkJCQkJICAg ZmItPnBpdGNoZXNbMF0sIHJvdGF0aW9uKTsKIAlsaW5lYXJfb2Zmc2V0IC09IHNwcnN1cmZfb2Zm c2V0OwogCkBAIC01NTcsOCArNTU2LDcgQEAgaXZiX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3Bs YW5lICpwbGFuZSwKIAkJc3Byc2NhbGUgPSBTUFJJVEVfU0NBTEVfRU5BQkxFIHwgKHNyY193IDw8 IDE2KSB8IHNyY19oOwogCiAJbGluZWFyX29mZnNldCA9IHkgKiBmYi0+cGl0Y2hlc1swXSArIHgg KiBjcHA7Ci0Jc3Byc3VyZl9vZmZzZXQgPSBpbnRlbF9jb21wdXRlX3RpbGVfb2Zmc2V0KGRldl9w cml2LCAmeCwgJnksCi0JCQkJCQkgICBmYi0+bW9kaWZpZXJbMF0sIGNwcCwKKwlzcHJzdXJmX29m ZnNldCA9IGludGVsX2NvbXB1dGVfdGlsZV9vZmZzZXQoJngsICZ5LCBmYiwgMCwKIAkJCQkJCSAg IGZiLT5waXRjaGVzWzBdLCByb3RhdGlvbik7CiAJbGluZWFyX29mZnNldCAtPSBzcHJzdXJmX29m ZnNldDsKIApAQCAtNjk1LDggKzY5Myw3IEBAIGlsa191cGRhdGVfcGxhbmUoc3RydWN0IGRybV9w bGFuZSAqcGxhbmUsCiAJCWR2c3NjYWxlID0gRFZTX1NDQUxFX0VOQUJMRSB8IChzcmNfdyA8PCAx NikgfCBzcmNfaDsKIAogCWxpbmVhcl9vZmZzZXQgPSB5ICogZmItPnBpdGNoZXNbMF0gKyB4ICog Y3BwOwotCWR2c3N1cmZfb2Zmc2V0ID0gaW50ZWxfY29tcHV0ZV90aWxlX29mZnNldChkZXZfcHJp diwgJngsICZ5LAotCQkJCQkJICAgZmItPm1vZGlmaWVyWzBdLCBjcHAsCisJZHZzc3VyZl9vZmZz ZXQgPSBpbnRlbF9jb21wdXRlX3RpbGVfb2Zmc2V0KCZ4LCAmeSwgZmIsIDAsCiAJCQkJCQkgICBm Yi0+cGl0Y2hlc1swXSwgcm90YXRpb24pOwogCWxpbmVhcl9vZmZzZXQgLT0gZHZzc3VyZl9vZmZz ZXQ7CiAKLS0gCjIuNC4xMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK