From: Jani Nikula Subject: [PATCH 3/2] drm/i915: unify remaining register save/restore code a bit Date: Wed, 12 Nov 2014 17:01:10 +0200 Message-ID: <1415804470-3029-1-git-send-email-jani.nikula@intel.com> References: <1415802343-23091-2-git-send-email-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 1DDFF6E551 for ; Wed, 12 Nov 2014 07:01:41 -0800 (PST) In-Reply-To: <1415802343-23091-2-git-send-email-jani.nikula@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: jani.nikula@intel.com, shuang.he@linux.intel.com List-Id: intel-gfx@lists.freedesktop.org VXNlIHRoZSBzYW1lIGNvbmRpdGlvbnMsIGdyb3VwIGJ5IGZlYXR1cmVzLCBhZGQgY29tbWVudHMu CgpTaWduZWQtb2ZmLWJ5OiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1bGFAaW50ZWwuY29tPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc3VzcGVuZC5jIHwgMTggKysrKysrKysrLS0tLS0t LS0tCiAxIGZpbGUgY2hhbmdlZCwgOSBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc3VzcGVuZC5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9zdXNwZW5kLmMKaW5kZXggM2MxZmNjZmFjYWMxLi5kZmU2NjE3NDMz OTggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc3VzcGVuZC5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc3VzcGVuZC5jCkBAIC0yMDMsMjEgKzIwMywxOSBA QCBzdGF0aWMgdm9pZCBpOTE1X3NhdmVfZGlzcGxheShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQog CQlpOTE1X3NhdmVfZGlzcGxheV9yZWcoZGV2KTsKIAogCS8qIExWRFMgc3RhdGUgKi8KLQlpZiAo SEFTX1BDSF9TUExJVChkZXYpKSB7Ci0JCWRldl9wcml2LT5yZWdmaWxlLnNhdmVQUF9DT05UUk9M ID0gSTkxNV9SRUFEKFBDSF9QUF9DT05UUk9MKTsKLQkJaWYgKEhBU19QQ0hfSUJYKGRldikgfHwg SEFTX1BDSF9DUFQoZGV2KSkKLQkJCWRldl9wcml2LT5yZWdmaWxlLnNhdmVMVkRTID0gSTkxNV9S RUFEKFBDSF9MVkRTKTsKLQl9IGVsc2UgaWYgKCFJU19WQUxMRVlWSUVXKGRldikpIHsKLQkJZGV2 X3ByaXYtPnJlZ2ZpbGUuc2F2ZVBQX0NPTlRST0wgPSBJOTE1X1JFQUQoUFBfQ09OVFJPTCk7Ci0J CWlmIChJU19NT0JJTEUoZGV2KSAmJiAhSVNfSTgzMChkZXYpKQotCQkJZGV2X3ByaXYtPnJlZ2Zp bGUuc2F2ZUxWRFMgPSBJOTE1X1JFQUQoTFZEUyk7Ci0JfQorCWlmIChIQVNfUENIX0lCWChkZXYp IHx8IEhBU19QQ0hfQ1BUKGRldikpCisJCWRldl9wcml2LT5yZWdmaWxlLnNhdmVMVkRTID0gSTkx NV9SRUFEKFBDSF9MVkRTKTsKKwllbHNlIGlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA8PSA0ICYm IElTX01PQklMRShkZXYpICYmICFJU19JODMwKGRldikpCisJCWRldl9wcml2LT5yZWdmaWxlLnNh dmVMVkRTID0gSTkxNV9SRUFEKExWRFMpOwogCisJLyogUGFuZWwgcG93ZXIgc2VxdWVuY2VyICov CiAJaWYgKEhBU19QQ0hfU1BMSVQoZGV2KSkgeworCQlkZXZfcHJpdi0+cmVnZmlsZS5zYXZlUFBf Q09OVFJPTCA9IEk5MTVfUkVBRChQQ0hfUFBfQ09OVFJPTCk7CiAJCWRldl9wcml2LT5yZWdmaWxl LnNhdmVQUF9PTl9ERUxBWVMgPSBJOTE1X1JFQUQoUENIX1BQX09OX0RFTEFZUyk7CiAJCWRldl9w cml2LT5yZWdmaWxlLnNhdmVQUF9PRkZfREVMQVlTID0gSTkxNV9SRUFEKFBDSF9QUF9PRkZfREVM QVlTKTsKIAkJZGV2X3ByaXYtPnJlZ2ZpbGUuc2F2ZVBQX0RJVklTT1IgPSBJOTE1X1JFQUQoUENI X1BQX0RJVklTT1IpOwogCX0gZWxzZSBpZiAoIUlTX1ZBTExFWVZJRVcoZGV2KSkgeworCQlkZXZf cHJpdi0+cmVnZmlsZS5zYXZlUFBfQ09OVFJPTCA9IEk5MTVfUkVBRChQUF9DT05UUk9MKTsKIAkJ ZGV2X3ByaXYtPnJlZ2ZpbGUuc2F2ZVBQX09OX0RFTEFZUyA9IEk5MTVfUkVBRChQUF9PTl9ERUxB WVMpOwogCQlkZXZfcHJpdi0+cmVnZmlsZS5zYXZlUFBfT0ZGX0RFTEFZUyA9IEk5MTVfUkVBRChQ UF9PRkZfREVMQVlTKTsKIAkJZGV2X3ByaXYtPnJlZ2ZpbGUuc2F2ZVBQX0RJVklTT1IgPSBJOTE1 X1JFQUQoUFBfRElWSVNPUik7CkBAIC0yNDYsMTEgKzI0NCwxMyBAQCBzdGF0aWMgdm9pZCBpOTE1 X3Jlc3RvcmVfZGlzcGxheShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWlmIChkcm1fY29yZV9j aGVja19mZWF0dXJlKGRldiwgRFJJVkVSX01PREVTRVQpKQogCQltYXNrID0gfkxWRFNfUE9SVF9F TjsKIAorCS8qIExWRFMgc3RhdGUgKi8KIAlpZiAoSEFTX1BDSF9JQlgoZGV2KSB8fCBIQVNfUENI X0NQVChkZXYpKQogCQlJOTE1X1dSSVRFKFBDSF9MVkRTLCBkZXZfcHJpdi0+cmVnZmlsZS5zYXZl TFZEUyAmIG1hc2spOwogCWVsc2UgaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuIDw9IDQgJiYgSVNf TU9CSUxFKGRldikgJiYgIUlTX0k4MzAoZGV2KSkKIAkJSTkxNV9XUklURShMVkRTLCBkZXZfcHJp di0+cmVnZmlsZS5zYXZlTFZEUyAmIG1hc2spOwogCisJLyogUGFuZWwgcG93ZXIgc2VxdWVuY2Vy ICovCiAJaWYgKEhBU19QQ0hfU1BMSVQoZGV2KSkgewogCQlJOTE1X1dSSVRFKFBDSF9QUF9PTl9E RUxBWVMsIGRldl9wcml2LT5yZWdmaWxlLnNhdmVQUF9PTl9ERUxBWVMpOwogCQlJOTE1X1dSSVRF KFBDSF9QUF9PRkZfREVMQVlTLCBkZXZfcHJpdi0+cmVnZmlsZS5zYXZlUFBfT0ZGX0RFTEFZUyk7 Ci0tIAoyLjEuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK