From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH] drm/i915: Fix sprite_scaling_enabled for multiple sprites Date: Fri, 8 Feb 2013 23:13:35 +0200 Message-ID: <1360358015-26643-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 5A829E5F22 for ; Fri, 8 Feb 2013 13:13:38 -0800 (PST) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCldl IGhhdmUgbW9yZSB0aGFuIG9uZSBzcHJpdGUsIHNvIGEgYm9vbGVhbiBzaW1wbHkgd29uJ3QgY3V0 IGl0LgpUdXJuIHNwcml0ZV9zY2FsaW5nX2VuYWJsZWQgaW50byBhIGJpdG1hc2sgYW5kIHRyYWNr IHRoZSBzdGF0ZQpvZiBzcHJpdGUgc2NhbGVyIGZvciBlYWNoIHNwcml0ZSBpbmRlcGVuZGVudGx5 LgoKQWxzbyBkb24ndCByZS1lbmFibGUgTFAgd2F0ZXJtYXJrcyB1bnRpbCB0aGUgc3ByaXRlIHJl Z2lzdGVycwpoYXZlIGFjdHVhbGx5IGJlZW4gd3JpdHRlbiwgYW5kIHRodXMgc3ByaXRlIHNjYWxp bmcgaGFzIHJlYWxseQpiZWVuIGRpc2FibGVkLgoKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOk bMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9z cHJpdGUuYyB8IDI3ICsrKysrKysrKysrKysrKystLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2Vk LCAxNyBpbnNlcnRpb25zKCspLCAxMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aAppbmRleCA0ZTVhMzc3Li5hNzg2MGVhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTky NSw3ICs5MjUsNyBAQCB0eXBlZGVmIHN0cnVjdCBkcm1faTkxNV9wcml2YXRlIHsKIAogCS8qIG92 ZXJsYXkgKi8KIAlzdHJ1Y3QgaW50ZWxfb3ZlcmxheSAqb3ZlcmxheTsKLQlib29sIHNwcml0ZV9z Y2FsaW5nX2VuYWJsZWQ7CisJdW5zaWduZWQgaW50IHNwcml0ZV9zY2FsaW5nX2VuYWJsZWQ7CiAK IAkvKiBMVkRTIGluZm8gKi8KIAlpbnQgYmFja2xpZ2h0X2xldmVsOyAgLyogcmVzdG9yZSBiYWNr bGlnaHQgdG8gdGhpcyB2YWx1ZSAqLwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfc3ByaXRlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwppbmRl eCBmODI5MzA2Li4wM2NmZDYyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9zcHJpdGUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwpAQCAt NTAsNiArNTAsNyBAQCBpdmJfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLCBz dHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwKIAl1MzIgc3ByY3RsLCBzcHJzY2FsZSA9IDA7CiAJ dW5zaWduZWQgbG9uZyBzcHJzdXJmX29mZnNldCwgbGluZWFyX29mZnNldDsKIAlpbnQgcGl4ZWxf c2l6ZSA9IGRybV9mb3JtYXRfcGxhbmVfY3BwKGZiLT5waXhlbF9mb3JtYXQsIDApOworCWJvb2wg c2NhbGluZ193YXNfZW5hYmxlZCA9IGRldl9wcml2LT5zcHJpdGVfc2NhbGluZ19lbmFibGVkOwog CiAJc3ByY3RsID0gSTkxNV9SRUFEKFNQUkNUTChwaXBlKSk7CiAKQEAgLTEwMywxOSArMTA0LDE1 IEBAIGl2Yl91cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVjdCBkcm1f ZnJhbWVidWZmZXIgKmZiLAogCSAqIHdoZW4gc2NhbGluZyBpcyBkaXNhYmxlZC4KIAkgKi8KIAlp ZiAoY3J0Y193ICE9IHNyY193IHx8IGNydGNfaCAhPSBzcmNfaCkgewotCQlpZiAoIWRldl9wcml2 LT5zcHJpdGVfc2NhbGluZ19lbmFibGVkKSB7Ci0JCQlkZXZfcHJpdi0+c3ByaXRlX3NjYWxpbmdf ZW5hYmxlZCA9IHRydWU7CisJCWRldl9wcml2LT5zcHJpdGVfc2NhbGluZ19lbmFibGVkIHw9IDEg PDwgcGlwZTsKKworCQlpZiAoIXNjYWxpbmdfd2FzX2VuYWJsZWQpIHsKIAkJCWludGVsX3VwZGF0 ZV93YXRlcm1hcmtzKGRldik7CiAJCQlpbnRlbF93YWl0X2Zvcl92YmxhbmsoZGV2LCBwaXBlKTsK IAkJfQogCQlzcHJzY2FsZSA9IFNQUklURV9TQ0FMRV9FTkFCTEUgfCAoc3JjX3cgPDwgMTYpIHwg c3JjX2g7Ci0JfSBlbHNlIHsKLQkJaWYgKGRldl9wcml2LT5zcHJpdGVfc2NhbGluZ19lbmFibGVk KSB7Ci0JCQlkZXZfcHJpdi0+c3ByaXRlX3NjYWxpbmdfZW5hYmxlZCA9IGZhbHNlOwotCQkJLyog cG90ZW50aWFsbHkgcmUtZW5hYmxlIExQIHdhdGVybWFya3MgKi8KLQkJCWludGVsX3VwZGF0ZV93 YXRlcm1hcmtzKGRldik7Ci0JCX0KLQl9CisJfSBlbHNlCisJCWRldl9wcml2LT5zcHJpdGVfc2Nh bGluZ19lbmFibGVkICY9IH4oMSA8PCBwaXBlKTsKIAogCUk5MTVfV1JJVEUoU1BSU1RSSURFKHBp cGUpLCBmYi0+cGl0Y2hlc1swXSk7CiAJSTkxNV9XUklURShTUFJQT1MocGlwZSksIChjcnRjX3kg PDwgMTYpIHwgY3J0Y194KTsKQEAgLTE0MSw2ICsxMzgsMTAgQEAgaXZiX3VwZGF0ZV9wbGFuZShz dHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIsCiAJSTkx NV9XUklURShTUFJDVEwocGlwZSksIHNwcmN0bCk7CiAJSTkxNV9NT0RJRllfRElTUEJBU0UoU1BS U1VSRihwaXBlKSwgb2JqLT5ndHRfb2Zmc2V0ICsgc3Byc3VyZl9vZmZzZXQpOwogCVBPU1RJTkdf UkVBRChTUFJTVVJGKHBpcGUpKTsKKworCS8qIHBvdGVudGlhbGx5IHJlLWVuYWJsZSBMUCB3YXRl cm1hcmtzICovCisJaWYgKHNjYWxpbmdfd2FzX2VuYWJsZWQgJiYgIWRldl9wcml2LT5zcHJpdGVf c2NhbGluZ19lbmFibGVkKQorCQlpbnRlbF91cGRhdGVfd2F0ZXJtYXJrcyhkZXYpOwogfQogCiBz dGF0aWMgdm9pZApAQCAtMTUwLDYgKzE1MSw3IEBAIGl2Yl9kaXNhYmxlX3BsYW5lKHN0cnVjdCBk cm1fcGxhbmUgKnBsYW5lKQogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRl di0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9IHRvX2lu dGVsX3BsYW5lKHBsYW5lKTsKIAlpbnQgcGlwZSA9IGludGVsX3BsYW5lLT5waXBlOworCWJvb2wg c2NhbGluZ193YXNfZW5hYmxlZCA9IGRldl9wcml2LT5zcHJpdGVfc2NhbGluZ19lbmFibGVkOwog CiAJSTkxNV9XUklURShTUFJDVEwocGlwZSksIEk5MTVfUkVBRChTUFJDVEwocGlwZSkpICYgflNQ UklURV9FTkFCTEUpOwogCS8qIENhbid0IGxlYXZlIHRoZSBzY2FsZXIgZW5hYmxlZC4uLiAqLwpA QCAtMTU5LDggKzE2MSwxMSBAQCBpdmJfZGlzYWJsZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpw bGFuZSkKIAlJOTE1X01PRElGWV9ESVNQQkFTRShTUFJTVVJGKHBpcGUpLCAwKTsKIAlQT1NUSU5H X1JFQUQoU1BSU1VSRihwaXBlKSk7CiAKLQlkZXZfcHJpdi0+c3ByaXRlX3NjYWxpbmdfZW5hYmxl ZCA9IGZhbHNlOwotCWludGVsX3VwZGF0ZV93YXRlcm1hcmtzKGRldik7CisJZGV2X3ByaXYtPnNw cml0ZV9zY2FsaW5nX2VuYWJsZWQgJj0gfigxIDw8IHBpcGUpOworCisJLyogcG90ZW50aWFsbHkg cmUtZW5hYmxlIExQIHdhdGVybWFya3MgKi8KKwlpZiAoc2NhbGluZ193YXNfZW5hYmxlZCAmJiAh ZGV2X3ByaXYtPnNwcml0ZV9zY2FsaW5nX2VuYWJsZWQpCisJCWludGVsX3VwZGF0ZV93YXRlcm1h cmtzKGRldik7CiB9CiAKIHN0YXRpYyBpbnQKLS0gCjEuNy4xMi40CgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=