From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Wood Subject: [PATCH v2] drm: fix plane rotation when restoring fbdev configuration Date: Wed, 20 Aug 2014 14:45:00 +0100 Message-ID: <1408542300-12422-1-git-send-email-thomas.wood@intel.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-we0-f180.google.com (mail-we0-f180.google.com [74.125.82.180]) by gabe.freedesktop.org (Postfix) with ESMTP id 304FA6E0DA for ; Wed, 20 Aug 2014 06:45:04 -0700 (PDT) Received: by mail-we0-f180.google.com with SMTP id w61so7889118wes.11 for ; Wed, 20 Aug 2014 06:45:03 -0700 (PDT) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: Sonika Jindal , Daniel Vetter List-Id: dri-devel@lists.freedesktop.org TWFrZSBzdXJlIHBsYW5lIHJvdGF0aW9uIGlzIHJlc2V0IGNvcnJlY3RseSB3aGVuIHJlc3Rvcmlu ZyB0aGUgZmJkZXYKY29uZmlndXJhdGlvbiBieSB1c2luZyBkcm1fbW9kZV9wbGFuZV9zZXRfb2Jq X3Byb3Agd2hpY2ggY2FsbHMgdGhlCmRyaXZlcidzIHNldF9wcm9wZXJ0eSBjYWxsYmFjay4KClRo ZSByb3RhdGlvbiByZXNldCBmZWF0dXJlIHdhcyBpbnRyb2R1Y2VkIGluIGNvbW1pdCA5NzgzZGUy IChkcm06ClJlc2V0dGluZyByb3RhdGlvbiBwcm9wZXJ0eSkgYW5kIHRoZSBjYWxsYmFjayBpc3N1 ZSB3YXMgb3JpZ2luYWxseQphZGRyZXNzZWQgaW4gYSBwcmV2aW91cyB2ZXJzaW9uIG9mIHRoZSBw YXRjaCwgYnV0IHRoZSBmaXggd2FzIG5vdApwcmVzZW50IGluIHRoZSBmaW5hbCB2ZXJzaW9uLgoK djI6IEZpeCBkb2N1bWVudGF0aW9uIHdhcm5pbmcKICAgIEFkZCBzb21lIG1vcmUgZGV0YWlscyB0 byB0aGUgY29tbWl0IG1lc3NhZ2UgKERhbmllbCBWZXR0ZXIpCgpUZXN0Y2FzZTogaWd0L2ttc19y b3RhdGlvbl9jcmMKQnVnemlsbGE6IGh0dHBzOi8vYnVncy5mcmVlZGVza3RvcC5vcmcvc2hvd19i dWcuY2dpP2lkPTgyMjM2CkNjOiBTb25pa2EgSmluZGFsIDxzb25pa2EuamluZGFsQGludGVsLmNv bT4KQ2M6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+CkNj OiBEYXZlIEFpcmxpZSA8YWlybGllZEBnbWFpbC5jb20+CkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5p ZWwudmV0dGVyQGZmd2xsLmNoPgpTaWduZWQtb2ZmLWJ5OiBUaG9tYXMgV29vZCA8dGhvbWFzLndv b2RAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fY3J0Yy5jICAgICAgfCAyNSAr KysrKysrKysrKysrKysrKysrKy0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vZHJtX2ZiX2hlbHBlci5j IHwgIDYgKysrLS0tCiBpbmNsdWRlL2RybS9kcm1fY3J0Yy5oICAgICAgICAgIHwgIDMgKysrCiAz IGZpbGVzIGNoYW5nZWQsIDI2IGluc2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9jcnRjLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2Ny dGMuYwppbmRleCBmMDliNzUyLi43ZDdjMWZkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v ZHJtX2NydGMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2NydGMuYwpAQCAtNDE3NSwxMiAr NDE3NSwyNSBAQCBzdGF0aWMgaW50IGRybV9tb2RlX2NydGNfc2V0X29ial9wcm9wKHN0cnVjdCBk cm1fbW9kZV9vYmplY3QgKm9iaiwKIAlyZXR1cm4gcmV0OwogfQogCi1zdGF0aWMgaW50IGRybV9t b2RlX3BsYW5lX3NldF9vYmpfcHJvcChzdHJ1Y3QgZHJtX21vZGVfb2JqZWN0ICpvYmosCi0JCQkJ ICAgICAgc3RydWN0IGRybV9wcm9wZXJ0eSAqcHJvcGVydHksCi0JCQkJICAgICAgdWludDY0X3Qg dmFsdWUpCisvKioKKyAqIGRybV9tb2RlX3BsYW5lX3NldF9vYmpfcHJvcCAtIHNldCB0aGUgdmFs dWUgb2YgYSBwcm9wZXJ0eQorICogQHBsYW5lOiBkcm0gcGxhbmUgb2JqZWN0IHRvIHNldCBwcm9w ZXJ0eSB2YWx1ZSBmb3IKKyAqIEBwcm9wZXJ0eTogcHJvcGVydHkgdG8gc2V0CisgKiBAdmFsdWU6 IHZhbHVlIHRoZSBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IHRvCisgKgorICogVGhpcyBmdW5jdGlv bnMgc2V0cyBhIGdpdmVuIHByb3BlcnR5IG9uIGEgZ2l2ZW4gcGxhbmUgb2JqZWN0LiBUaGlzIGZ1 bmN0aW9uCisgKiBjYWxscyB0aGUgZHJpdmVyJ3MgLT5zZXRfcHJvcGVydHkgY2FsbGJhY2sgYW5k IGNoYW5nZXMgdGhlIHNvZnR3YXJlIHN0YXRlIG9mCisgKiB0aGUgcHJvcGVydHkgaWYgdGhlIGNh bGxiYWNrIHN1Y2NlZWRzLgorICoKKyAqIFJldHVybnM6CisgKiBaZXJvIG9uIHN1Y2Nlc3MsIGVy cm9yIGNvZGUgb24gZmFpbHVyZS4KKyAqLworaW50IGRybV9tb2RlX3BsYW5lX3NldF9vYmpfcHJv cChzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKKwkJCQlzdHJ1Y3QgZHJtX3Byb3BlcnR5ICpwcm9w ZXJ0eSwKKwkJCQl1aW50NjRfdCB2YWx1ZSkKIHsKIAlpbnQgcmV0ID0gLUVJTlZBTDsKLQlzdHJ1 Y3QgZHJtX3BsYW5lICpwbGFuZSA9IG9ial90b19wbGFuZShvYmopOworCXN0cnVjdCBkcm1fbW9k ZV9vYmplY3QgKm9iaiA9ICZwbGFuZS0+YmFzZTsKIAogCWlmIChwbGFuZS0+ZnVuY3MtPnNldF9w cm9wZXJ0eSkKIAkJcmV0ID0gcGxhbmUtPmZ1bmNzLT5zZXRfcHJvcGVydHkocGxhbmUsIHByb3Bl cnR5LCB2YWx1ZSk7CkBAIC00MTg5LDYgKzQyMDIsNyBAQCBzdGF0aWMgaW50IGRybV9tb2RlX3Bs YW5lX3NldF9vYmpfcHJvcChzdHJ1Y3QgZHJtX21vZGVfb2JqZWN0ICpvYmosCiAKIAlyZXR1cm4g cmV0OwogfQorRVhQT1JUX1NZTUJPTChkcm1fbW9kZV9wbGFuZV9zZXRfb2JqX3Byb3ApOwogCiAv KioKICAqIGRybV9tb2RlX2dldHByb3BlcnR5X2lvY3RsIC0gZ2V0IHRoZSBjdXJyZW50IHZhbHVl IG9mIGEgb2JqZWN0J3MgcHJvcGVydHkKQEAgLTQzMjcsNyArNDM0MSw4IEBAIGludCBkcm1fbW9k ZV9vYmpfc2V0X3Byb3BlcnR5X2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRh dGEsCiAJCXJldCA9IGRybV9tb2RlX2NydGNfc2V0X29ial9wcm9wKGFyZ19vYmosIHByb3BlcnR5 LCBhcmctPnZhbHVlKTsKIAkJYnJlYWs7CiAJY2FzZSBEUk1fTU9ERV9PQkpFQ1RfUExBTkU6Ci0J CXJldCA9IGRybV9tb2RlX3BsYW5lX3NldF9vYmpfcHJvcChhcmdfb2JqLCBwcm9wZXJ0eSwgYXJn LT52YWx1ZSk7CisJCXJldCA9IGRybV9tb2RlX3BsYW5lX3NldF9vYmpfcHJvcChvYmpfdG9fcGxh bmUoYXJnX29iaiksCisJCQkJCQkgIHByb3BlcnR5LCBhcmctPnZhbHVlKTsKIAkJYnJlYWs7CiAJ fQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2ZiX2hlbHBlci5jIGIvZHJpdmVy cy9ncHUvZHJtL2RybV9mYl9oZWxwZXIuYwppbmRleCA2M2Q3YjhlLi4wYzBjMzliIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2ZiX2hlbHBlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9kcm1fZmJfaGVscGVyLmMKQEAgLTI5Niw5ICsyOTYsOSBAQCBzdGF0aWMgYm9vbCByZXN0b3Jl X2ZiZGV2X21vZGUoc3RydWN0IGRybV9mYl9oZWxwZXIgKmZiX2hlbHBlcikKIAkJCWRybV9wbGFu ZV9mb3JjZV9kaXNhYmxlKHBsYW5lKTsKIAogCQlpZiAoZGV2LT5tb2RlX2NvbmZpZy5yb3RhdGlv bl9wcm9wZXJ0eSkgewotCQkJZHJtX29iamVjdF9wcm9wZXJ0eV9zZXRfdmFsdWUoJnBsYW5lLT5i YXNlLAotCQkJCQlkZXYtPm1vZGVfY29uZmlnLnJvdGF0aW9uX3Byb3BlcnR5LAotCQkJCQlCSVQo RFJNX1JPVEFURV8wKSk7CisJCQlkcm1fbW9kZV9wbGFuZV9zZXRfb2JqX3Byb3AocGxhbmUsCisJ CQkJCQkgICAgZGV2LT5tb2RlX2NvbmZpZy5yb3RhdGlvbl9wcm9wZXJ0eSwKKwkJCQkJCSAgICBC SVQoRFJNX1JPVEFURV8wKSk7CiAJCX0KIAl9CiAKZGlmZiAtLWdpdCBhL2luY2x1ZGUvZHJtL2Ry bV9jcnRjLmggYi9pbmNsdWRlL2RybS9kcm1fY3J0Yy5oCmluZGV4IDAzNzVkNzUuLjMxMzQ0YmYg MTAwNjQ0Ci0tLSBhL2luY2x1ZGUvZHJtL2RybV9jcnRjLmgKKysrIGIvaW5jbHVkZS9kcm0vZHJt X2NydGMuaApAQCAtMTEyNyw2ICsxMTI3LDkgQEAgZXh0ZXJuIGludCBkcm1fbW9kZV9vYmpfZ2V0 X3Byb3BlcnRpZXNfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAkJ CQkJICAgICBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdik7CiBleHRlcm4gaW50IGRybV9tb2Rl X29ial9zZXRfcHJvcGVydHlfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0 YSwKIAkJCQkJICAgc3RydWN0IGRybV9maWxlICpmaWxlX3ByaXYpOworZXh0ZXJuIGludCBkcm1f bW9kZV9wbGFuZV9zZXRfb2JqX3Byb3Aoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCisJCQkJICAg ICAgIHN0cnVjdCBkcm1fcHJvcGVydHkgKnByb3BlcnR5LAorCQkJCSAgICAgICB1aW50NjRfdCB2 YWx1ZSk7CiAKIGV4dGVybiB2b2lkIGRybV9mYl9nZXRfYnBwX2RlcHRoKHVpbnQzMl90IGZvcm1h dCwgdW5zaWduZWQgaW50ICpkZXB0aCwKIAkJCQkgaW50ICpicHApOwotLSAKMS45LjMKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWls aW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==