From: Jani Nikula Subject: [PATCH 1/2] drm/i915: prefer INTEL_GEN() over INTEL_INFO()->gen Date: Wed, 21 Mar 2018 16:07:54 +0200 Message-ID: <20180321140755.16792-1-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 60CC96E246 for ; Wed, 21 Mar 2018 14:07:08 +0000 (UTC) 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 List-Id: intel-gfx@lists.freedesktop.org Rml4IHRoZSBsYXN0IHR3byBkaXJlY3QgLT5nZW4gdXNhZ2VzLgoKQ2M6IFR2cnRrbyBVcnN1bGlu IDx0dnJ0a28udXJzdWxpbkBsaW51eC5pbnRlbC5jb20+CkNjOiBNaWthIEt1b3BwYWxhIDxtaWth Lmt1b3BwYWxhQGxpbnV4LmludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogSmFuaSBOaWt1bGEgPGph bmkubmlrdWxhQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZXZp Y2VfaW5mby5jIHwgNCArKy0tCiAxIGZpbGUgY2hhbmdlZCwgMiBpbnNlcnRpb25zKCspLCAyIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rldmlj ZV9pbmZvLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZXZpY2VfaW5mby5jCmluZGV4 IGE1MDQyODFlMmFmYS4uYWY1MzhjNGEzYWViIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kZXZpY2VfaW5mby5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2RldmljZV9pbmZvLmMKQEAgLTExOSw3ICsxMTksNyBAQCB2b2lkIGludGVsX2RldmljZV9pbmZv X2R1bXAoY29uc3Qgc3RydWN0IGludGVsX2RldmljZV9pbmZvICppbmZvLAogCQkgICBJTlRFTF9E RVZJRChkZXZfcHJpdiksCiAJCSAgIElOVEVMX1JFVklEKGRldl9wcml2KSwKIAkJICAgaW50ZWxf cGxhdGZvcm1fbmFtZShpbmZvLT5wbGF0Zm9ybSksCi0JCSAgIGluZm8tPmdlbik7CisJCSAgIElO VEVMX0dFTihkZXZfcHJpdikpOwogCiAJaW50ZWxfZGV2aWNlX2luZm9fZHVtcF9mbGFncyhpbmZv LCBwKTsKIH0KQEAgLTgwOSw3ICs4MDksNyBAQCB2b2lkIGludGVsX2RldmljZV9pbmZvX3J1bnRp bWVfaW5pdChzdHJ1Y3QgaW50ZWxfZGV2aWNlX2luZm8gKmluZm8pCiAJCWdlbjlfc3NldV9pbmZv X2luaXQoZGV2X3ByaXYpOwogCWVsc2UgaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPT0gMTApCiAJ CWdlbjEwX3NzZXVfaW5mb19pbml0KGRldl9wcml2KTsKLQllbHNlIGlmIChJTlRFTF9JTkZPKGRl dl9wcml2KS0+Z2VuID49IDExKQorCWVsc2UgaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gMTEp CiAJCWdlbjExX3NzZXVfaW5mb19pbml0KGRldl9wcml2KTsKIAogCS8qIEluaXRpYWxpemUgY29t bWFuZCBzdHJlYW0gdGltZXN0YW1wIGZyZXF1ZW5jeSAqLwotLSAKMi4xMS4wCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBs aXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK