From: Chandra Konduru Subject: [PATCH 12/21] drm/i915: Ensure colorkey and scaling aren't enabled at same time Date: Sat, 14 Mar 2015 22:55:37 -0700 Message-ID: <1426398946-5900-13-git-send-email-chandra.konduru@intel.com> References: <1426398946-5900-1-git-send-email-chandra.konduru@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id A6CF36E4AB for ; Sat, 14 Mar 2015 22:56:33 -0700 (PDT) In-Reply-To: <1426398946-5900-1-git-send-email-chandra.konduru@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: ander.conselvan.de.oliveira@intel.com, daniel.vetter@intel.com List-Id: intel-gfx@lists.freedesktop.org UGxhbmUgc2NhbGluZyBhbmQgY29sb3JrZXkgYXJlIG11dHVhbGx5IGV4Y2x1c2l2ZS4gRW5zdXJl IHNjYWxpbmcKaXNuJ3QgYWN0aXZlIGF0IHRoZSB0aW1lIG9mIGVuYWJsaW5nIGNvbG9ya2V5LgoK U2lnbmVkLW9mZi1ieTogQ2hhbmRyYSBLb25kdXJ1IDxjaGFuZHJhLmtvbmR1cnVAaW50ZWwuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jIHwgICAgNiArKysrKysK IDEgZmlsZSBjaGFuZ2VkLCA2IGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nw cml0ZS5jCmluZGV4IGMwMTA1MjguLjAxOTQzOTAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nw cml0ZS5jCkBAIC0zMTksNiArMzE5LDEyIEBAIHNrbF91cGRhdGVfY29sb3JrZXkoc3RydWN0IGRy bV9wbGFuZSAqZHJtX3BsYW5lLAogCWNvbnN0IGludCBwbGFuZSA9IGludGVsX3BsYW5lLT5wbGFu ZTsKIAl1MzIgcGxhbmVfY3RsOwogCisJLyogcGxhbmUgc2NhbGluZyBhbmQgY29sb3JrZXkgYXJl IG11dHVhbGx5IGV4Y2x1c2l2ZSAqLworCWlmICh0b19pbnRlbF9wbGFuZV9zdGF0ZShkcm1fcGxh bmUtPnN0YXRlKS0+c2NhbGVyX2lkID49IDApIHsKKwkJRFJNX0VSUk9SKCJjb2xvcmtleSBub3Qg YWxsb3dlZCB3aXRoIHNjYWxlclxuIik7CisJCXJldHVybiAtRUlOVkFMOworCX0KKwogCUk5MTVf V1JJVEUoUExBTkVfS0VZVkFMKHBpcGUsIHBsYW5lKSwga2V5LT5taW5fdmFsdWUpOwogCUk5MTVf V1JJVEUoUExBTkVfS0VZTUFYKHBpcGUsIHBsYW5lKSwga2V5LT5tYXhfdmFsdWUpOwogCUk5MTVf V1JJVEUoUExBTkVfS0VZTVNLKHBpcGUsIHBsYW5lKSwga2V5LT5jaGFubmVsX21hc2spOwotLSAK MS43LjkuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK