From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Airlie Subject: [PATCH] drm/fb: revert the i915 Actually configure untiled displays from master Date: Wed, 24 Apr 2019 16:35:28 +1000 Message-ID: <20190424063528.19606-1-airlied@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7D02F896AF for ; Wed, 24 Apr 2019 06:35:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E9EDC308BBD6 for ; Wed, 24 Apr 2019 06:35:30 +0000 (UTC) Received: from dreadlord-bne-redhat-com.bne.redhat.com (unknown [10.64.33.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id 569A15C239 for ; Wed, 24 Apr 2019 06:35:30 +0000 (UTC) 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 List-Id: dri-devel@lists.freedesktop.org RnJvbTogRGF2ZSBBaXJsaWUgPGFpcmxpZWRAcmVkaGF0LmNvbT4KClRoaXMgY29kZSBtb3ZlZCBp biBoZXJlIGluIG1hc3Rlciwgc28gcmV2ZXJ0IGl0IHRoZSBzYW1lIHdheS4KClNpZ25lZC1vZmYt Ynk6IERhdmUgQWlybGllIDxhaXJsaWVkQHJlZGhhdC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2RybV9mYl9oZWxwZXIuYyB8IDEyICsrKysrLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDUgaW5z ZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v ZHJtX2ZiX2hlbHBlci5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9mYl9oZWxwZXIuYwppbmRleCA0 ZGU0YjlkNTlkNDkuLjIyNmMwOTEwYmE5MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2Ry bV9mYl9oZWxwZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2ZiX2hlbHBlci5jCkBAIC0y NTgwLDcgKzI1ODAsNyBAQCBzdGF0aWMgYm9vbCBkcm1fZmJfaGVscGVyX2Zpcm13YXJlX2NvbmZp ZyhzdHJ1Y3QgZHJtX2ZiX2hlbHBlciAqZmJfaGVscGVyLAogewogCXN0cnVjdCBkcm1fZGV2aWNl ICpkZXYgPSBmYl9oZWxwZXItPmRldjsKIAl1bnNpZ25lZCBpbnQgY291bnQgPSBtaW4oZmJfaGVs cGVyLT5jb25uZWN0b3JfY291bnQsIEJJVFNfUEVSX0xPTkcpOwotCXVuc2lnbmVkIGxvbmcgY29u bl9jb25maWd1cmVkLCBjb25uX3NlcTsKKwl1bnNpZ25lZCBsb25nIGNvbm5fY29uZmlndXJlZCwg Y29ubl9zZXEsIG1hc2s7CiAJaW50IGksIGo7CiAJYm9vbCAqc2F2ZV9lbmFibGVkOwogCWJvb2wg ZmFsbGJhY2sgPSB0cnVlLCByZXQgPSB0cnVlOwpAQCAtMjU5OCw5ICsyNTk4LDEwIEBAIHN0YXRp YyBib29sIGRybV9mYl9oZWxwZXJfZmlybXdhcmVfY29uZmlnKHN0cnVjdCBkcm1fZmJfaGVscGVy ICpmYl9oZWxwZXIsCiAJCWRybV9tb2Rlc2V0X2JhY2tvZmYoJmN0eCk7CiAKIAltZW1jcHkoc2F2 ZV9lbmFibGVkLCBlbmFibGVkLCBjb3VudCk7Ci0JY29ubl9zZXEgPSBHRU5NQVNLKGNvdW50IC0g MSwgMCk7CisJbWFzayA9IEdFTk1BU0soY291bnQgLSAxLCAwKTsKIAljb25uX2NvbmZpZ3VyZWQg PSAwOwogcmV0cnk6CisJY29ubl9zZXEgPSBjb25uX2NvbmZpZ3VyZWQ7CiAJZm9yIChpID0gMDsg aSA8IGNvdW50OyBpKyspIHsKIAkJc3RydWN0IGRybV9mYl9oZWxwZXJfY29ubmVjdG9yICpmYl9j b25uOwogCQlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yOwpAQCAtMjYxMyw4ICsyNjE0 LDcgQEAgc3RhdGljIGJvb2wgZHJtX2ZiX2hlbHBlcl9maXJtd2FyZV9jb25maWcoc3RydWN0IGRy bV9mYl9oZWxwZXIgKmZiX2hlbHBlciwKIAkJaWYgKGNvbm5fY29uZmlndXJlZCAmIEJJVChpKSkK IAkJCWNvbnRpbnVlOwogCi0JCS8qIEZpcnN0IHBhc3MsIG9ubHkgY29uc2lkZXIgdGlsZWQgY29u bmVjdG9ycyAqLwotCQlpZiAoY29ubl9zZXEgPT0gR0VOTUFTSyhjb3VudCAtIDEsIDApICYmICFj b25uZWN0b3ItPmhhc190aWxlKQorCQlpZiAoY29ubl9zZXEgPT0gMCAmJiAhY29ubmVjdG9yLT5o YXNfdGlsZSkKIAkJCWNvbnRpbnVlOwogCiAJCWlmIChjb25uZWN0b3ItPnN0YXR1cyA9PSBjb25u ZWN0b3Jfc3RhdHVzX2Nvbm5lY3RlZCkKQEAgLTI3MTUsMTAgKzI3MTUsOCBAQCBzdGF0aWMgYm9v bCBkcm1fZmJfaGVscGVyX2Zpcm13YXJlX2NvbmZpZyhzdHJ1Y3QgZHJtX2ZiX2hlbHBlciAqZmJf aGVscGVyLAogCQljb25uX2NvbmZpZ3VyZWQgfD0gQklUKGkpOwogCX0KIAotCWlmIChjb25uX2Nv bmZpZ3VyZWQgIT0gY29ubl9zZXEpIHsgLyogcmVwZWF0IHVudGlsIG5vIG1vcmUgYXJlIGZvdW5k ICovCi0JCWNvbm5fc2VxID0gY29ubl9jb25maWd1cmVkOworCWlmICgoY29ubl9jb25maWd1cmVk ICYgbWFzaykgIT0gbWFzayAmJiBjb25uX2NvbmZpZ3VyZWQgIT0gY29ubl9zZXEpCiAJCWdvdG8g cmV0cnk7Ci0JfQogCiAJLyoKIAkgKiBJZiB0aGUgQklPUyBkaWRuJ3QgZW5hYmxlIGV2ZXJ5dGhp bmcgaXQgY291bGQsIGZhbGwgYmFjayB0byBoYXZlIHRoZQotLSAKMi4yMC4xCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBs aXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw=