From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 2/9] drm/i915: Always enable the cursor right after the primary plane Date: Tue, 4 Jun 2013 13:49:00 +0300 Message-ID: <1370342947-20757-3-git-send-email-ville.syrjala@linux.intel.com> References: <1370342947-20757-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 28CD3E62DF for ; Tue, 4 Jun 2013 03:49:21 -0700 (PDT) In-Reply-To: <1370342947-20757-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkZv bGxvdyB0aGUgc2FtZSBzZXF1ZW5jZSB3aGVuIGVuYWJsaW5nIHRoZSBjdXJzb3IgcGxhbmUgZHVy aW5nCm1vZGVzZXQuIE5vIHBvaW50IGluIGRvaW5nIHRoaXMgc3R1ZmYgaW4gZGlmZmVyZW50IG9y ZGVyIG9uIGRpZmZlcmVudApnZW5lcmF0aW9ucy4KClRoaXMgc2hvdWxkIGFsc28gYXZvaWQgYSBu ZWVkbGVzcyB3YWl0IGZvciB2YmxhbmsgZm9yIHRoZSBnNHggY3Vyc29yCndvcmthcm91bmQgd2hl biB0aGUgY3Vyc29yIGdldHMgZW5hYmxlZCBhbnl3YXkuCgpBY2tlZC1ieTogRWdiZXJ0IEVpY2gg PGVpY2hAc3VzZS5jb20+ClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3ly amFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jIHwgMTAgKysrKy0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygrKSwg NiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggYzI4 YjQwMi4uYzJlNmU5MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMzIx Niw2ICszMjE2LDcgQEAgc3RhdGljIHZvaWQgaXJvbmxha2VfY3J0Y19lbmFibGUoc3RydWN0IGRy bV9jcnRjICpjcnRjKQogCWludGVsX2VuYWJsZV9waXBlKGRldl9wcml2LCBwaXBlLAogCQkJICBp bnRlbF9jcnRjLT5jb25maWcuaGFzX3BjaF9lbmNvZGVyKTsKIAlpbnRlbF9lbmFibGVfcGxhbmUo ZGV2X3ByaXYsIHBsYW5lLCBwaXBlKTsKKwlpbnRlbF9jcnRjX3VwZGF0ZV9jdXJzb3IoY3J0Yywg dHJ1ZSk7CiAKIAlpZiAoaW50ZWxfY3J0Yy0+Y29uZmlnLmhhc19wY2hfZW5jb2RlcikKIAkJaXJv bmxha2VfcGNoX2VuYWJsZShjcnRjKTsKQEAgLTMyMjQsOCArMzIyNSw2IEBAIHN0YXRpYyB2b2lk IGlyb25sYWtlX2NydGNfZW5hYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAlpbnRlbF91cGRh dGVfZmJjKGRldik7CiAJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiAKLQlpbnRl bF9jcnRjX3VwZGF0ZV9jdXJzb3IoY3J0YywgdHJ1ZSk7Ci0KIAlmb3JfZWFjaF9lbmNvZGVyX29u X2NydGMoZGV2LCBjcnRjLCBlbmNvZGVyKQogCQllbmNvZGVyLT5lbmFibGUoZW5jb2Rlcik7CiAK QEAgLTMzMjUsNiArMzMyNCw3IEBAIHN0YXRpYyB2b2lkIGhhc3dlbGxfY3J0Y19lbmFibGUoc3Ry dWN0IGRybV9jcnRjICpjcnRjKQogCWludGVsX2VuYWJsZV9waXBlKGRldl9wcml2LCBwaXBlLAog CQkJICBpbnRlbF9jcnRjLT5jb25maWcuaGFzX3BjaF9lbmNvZGVyKTsKIAlpbnRlbF9lbmFibGVf cGxhbmUoZGV2X3ByaXYsIHBsYW5lLCBwaXBlKTsKKwlpbnRlbF9jcnRjX3VwZGF0ZV9jdXJzb3Io Y3J0YywgdHJ1ZSk7CiAKIAloc3dfZW5hYmxlX2lwcyhpbnRlbF9jcnRjKTsKIApAQCAtMzMzNSw4 ICszMzM1LDYgQEAgc3RhdGljIHZvaWQgaGFzd2VsbF9jcnRjX2VuYWJsZShzdHJ1Y3QgZHJtX2Ny dGMgKmNydGMpCiAJaW50ZWxfdXBkYXRlX2ZiYyhkZXYpOwogCW11dGV4X3VubG9jaygmZGV2LT5z dHJ1Y3RfbXV0ZXgpOwogCi0JaW50ZWxfY3J0Y191cGRhdGVfY3Vyc29yKGNydGMsIHRydWUpOwot CiAJZm9yX2VhY2hfZW5jb2Rlcl9vbl9jcnRjKGRldiwgY3J0YywgZW5jb2RlcikKIAkJZW5jb2Rl ci0+ZW5hYmxlKGVuY29kZXIpOwogCkBAIC0zNjE5LDEyICszNjE3LDEyIEBAIHN0YXRpYyB2b2lk IHZhbGxleXZpZXdfY3J0Y19lbmFibGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCiAJaW50ZWxf ZW5hYmxlX3BpcGUoZGV2X3ByaXYsIHBpcGUsIGZhbHNlKTsKIAlpbnRlbF9lbmFibGVfcGxhbmUo ZGV2X3ByaXYsIHBsYW5lLCBwaXBlKTsKKwlpbnRlbF9jcnRjX3VwZGF0ZV9jdXJzb3IoY3J0Yywg dHJ1ZSk7CiAKIAlpbnRlbF91cGRhdGVfZmJjKGRldik7CiAKIAkvKiBHaXZlIHRoZSBvdmVybGF5 IHNjYWxlciBhIGNoYW5jZSB0byBlbmFibGUgaWYgaXQncyBvbiB0aGlzIHBpcGUgKi8KIAlpbnRl bF9jcnRjX2RwbXNfb3ZlcmxheShpbnRlbF9jcnRjLCB0cnVlKTsKLQlpbnRlbF9jcnRjX3VwZGF0 ZV9jdXJzb3IoY3J0YywgdHJ1ZSk7CiAKIAltdXRleF91bmxvY2soJmRldl9wcml2LT5kcGlvX2xv Y2spOwogfQpAQCAtMzY1OSw2ICszNjU3LDcgQEAgc3RhdGljIHZvaWQgaTl4eF9jcnRjX2VuYWJs ZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAKIAlpbnRlbF9lbmFibGVfcGlwZShkZXZfcHJpdiwg cGlwZSwgZmFsc2UpOwogCWludGVsX2VuYWJsZV9wbGFuZShkZXZfcHJpdiwgcGxhbmUsIHBpcGUp OworCWludGVsX2NydGNfdXBkYXRlX2N1cnNvcihjcnRjLCB0cnVlKTsKIAlpZiAoSVNfRzRYKGRl dikpCiAJCWc0eF9maXh1cF9wbGFuZShkZXZfcHJpdiwgcGlwZSk7CiAKQEAgLTM2NjYsNyArMzY2 NSw2IEBAIHN0YXRpYyB2b2lkIGk5eHhfY3J0Y19lbmFibGUoc3RydWN0IGRybV9jcnRjICpjcnRj KQogCiAJLyogR2l2ZSB0aGUgb3ZlcmxheSBzY2FsZXIgYSBjaGFuY2UgdG8gZW5hYmxlIGlmIGl0 J3Mgb24gdGhpcyBwaXBlICovCiAJaW50ZWxfY3J0Y19kcG1zX292ZXJsYXkoaW50ZWxfY3J0Yywg dHJ1ZSk7Ci0JaW50ZWxfY3J0Y191cGRhdGVfY3Vyc29yKGNydGMsIHRydWUpOwogCiAJZm9yX2Vh Y2hfZW5jb2Rlcl9vbl9jcnRjKGRldiwgY3J0YywgZW5jb2RlcikKIAkJZW5jb2Rlci0+ZW5hYmxl KGVuY29kZXIpOwotLSAKMS44LjEuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK