From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.19 017/167] drm/i915: Rename PLANE_CTL_DECOMPRESSION_ENABLE Date: Tue, 3 Sep 2019 12:22:49 -0400 Message-ID: <20190903162519.7136-17-sashal@kernel.org> References: <20190903162519.7136-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190903162519.7136-1-sashal@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin , Daniel Vetter , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Dhinakaran Pandiyan , Rodrigo Vivi List-Id: dri-devel@lists.freedesktop.org RnJvbTogRGhpbmFrYXJhbiBQYW5kaXlhbiA8ZGhpbmFrYXJhbi5wYW5kaXlhbkBpbnRlbC5jb20+ CgpbIFVwc3RyZWFtIGNvbW1pdCA1Mzg2N2I0NmZhODQ0MzcxM2IzYWVlNTIwZDZjYTU1OGIyMjJk ODI5IF0KClJlbmFtZSBQTEFORV9DVExfREVDT01QUkVTU0lPTl9FTkFCTEUgdG8gcmVzZW1ibGUg dGhlIGJwc2VjIG5hbWUgLQpQTEFORV9DVExfUkVOREVSX0RFQ09NUFJFU1NJT05fRU5BQkxFCgpT dWdnZXN0ZWQtYnk6IFJvZHJpZ28gVml2aSA8cm9kcmlnby52aXZpQGludGVsLmNvbT4KQ2M6IERh bmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+ClNpZ25lZC1vZmYtYnk6IERoaW5h a2FyYW4gUGFuZGl5YW4gPGRoaW5ha2FyYW4ucGFuZGl5YW5AaW50ZWwuY29tPgpSZXZpZXdlZC1i eTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KTGluazog aHR0cHM6Ly9wYXRjaHdvcmsuZnJlZWRlc2t0b3Aub3JnL3BhdGNoL21zZ2lkLzIwMTgwODIyMDE1 MDUzLjE0MjAtMi1kaGluYWthcmFuLnBhbmRpeWFuQGludGVsLmNvbQpTaWduZWQtb2ZmLWJ5OiBT YXNoYSBMZXZpbiA8c2FzaGFsQGtlcm5lbC5vcmc+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9yZWcuaCAgICAgIHwgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jIHwgOCArKysrLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA1IGluc2VydGlvbnMoKyksIDUgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaCBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKaW5kZXggMTZmNWQyZDkzODAxNC4uNGUw NzBhZmIyNzM4YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaAor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCkBAIC02NTMxLDcgKzY1MzEsNyBA QCBlbnVtIHsKICNkZWZpbmUgICBQTEFORV9DVExfWVVWNDIyX1VZVlkJCQkoMSA8PCAxNikKICNk ZWZpbmUgICBQTEFORV9DVExfWVVWNDIyX1lWWVUJCQkoMiA8PCAxNikKICNkZWZpbmUgICBQTEFO RV9DVExfWVVWNDIyX1ZZVVkJCQkoMyA8PCAxNikKLSNkZWZpbmUgICBQTEFORV9DVExfREVDT01Q UkVTU0lPTl9FTkFCTEUJKDEgPDwgMTUpCisjZGVmaW5lICAgUExBTkVfQ1RMX1JFTkRFUl9ERUNP TVBSRVNTSU9OX0VOQUJMRQkoMSA8PCAxNSkKICNkZWZpbmUgICBQTEFORV9DVExfVFJJQ0tMRV9G RUVEX0RJU0FCTEUJKDEgPDwgMTQpCiAjZGVmaW5lICAgUExBTkVfQ1RMX1BMQU5FX0dBTU1BX0RJ U0FCTEUJCSgxIDw8IDEzKSAvKiBQcmUtR0xLICovCiAjZGVmaW5lICAgUExBTkVfQ1RMX1RJTEVE X01BU0sJCQkoMHg3IDw8IDEwKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4 IDNiZDQ0ZDA0MmExZDkuLmY1MzY3YmRjMDQwNDkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKQEAgLTM1NjEsMTEgKzM1NjEsMTEgQEAgc3RhdGljIHUzMiBza2xfcGxhbmVfY3Rs X3RpbGluZyh1aW50NjRfdCBmYl9tb2RpZmllcikKIAljYXNlIEk5MTVfRk9STUFUX01PRF9ZX1RJ TEVEOgogCQlyZXR1cm4gUExBTkVfQ1RMX1RJTEVEX1k7CiAJY2FzZSBJOTE1X0ZPUk1BVF9NT0Rf WV9USUxFRF9DQ1M6Ci0JCXJldHVybiBQTEFORV9DVExfVElMRURfWSB8IFBMQU5FX0NUTF9ERUNP TVBSRVNTSU9OX0VOQUJMRTsKKwkJcmV0dXJuIFBMQU5FX0NUTF9USUxFRF9ZIHwgUExBTkVfQ1RM X1JFTkRFUl9ERUNPTVBSRVNTSU9OX0VOQUJMRTsKIAljYXNlIEk5MTVfRk9STUFUX01PRF9ZZl9U SUxFRDoKIAkJcmV0dXJuIFBMQU5FX0NUTF9USUxFRF9ZRjsKIAljYXNlIEk5MTVfRk9STUFUX01P RF9ZZl9USUxFRF9DQ1M6Ci0JCXJldHVybiBQTEFORV9DVExfVElMRURfWUYgfCBQTEFORV9DVExf REVDT01QUkVTU0lPTl9FTkFCTEU7CisJCXJldHVybiBQTEFORV9DVExfVElMRURfWUYgfCBQTEFO RV9DVExfUkVOREVSX0RFQ09NUFJFU1NJT05fRU5BQkxFOwogCWRlZmF1bHQ6CiAJCU1JU1NJTkdf Q0FTRShmYl9tb2RpZmllcik7CiAJfQpAQCAtODgxMiwxMyArODgxMiwxMyBAQCBza3lsYWtlX2dl dF9pbml0aWFsX3BsYW5lX2NvbmZpZyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAkJZmItPm1v ZGlmaWVyID0gSTkxNV9GT1JNQVRfTU9EX1hfVElMRUQ7CiAJCWJyZWFrOwogCWNhc2UgUExBTkVf Q1RMX1RJTEVEX1k6Ci0JCWlmICh2YWwgJiBQTEFORV9DVExfREVDT01QUkVTU0lPTl9FTkFCTEUp CisJCWlmICh2YWwgJiBQTEFORV9DVExfUkVOREVSX0RFQ09NUFJFU1NJT05fRU5BQkxFKQogCQkJ ZmItPm1vZGlmaWVyID0gSTkxNV9GT1JNQVRfTU9EX1lfVElMRURfQ0NTOwogCQllbHNlCiAJCQlm Yi0+bW9kaWZpZXIgPSBJOTE1X0ZPUk1BVF9NT0RfWV9USUxFRDsKIAkJYnJlYWs7CiAJY2FzZSBQ TEFORV9DVExfVElMRURfWUY6Ci0JCWlmICh2YWwgJiBQTEFORV9DVExfREVDT01QUkVTU0lPTl9F TkFCTEUpCisJCWlmICh2YWwgJiBQTEFORV9DVExfUkVOREVSX0RFQ09NUFJFU1NJT05fRU5BQkxF KQogCQkJZmItPm1vZGlmaWVyID0gSTkxNV9GT1JNQVRfTU9EX1lmX1RJTEVEX0NDUzsKIAkJZWxz ZQogCQkJZmItPm1vZGlmaWVyID0gSTkxNV9GT1JNQVRfTU9EX1lmX1RJTEVEOwotLSAKMi4yMC4x CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2 ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE289C3A5A2 for ; Tue, 3 Sep 2019 16:26:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7CA84238CF for ; Tue, 3 Sep 2019 16:26:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567527967; bh=3HZcg6Wa9KHkOEdnpkOwcP6R0/P6zfM1cCkAiJLfuVA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=DHY4lJCO2lSHcqdHD4QrzomHGeZWfGqzUnlDjhlNNos06lKiA+ozPini6viBhf4ON 8Lqe6OK47juoWtjwbhsnAXwngoHrbl9p55qEpHH8CtLvFem+ARB0ricrSsucUMFkFG LvGfYPWT3WCa9fZCwltbV/uwaQ5BO/iN60mHWzxQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729998AbfICQ0G (ORCPT ); Tue, 3 Sep 2019 12:26:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:46172 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730487AbfICQZv (ORCPT ); Tue, 3 Sep 2019 12:25:51 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B6E4D23697; Tue, 3 Sep 2019 16:25:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567527950; bh=3HZcg6Wa9KHkOEdnpkOwcP6R0/P6zfM1cCkAiJLfuVA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KryyxzS6sCfmWJzps3F/DvOnbU+2LhntOudlxb2vJNc0a3Zuzsfy66F81WxNkNErO FDiHzUEiDHi5UP55layqjllxKSLRafw9YAiyii0iNjoePXqfjNFq0m5B371Wk4H7vs lrIpZDKeYVIfkRW7mEjdkmVDNpyhkLb1OuHrhOyQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dhinakaran Pandiyan , Rodrigo Vivi , Daniel Vetter , =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , Sasha Levin , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.19 017/167] drm/i915: Rename PLANE_CTL_DECOMPRESSION_ENABLE Date: Tue, 3 Sep 2019 12:22:49 -0400 Message-Id: <20190903162519.7136-17-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190903162519.7136-1-sashal@kernel.org> References: <20190903162519.7136-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dhinakaran Pandiyan [ Upstream commit 53867b46fa8443713b3aee520d6ca558b222d829 ] Rename PLANE_CTL_DECOMPRESSION_ENABLE to resemble the bpsec name - PLANE_CTL_RENDER_DECOMPRESSION_ENABLE Suggested-by: Rodrigo Vivi Cc: Daniel Vetter Signed-off-by: Dhinakaran Pandiyan Reviewed-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20180822015053.1420-2-dhinakaran.pandiyan@intel.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_display.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 16f5d2d938014..4e070afb2738b 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -6531,7 +6531,7 @@ enum { #define PLANE_CTL_YUV422_UYVY (1 << 16) #define PLANE_CTL_YUV422_YVYU (2 << 16) #define PLANE_CTL_YUV422_VYUY (3 << 16) -#define PLANE_CTL_DECOMPRESSION_ENABLE (1 << 15) +#define PLANE_CTL_RENDER_DECOMPRESSION_ENABLE (1 << 15) #define PLANE_CTL_TRICKLE_FEED_DISABLE (1 << 14) #define PLANE_CTL_PLANE_GAMMA_DISABLE (1 << 13) /* Pre-GLK */ #define PLANE_CTL_TILED_MASK (0x7 << 10) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 3bd44d042a1d9..f5367bdc04049 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3561,11 +3561,11 @@ static u32 skl_plane_ctl_tiling(uint64_t fb_modifier) case I915_FORMAT_MOD_Y_TILED: return PLANE_CTL_TILED_Y; case I915_FORMAT_MOD_Y_TILED_CCS: - return PLANE_CTL_TILED_Y | PLANE_CTL_DECOMPRESSION_ENABLE; + return PLANE_CTL_TILED_Y | PLANE_CTL_RENDER_DECOMPRESSION_ENABLE; case I915_FORMAT_MOD_Yf_TILED: return PLANE_CTL_TILED_YF; case I915_FORMAT_MOD_Yf_TILED_CCS: - return PLANE_CTL_TILED_YF | PLANE_CTL_DECOMPRESSION_ENABLE; + return PLANE_CTL_TILED_YF | PLANE_CTL_RENDER_DECOMPRESSION_ENABLE; default: MISSING_CASE(fb_modifier); } @@ -8812,13 +8812,13 @@ skylake_get_initial_plane_config(struct intel_crtc *crtc, fb->modifier = I915_FORMAT_MOD_X_TILED; break; case PLANE_CTL_TILED_Y: - if (val & PLANE_CTL_DECOMPRESSION_ENABLE) + if (val & PLANE_CTL_RENDER_DECOMPRESSION_ENABLE) fb->modifier = I915_FORMAT_MOD_Y_TILED_CCS; else fb->modifier = I915_FORMAT_MOD_Y_TILED; break; case PLANE_CTL_TILED_YF: - if (val & PLANE_CTL_DECOMPRESSION_ENABLE) + if (val & PLANE_CTL_RENDER_DECOMPRESSION_ENABLE) fb->modifier = I915_FORMAT_MOD_Yf_TILED_CCS; else fb->modifier = I915_FORMAT_MOD_Yf_TILED; -- 2.20.1