From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH v2 02/12] drm/i915: Allow sprites to be configured on a disabled pipe Date: Tue, 1 Oct 2013 18:02:11 +0300 Message-ID: <1380639741-5276-3-git-send-email-ville.syrjala@linux.intel.com> References: <1380639741-5276-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 4015FE75AC for ; Tue, 1 Oct 2013 08:02:38 -0700 (PDT) In-Reply-To: <1380639741-5276-1-git-send-email-ville.syrjala@linux.intel.com> 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 IGFsbG93IGN1cnNvcnMgdG8gYmUgc2V0IHVwIHdoZW4gdGhlIHBpcGUgaXMgZGlzYWJsZWQuIERv IHRoZSBzYW1lIGZvcgpzcHJpdGVzIGFzIHdlbGwuCgpXZSBuZWVkIHRvIGJlIHNvbWV3aGF0IGNh cmVmdWwgd2l0aCB0aGUgcHJpbWFyeSBkaXNhYmxlIGxvZ2ljIGFzIHdlCmRvbid0IHdhbnQgdG8g YWNjaWRlbnRhbGx5IGVuYWJsZSB0aGUgcHJpbWFyeSBwbGFuZSBvbiBhIGRpc2FibGVkIHBpcGUu Cgp2MjogU2tpcCBwcmltYXJ5IGVuYWJsZS9kaXNhYmxlIGFuZCBwbGFuZSByZWdpc3RlcnMKICAg IHdyaXRlcyBvbiBkaXNhYmxlZCBwaXBlCgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6Qg PHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3Nwcml0ZS5jIHwgNjUgKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0t LQogMSBmaWxlIGNoYW5nZWQsIDMyIGluc2VydGlvbnMoKyksIDMzIGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKaW5kZXggY2FlMTBiYy4uOTE2MWExZCAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKQEAgLTYyMywxNCArNjIzLDEwIEBAIGludGVsX3Vw ZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRj LAogCQkgICB1aW50MzJfdCBzcmNfdywgdWludDMyX3Qgc3JjX2gpCiB7CiAJc3RydWN0IGRybV9k ZXZpY2UgKmRldiA9IHBsYW5lLT5kZXY7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9 IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAJc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9 IHRvX2ludGVsX3BsYW5lKHBsYW5lKTsKIAlzdHJ1Y3QgaW50ZWxfZnJhbWVidWZmZXIgKmludGVs X2ZiOwogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosICpvbGRfb2JqOwotCWludCBw aXBlID0gaW50ZWxfcGxhbmUtPnBpcGU7Ci0JZW51bSB0cmFuc2NvZGVyIGNwdV90cmFuc2NvZGVy ID0gaW50ZWxfcGlwZV90b19jcHVfdHJhbnNjb2RlcihkZXZfcHJpdiwKLQkJCQkJCQkJICAgICAg cGlwZSk7CiAJaW50IHJldCA9IDA7CiAJYm9vbCBkaXNhYmxlX3ByaW1hcnkgPSBmYWxzZTsKIAli b29sIHZpc2libGU7CkBAIC02NTIsOCArNjQ4LDggQEAgaW50ZWxfdXBkYXRlX3BsYW5lKHN0cnVj dCBkcm1fcGxhbmUgKnBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCS55MiA9IGNydGNf eSArIGNydGNfaCwKIAl9OwogCWNvbnN0IHN0cnVjdCBkcm1fcmVjdCBjbGlwID0gewotCQkueDIg PSBpbnRlbF9jcnRjLT5jb25maWcucGlwZV9zcmNfdywKLQkJLnkyID0gaW50ZWxfY3J0Yy0+Y29u ZmlnLnBpcGVfc3JjX2gsCisJCS54MiA9IGludGVsX2NydGMtPmFjdGl2ZSA/IGludGVsX2NydGMt PmNvbmZpZy5waXBlX3NyY193IDogMCwKKwkJLnkyID0gaW50ZWxfY3J0Yy0+YWN0aXZlID8gaW50 ZWxfY3J0Yy0+Y29uZmlnLnBpcGVfc3JjX2ggOiAwLAogCX07CiAKIAlpbnRlbF9mYiA9IHRvX2lu dGVsX2ZyYW1lYnVmZmVyKGZiKTsKQEAgLTY3MCwxMiArNjY2LDYgQEAgaW50ZWxfdXBkYXRlX3Bs YW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJaW50 ZWxfcGxhbmUtPnNyY193ID0gc3JjX3c7CiAJaW50ZWxfcGxhbmUtPnNyY19oID0gc3JjX2g7CiAK LQkvKiBQaXBlIG11c3QgYmUgcnVubmluZy4uLiAqLwotCWlmICghKEk5MTVfUkVBRChQSVBFQ09O RihjcHVfdHJhbnNjb2RlcikpICYgUElQRUNPTkZfRU5BQkxFKSkgewotCQlEUk1fREVCVUdfS01T KCJQaXBlIGRpc2FibGVkXG4iKTsKLQkJcmV0dXJuIC1FSU5WQUw7Ci0JfQotCiAJLyogRG9uJ3Qg bW9kaWZ5IGFub3RoZXIgcGlwZSdzIHBsYW5lICovCiAJaWYgKGludGVsX3BsYW5lLT5waXBlICE9 IGludGVsX2NydGMtPnBpcGUpIHsKIAkJRFJNX0RFQlVHX0tNUygiV3JvbmcgcGxhbmUgPC0+IGNy dGMgbWFwcGluZ1xuIik7CkBAIC04MTAsNyArODAwLDcgQEAgaW50ZWxfdXBkYXRlX3BsYW5lKHN0 cnVjdCBkcm1fcGxhbmUgKnBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJICogd2UgY2Fu IGRpc2FibGUgdGhlIHByaW1hcnkgYW5kIHNhdmUgcG93ZXIuCiAJICovCiAJZGlzYWJsZV9wcmlt YXJ5ID0gZHJtX3JlY3RfZXF1YWxzKCZkc3QsICZjbGlwKTsKLQlXQVJOX09OKGRpc2FibGVfcHJp bWFyeSAmJiAhdmlzaWJsZSk7CisJV0FSTl9PTihkaXNhYmxlX3ByaW1hcnkgJiYgIXZpc2libGUg JiYgaW50ZWxfY3J0Yy0+YWN0aXZlKTsKIAogCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4 KTsKIApAQCAtODI1LDIyICs4MTUsMjQgQEAgaW50ZWxfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1f cGxhbmUgKnBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAKIAlpbnRlbF9wbGFuZS0+b2Jq ID0gb2JqOwogCi0JLyoKLQkgKiBCZSBzdXJlIHRvIHJlLWVuYWJsZSB0aGUgcHJpbWFyeSBiZWZv cmUgdGhlIHNwcml0ZSBpcyBubyBsb25nZXIKLQkgKiBjb3ZlcmluZyBpdCBmdWxseS4KLQkgKi8K LQlpZiAoIWRpc2FibGVfcHJpbWFyeSkKLQkJaW50ZWxfZW5hYmxlX3ByaW1hcnkoY3J0Yyk7Ci0K LQlpZiAodmlzaWJsZSkKLQkJaW50ZWxfcGxhbmUtPnVwZGF0ZV9wbGFuZShwbGFuZSwgY3J0Yywg ZmIsIG9iaiwKLQkJCQkJICBjcnRjX3gsIGNydGNfeSwgY3J0Y193LCBjcnRjX2gsCi0JCQkJCSAg c3JjX3gsIHNyY195LCBzcmNfdywgc3JjX2gpOwotCWVsc2UKLQkJaW50ZWxfcGxhbmUtPmRpc2Fi bGVfcGxhbmUocGxhbmUsIGNydGMpOwotCi0JaWYgKGRpc2FibGVfcHJpbWFyeSkKLQkJaW50ZWxf ZGlzYWJsZV9wcmltYXJ5KGNydGMpOworCWlmIChpbnRlbF9jcnRjLT5hY3RpdmUpIHsKKwkJLyoK KwkJICogQmUgc3VyZSB0byByZS1lbmFibGUgdGhlIHByaW1hcnkgYmVmb3JlIHRoZSBzcHJpdGUg aXMgbm8gbG9uZ2VyCisJCSAqIGNvdmVyaW5nIGl0IGZ1bGx5LgorCQkgKi8KKwkJaWYgKCFkaXNh YmxlX3ByaW1hcnkpCisJCQlpbnRlbF9lbmFibGVfcHJpbWFyeShjcnRjKTsKKworCQlpZiAodmlz aWJsZSkKKwkJCWludGVsX3BsYW5lLT51cGRhdGVfcGxhbmUocGxhbmUsIGNydGMsIGZiLCBvYmos CisJCQkJCQkgIGNydGNfeCwgY3J0Y195LCBjcnRjX3csIGNydGNfaCwKKwkJCQkJCSAgc3JjX3gs IHNyY195LCBzcmNfdywgc3JjX2gpOworCQllbHNlCisJCQlpbnRlbF9wbGFuZS0+ZGlzYWJsZV9w bGFuZShwbGFuZSwgY3J0Yyk7CisKKwkJaWYgKGRpc2FibGVfcHJpbWFyeSkKKwkJCWludGVsX2Rp c2FibGVfcHJpbWFyeShjcnRjKTsKKwl9CiAKIAkvKiBVbnBpbiBvbGQgb2JqIGFmdGVyIG5ldyBv bmUgaXMgYWN0aXZlIHRvIGF2b2lkIHVnbGluZXNzICovCiAJaWYgKG9sZF9vYmopIHsKQEAgLTg1 Miw3ICs4NDQsOCBAQCBpbnRlbF91cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUs IHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJICovCiAJCWlmIChvbGRfb2JqICE9IG9iaikgewog CQkJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0JCQlpbnRlbF93YWl0X2Zvcl92 YmxhbmsoZGV2LCB0b19pbnRlbF9jcnRjKGNydGMpLT5waXBlKTsKKwkJCWlmIChpbnRlbF9jcnRj LT5hY3RpdmUpCisJCQkJaW50ZWxfd2FpdF9mb3JfdmJsYW5rKGRldiwgdG9faW50ZWxfY3J0Yyhj cnRjKS0+cGlwZSk7CiAJCQltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiAJCX0KIAkJ aW50ZWxfdW5waW5fZmJfb2JqKG9sZF9vYmopOwpAQCAtODY4LDYgKzg2MSw3IEBAIGludGVsX2Rp c2FibGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUpCiB7CiAJc3RydWN0IGRybV9kZXZp Y2UgKmRldiA9IHBsYW5lLT5kZXY7CiAJc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9 IHRvX2ludGVsX3BsYW5lKHBsYW5lKTsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YzsK IAlpbnQgcmV0ID0gMDsKIAogCWlmICghcGxhbmUtPmZiKQpAQCAtODc2LDEzICs4NzAsMTggQEAg aW50ZWxfZGlzYWJsZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSkKIAlpZiAoV0FSTl9P TighcGxhbmUtPmNydGMpKQogCQlyZXR1cm4gLUVJTlZBTDsKIAotCWludGVsX2VuYWJsZV9wcmlt YXJ5KHBsYW5lLT5jcnRjKTsKLQlpbnRlbF9wbGFuZS0+ZGlzYWJsZV9wbGFuZShwbGFuZSwgcGxh bmUtPmNydGMpOworCWludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKHBsYW5lLT5jcnRjKTsKKwor CWlmIChpbnRlbF9jcnRjLT5hY3RpdmUpIHsKKwkJaW50ZWxfZW5hYmxlX3ByaW1hcnkocGxhbmUt PmNydGMpOworCQlpbnRlbF9wbGFuZS0+ZGlzYWJsZV9wbGFuZShwbGFuZSwgcGxhbmUtPmNydGMp OworCX0KIAogCWlmICghaW50ZWxfcGxhbmUtPm9iaikKIAkJZ290byBvdXQ7CiAKLQlpbnRlbF93 YWl0X2Zvcl92YmxhbmsoZGV2LCBpbnRlbF9wbGFuZS0+cGlwZSk7CisJaWYgKGludGVsX2NydGMt PmFjdGl2ZSkKKwkJaW50ZWxfd2FpdF9mb3JfdmJsYW5rKGRldiwgaW50ZWxfcGxhbmUtPnBpcGUp OwogCiAJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCWludGVsX3VucGluX2ZiX29i aihpbnRlbF9wbGFuZS0+b2JqKTsKLS0gCjEuOC4xLjUKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==