From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 13/14] drm/i915: Don't disable primary when color keying is used Date: Thu, 5 Dec 2013 15:51:40 +0200 Message-ID: <1386251501-10602-14-git-send-email-ville.syrjala@linux.intel.com> References: <1386251501-10602-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 31E3CFB819 for ; Thu, 5 Dec 2013 05:52:33 -0800 (PST) In-Reply-To: <1386251501-10602-1-git-send-email-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCldo ZW4gY29sb3Iga2V5aW5nIGlzIHVzZWQsIHRoZSBwcmltYXJ5IG1heSBub3QgYmUgaW52aXNpYmxl IGV2ZW4gdGhvdWdoCnRoZSBzcHJpdGUgZnVsbHkgY292ZXJzIGl0LiBTbyBjaGVjayBmb3IgY29s b3Iga2V5aW5nIGJlZm9yZSBkZWNpZGluZyB0bwpkaXNhYmxlIHRoZSBwcmltYXJ5IHBsYW5lLgoK U2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVs LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyB8IDExICsrKysr KysrKystCiAxIGZpbGUgY2hhbmdlZCwgMTAgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKaW5kZXggM2NlMzI4ZS4uYTg3MjEyOSAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKQEAgLTYzNiw2ICs2MzYsMTUgQEAgZm9ybWF0 X2lzX3l1dih1aW50MzJfdCBmb3JtYXQpCiAJfQogfQogCitzdGF0aWMgYm9vbCBjb2xvcmtleV9l bmFibGVkKHN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUpCit7CisJc3RydWN0IGRybV9p bnRlbF9zcHJpdGVfY29sb3JrZXkga2V5OworCisJaW50ZWxfcGxhbmUtPmdldF9jb2xvcmtleSgm aW50ZWxfcGxhbmUtPmJhc2UsICZrZXkpOworCisJcmV0dXJuIGtleS5mbGFncyAhPSBJOTE1X1NF VF9DT0xPUktFWV9OT05FOworfQorCiBzdGF0aWMgaW50CiBpbnRlbF91cGRhdGVfcGxhbmUoc3Ry dWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJICAgc3RydWN0 IGRybV9mcmFtZWJ1ZmZlciAqZmIsIGludCBjcnRjX3gsIGludCBjcnRjX3ksCkBAIC04MjEsNyAr ODMwLDcgQEAgaW50ZWxfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLCBzdHJ1 Y3QgZHJtX2NydGMgKmNydGMsCiAJICogSWYgdGhlIHNwcml0ZSBpcyBjb21wbGV0ZWx5IGNvdmVy aW5nIHRoZSBwcmltYXJ5IHBsYW5lLAogCSAqIHdlIGNhbiBkaXNhYmxlIHRoZSBwcmltYXJ5IGFu ZCBzYXZlIHBvd2VyLgogCSAqLwotCWRpc2FibGVfcHJpbWFyeSA9IGRybV9yZWN0X2VxdWFscygm ZHN0LCAmY2xpcCk7CisJZGlzYWJsZV9wcmltYXJ5ID0gZHJtX3JlY3RfZXF1YWxzKCZkc3QsICZj bGlwKSAmJiAhY29sb3JrZXlfZW5hYmxlZChpbnRlbF9wbGFuZSk7CiAJV0FSTl9PTihkaXNhYmxl X3ByaW1hcnkgJiYgIXZpc2libGUgJiYgaW50ZWxfY3J0Yy0+YWN0aXZlKTsKIAogCW11dGV4X2xv Y2soJmRldi0+c3RydWN0X211dGV4KTsKLS0gCjEuOC4zLjIKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==