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=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,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 00EAEC10F12 for ; Wed, 17 Apr 2019 07:55:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C778B20835 for ; Wed, 17 Apr 2019 07:55:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731453AbfDQHzt (ORCPT ); Wed, 17 Apr 2019 03:55:49 -0400 Received: from relay10.mail.gandi.net ([217.70.178.230]:43169 "EHLO relay10.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731336AbfDQHze (ORCPT ); Wed, 17 Apr 2019 03:55:34 -0400 Received: from localhost (aaubervilliers-681-1-42-238.w90-88.abo.wanadoo.fr [90.88.160.238]) (Authenticated sender: maxime.ripard@bootlin.com) by relay10.mail.gandi.net (Postfix) with ESMTPSA id C2C4F240006; Wed, 17 Apr 2019 07:55:29 +0000 (UTC) From: Maxime Ripard To: Daniel Vetter , David Airlie , Maarten Lankhorst , Sean Paul , Maxime Ripard , Mauro Carvalho Chehab Cc: Sakari Ailus , Hans Verkuil , Laurent Pinchart , Thomas Petazzoni , Paul Kocialkowski , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 11/20] drm/i915: Convert to generic image format library Date: Wed, 17 Apr 2019 09:54:37 +0200 Message-Id: <9561d4a4a7c95e0c10c58a3a57f7bde9190fe1e8.1555487650.git-series.maxime.ripard@bootlin.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that we have a generic image format libary, let's convert drivers to use it so that we can deprecate the old DRM one. Signed-off-by: Maxime Ripard --- drivers/gpu/drm/i915/intel_display.c | 4 ++-- drivers/gpu/drm/i915/intel_pm.c | 6 +++--- drivers/gpu/drm/i915/intel_sprite.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 6a0c4f505593..c745e1172dc9 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -8094,7 +8094,7 @@ i9xx_get_initial_plane_config(struct intel_crtc *crtc, pixel_format = val & DISPPLANE_PIXFORMAT_MASK; fourcc = i9xx_format_to_fourcc(pixel_format); - fb->format = drm_format_info(fourcc); + fb->format = image_format_drm_lookup(fourcc); if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) { offset = I915_READ(DSPOFFSET(i9xx_plane)); @@ -9194,7 +9194,7 @@ skylake_get_initial_plane_config(struct intel_crtc *crtc, fourcc = skl_format_to_fourcc(pixel_format, val & PLANE_CTL_ORDER_RGBX, alpha); - fb->format = drm_format_info(fourcc); + fb->format = image_format_drm_lookup(fourcc); tiling = val & PLANE_CTL_TILED_MASK; switch (tiling) { diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 7357bddf9ad9..3b490ea1baf0 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -3928,7 +3928,7 @@ skl_ddb_get_pipe_allocation_limits(struct drm_i915_private *dev_priv, } static int skl_compute_wm_params(const struct intel_crtc_state *crtc_state, - int width, const struct drm_format_info *format, + int width, const struct image_format_info *format, u64 modifier, unsigned int rotation, u32 plane_pixel_rate, struct skl_wm_params *wp, int color_plane); @@ -3949,7 +3949,7 @@ skl_cursor_allocation(const struct intel_crtc_state *crtc_state, struct skl_wm_params wp; ret = skl_compute_wm_params(crtc_state, 256, - drm_format_info(DRM_FORMAT_ARGB8888), + image_format_drm_lookup(DRM_FORMAT_ARGB8888), DRM_FORMAT_MOD_LINEAR, DRM_MODE_ROTATE_0, crtc_state->pixel_rate, &wp, 0); @@ -4644,7 +4644,7 @@ skl_adjusted_plane_pixel_rate(const struct intel_crtc_state *cstate, static int skl_compute_wm_params(const struct intel_crtc_state *crtc_state, - int width, const struct drm_format_info *format, + int width, const struct image_format_info *format, u64 modifier, unsigned int rotation, u32 plane_pixel_rate, struct skl_wm_params *wp, int color_plane) diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index e35601b1f878..152b58267671 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -325,8 +325,8 @@ skl_plane_max_stride(struct intel_plane *plane, u32 pixel_format, u64 modifier, unsigned int rotation) { - const struct drm_format_info *info = drm_format_info(pixel_format); - int cpp = drm_format_info_plane_cpp(info, 0); + const struct image_format_info *info = image_format_drm_lookup(pixel_format); + int cpp = image_format_info_plane_cpp(info, 0); /* * "The stride in bytes must not exceed the -- git-series 0.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maxime Ripard Subject: [PATCH 11/20] drm/i915: Convert to generic image format library Date: Wed, 17 Apr 2019 09:54:37 +0200 Message-ID: <9561d4a4a7c95e0c10c58a3a57f7bde9190fe1e8.1555487650.git-series.maxime.ripard@bootlin.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from relay10.mail.gandi.net (relay10.mail.gandi.net [217.70.178.230]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0E40D89F99 for ; Wed, 17 Apr 2019 07:55:32 +0000 (UTC) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Daniel Vetter , David Airlie , Maarten Lankhorst , Sean Paul , Maxime Ripard , Mauro Carvalho Chehab Cc: Sakari Ailus , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Paul Kocialkowski , Hans Verkuil , Laurent Pinchart , Thomas Petazzoni , linux-media@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org Tm93IHRoYXQgd2UgaGF2ZSBhIGdlbmVyaWMgaW1hZ2UgZm9ybWF0IGxpYmFyeSwgbGV0J3MgY29u dmVydCBkcml2ZXJzIHRvCnVzZSBpdCBzbyB0aGF0IHdlIGNhbiBkZXByZWNhdGUgdGhlIG9sZCBE Uk0gb25lLgoKU2lnbmVkLW9mZi1ieTogTWF4aW1lIFJpcGFyZCA8bWF4aW1lLnJpcGFyZEBib290 bGluLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA0ICsr LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgICAgICB8IDYgKysrLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyAgfCA0ICsrLS0KIDMgZmlsZXMgY2hhbmdl ZCwgNyBpbnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYwppbmRleCA2YTBjNGY1MDU1OTMuLmM3NDVlMTE3MmRjOSAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtODA5NCw3ICs4MDk0LDcgQEAgaTl4eF9nZXRfaW5p dGlhbF9wbGFuZV9jb25maWcoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAKIAlwaXhlbF9mb3Jt YXQgPSB2YWwgJiBESVNQUExBTkVfUElYRk9STUFUX01BU0s7CiAJZm91cmNjID0gaTl4eF9mb3Jt YXRfdG9fZm91cmNjKHBpeGVsX2Zvcm1hdCk7Ci0JZmItPmZvcm1hdCA9IGRybV9mb3JtYXRfaW5m byhmb3VyY2MpOworCWZiLT5mb3JtYXQgPSBpbWFnZV9mb3JtYXRfZHJtX2xvb2t1cChmb3VyY2Mp OwogCiAJaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYpIHx8IElTX0JST0FEV0VMTChkZXZfcHJpdikp IHsKIAkJb2Zmc2V0ID0gSTkxNV9SRUFEKERTUE9GRlNFVChpOXh4X3BsYW5lKSk7CkBAIC05MTk0 LDcgKzkxOTQsNyBAQCBza3lsYWtlX2dldF9pbml0aWFsX3BsYW5lX2NvbmZpZyhzdHJ1Y3QgaW50 ZWxfY3J0YyAqY3J0YywKIAogCWZvdXJjYyA9IHNrbF9mb3JtYXRfdG9fZm91cmNjKHBpeGVsX2Zv cm1hdCwKIAkJCQkgICAgICB2YWwgJiBQTEFORV9DVExfT1JERVJfUkdCWCwgYWxwaGEpOwotCWZi LT5mb3JtYXQgPSBkcm1fZm9ybWF0X2luZm8oZm91cmNjKTsKKwlmYi0+Zm9ybWF0ID0gaW1hZ2Vf Zm9ybWF0X2RybV9sb29rdXAoZm91cmNjKTsKIAogCXRpbGluZyA9IHZhbCAmIFBMQU5FX0NUTF9U SUxFRF9NQVNLOwogCXN3aXRjaCAodGlsaW5nKSB7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRl eCA3MzU3YmRkZjlhZDkuLjNiNDkwZWExYmFmMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBA IC0zOTI4LDcgKzM5MjgsNyBAQCBza2xfZGRiX2dldF9waXBlX2FsbG9jYXRpb25fbGltaXRzKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIH0KIAogc3RhdGljIGludCBza2xfY29t cHV0ZV93bV9wYXJhbXMoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUs Ci0JCQkJIGludCB3aWR0aCwgY29uc3Qgc3RydWN0IGRybV9mb3JtYXRfaW5mbyAqZm9ybWF0LAor CQkJCSBpbnQgd2lkdGgsIGNvbnN0IHN0cnVjdCBpbWFnZV9mb3JtYXRfaW5mbyAqZm9ybWF0LAog CQkJCSB1NjQgbW9kaWZpZXIsIHVuc2lnbmVkIGludCByb3RhdGlvbiwKIAkJCQkgdTMyIHBsYW5l X3BpeGVsX3JhdGUsIHN0cnVjdCBza2xfd21fcGFyYW1zICp3cCwKIAkJCQkgaW50IGNvbG9yX3Bs YW5lKTsKQEAgLTM5NDksNyArMzk0OSw3IEBAIHNrbF9jdXJzb3JfYWxsb2NhdGlvbihjb25zdCBz dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAlzdHJ1Y3Qgc2tsX3dtX3BhcmFt cyB3cDsKIAogCXJldCA9IHNrbF9jb21wdXRlX3dtX3BhcmFtcyhjcnRjX3N0YXRlLCAyNTYsCi0J CQkJICAgIGRybV9mb3JtYXRfaW5mbyhEUk1fRk9STUFUX0FSR0I4ODg4KSwKKwkJCQkgICAgaW1h Z2VfZm9ybWF0X2RybV9sb29rdXAoRFJNX0ZPUk1BVF9BUkdCODg4OCksCiAJCQkJICAgIERSTV9G T1JNQVRfTU9EX0xJTkVBUiwKIAkJCQkgICAgRFJNX01PREVfUk9UQVRFXzAsCiAJCQkJICAgIGNy dGNfc3RhdGUtPnBpeGVsX3JhdGUsICZ3cCwgMCk7CkBAIC00NjQ0LDcgKzQ2NDQsNyBAQCBza2xf YWRqdXN0ZWRfcGxhbmVfcGl4ZWxfcmF0ZShjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAq Y3N0YXRlLAogCiBzdGF0aWMgaW50CiBza2xfY29tcHV0ZV93bV9wYXJhbXMoY29uc3Qgc3RydWN0 IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCi0JCSAgICAgIGludCB3aWR0aCwgY29uc3Qg c3RydWN0IGRybV9mb3JtYXRfaW5mbyAqZm9ybWF0LAorCQkgICAgICBpbnQgd2lkdGgsIGNvbnN0 IHN0cnVjdCBpbWFnZV9mb3JtYXRfaW5mbyAqZm9ybWF0LAogCQkgICAgICB1NjQgbW9kaWZpZXIs IHVuc2lnbmVkIGludCByb3RhdGlvbiwKIAkJICAgICAgdTMyIHBsYW5lX3BpeGVsX3JhdGUsIHN0 cnVjdCBza2xfd21fcGFyYW1zICp3cCwKIAkJICAgICAgaW50IGNvbG9yX3BsYW5lKQpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9zcHJpdGUuYwppbmRleCBlMzU2MDFiMWY4NzguLjE1MmI1ODI2NzY3MSAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKQEAgLTMyNSw4ICszMjUsOCBAQCBza2xf cGxhbmVfbWF4X3N0cmlkZShzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lLAogCQkgICAgIHUzMiBw aXhlbF9mb3JtYXQsIHU2NCBtb2RpZmllciwKIAkJICAgICB1bnNpZ25lZCBpbnQgcm90YXRpb24p CiB7Ci0JY29uc3Qgc3RydWN0IGRybV9mb3JtYXRfaW5mbyAqaW5mbyA9IGRybV9mb3JtYXRfaW5m byhwaXhlbF9mb3JtYXQpOwotCWludCBjcHAgPSBkcm1fZm9ybWF0X2luZm9fcGxhbmVfY3BwKGlu Zm8sIDApOworCWNvbnN0IHN0cnVjdCBpbWFnZV9mb3JtYXRfaW5mbyAqaW5mbyA9IGltYWdlX2Zv cm1hdF9kcm1fbG9va3VwKHBpeGVsX2Zvcm1hdCk7CisJaW50IGNwcCA9IGltYWdlX2Zvcm1hdF9p bmZvX3BsYW5lX2NwcChpbmZvLCAwKTsKIAogCS8qCiAJICogIlRoZSBzdHJpZGUgaW4gYnl0ZXMg bXVzdCBub3QgZXhjZWVkIHRoZQotLSAKZ2l0LXNlcmllcyAwLjkuMQpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRy aS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw=