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,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 778DAC43381 for ; Tue, 19 Mar 2019 21:59:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5154B2085A for ; Tue, 19 Mar 2019 21:59:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728008AbfCSV7R (ORCPT ); Tue, 19 Mar 2019 17:59:17 -0400 Received: from relay8-d.mail.gandi.net ([217.70.183.201]:46373 "EHLO relay8-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727766AbfCSV6E (ORCPT ); Tue, 19 Mar 2019 17:58:04 -0400 X-Originating-IP: 90.89.68.76 Received: from localhost (lfbn-1-10718-76.w90-89.abo.wanadoo.fr [90.89.68.76]) (Authenticated sender: maxime.ripard@bootlin.com) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 5700B1BF207; Tue, 19 Mar 2019 21:57:59 +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: [RFC PATCH 12/20] drm/ipuv3: Convert to generic image format library Date: Tue, 19 Mar 2019 22:57:17 +0100 Message-Id: <56da0cae4bd0477930b355a5ddc511a570a587ee.1553032382.git-series.maxime.ripard@bootlin.com> X-Mailer: git-send-email 2.20.1 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/ipu-v3/ipu-pre.c | 3 ++- drivers/gpu/ipu-v3/ipu-prg.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/ipu-v3/ipu-pre.c b/drivers/gpu/ipu-v3/ipu-pre.c index 4a28f3fbb0a2..d561295abee0 100644 --- a/drivers/gpu/ipu-v3/ipu-pre.c +++ b/drivers/gpu/ipu-v3/ipu-pre.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -174,7 +175,7 @@ void ipu_pre_configure(struct ipu_pre *pre, unsigned int width, unsigned int height, unsigned int stride, u32 format, uint64_t modifier, unsigned int bufaddr) { - const struct drm_format_info *info = drm_format_info(format); + const struct image_format_info *info = image_format_drm_lookup(format); u32 active_bpp = info->cpp[0] >> 1; u32 val; diff --git a/drivers/gpu/ipu-v3/ipu-prg.c b/drivers/gpu/ipu-v3/ipu-prg.c index 38a3a9764e49..608a9213025d 100644 --- a/drivers/gpu/ipu-v3/ipu-prg.c +++ b/drivers/gpu/ipu-v3/ipu-prg.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -132,7 +133,7 @@ EXPORT_SYMBOL_GPL(ipu_prg_present); bool ipu_prg_format_supported(struct ipu_soc *ipu, uint32_t format, uint64_t modifier) { - const struct drm_format_info *info = drm_format_info(format); + const struct image_format_info *info = image_format_drm_lookup(format); if (info->num_planes != 1) return false; -- git-series 0.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maxime Ripard Subject: [RFC PATCH 12/20] drm/ipuv3: Convert to generic image format library Date: Tue, 19 Mar 2019 22:57:17 +0100 Message-ID: <56da0cae4bd0477930b355a5ddc511a570a587ee.1553032382.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 relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2AF6589BFE for ; Tue, 19 Mar 2019 21:58:05 +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 bGluLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9pcHUtdjMvaXB1LXByZS5jIHwgMyArKy0KIGRyaXZl cnMvZ3B1L2lwdS12My9pcHUtcHJnLmMgfCAzICsrLQogMiBmaWxlcyBjaGFuZ2VkLCA0IGluc2Vy dGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvaXB1LXYz L2lwdS1wcmUuYyBiL2RyaXZlcnMvZ3B1L2lwdS12My9pcHUtcHJlLmMKaW5kZXggNGEyOGYzZmJi MGEyLi5kNTYxMjk1YWJlZTAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2lwdS12My9pcHUtcHJl LmMKKysrIGIvZHJpdmVycy9ncHUvaXB1LXYzL2lwdS1wcmUuYwpAQCAtMTUsNiArMTUsNyBAQAog I2luY2x1ZGUgPGxpbnV4L2Nsay5oPgogI2luY2x1ZGUgPGxpbnV4L2Vyci5oPgogI2luY2x1ZGUg PGxpbnV4L2dlbmFsbG9jLmg+CisjaW5jbHVkZSA8bGludXgvaW1hZ2UtZm9ybWF0cy5oPgogI2lu Y2x1ZGUgPGxpbnV4L21vZHVsZS5oPgogI2luY2x1ZGUgPGxpbnV4L29mLmg+CiAjaW5jbHVkZSA8 bGludXgvcGxhdGZvcm1fZGV2aWNlLmg+CkBAIC0xNzQsNyArMTc1LDcgQEAgdm9pZCBpcHVfcHJl X2NvbmZpZ3VyZShzdHJ1Y3QgaXB1X3ByZSAqcHJlLCB1bnNpZ25lZCBpbnQgd2lkdGgsCiAJCSAg ICAgICB1bnNpZ25lZCBpbnQgaGVpZ2h0LCB1bnNpZ25lZCBpbnQgc3RyaWRlLCB1MzIgZm9ybWF0 LAogCQkgICAgICAgdWludDY0X3QgbW9kaWZpZXIsIHVuc2lnbmVkIGludCBidWZhZGRyKQogewot CWNvbnN0IHN0cnVjdCBkcm1fZm9ybWF0X2luZm8gKmluZm8gPSBkcm1fZm9ybWF0X2luZm8oZm9y bWF0KTsKKwljb25zdCBzdHJ1Y3QgaW1hZ2VfZm9ybWF0X2luZm8gKmluZm8gPSBpbWFnZV9mb3Jt YXRfZHJtX2xvb2t1cChmb3JtYXQpOwogCXUzMiBhY3RpdmVfYnBwID0gaW5mby0+Y3BwWzBdID4+ IDE7CiAJdTMyIHZhbDsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvaXB1LXYzL2lwdS1wcmcu YyBiL2RyaXZlcnMvZ3B1L2lwdS12My9pcHUtcHJnLmMKaW5kZXggMzhhM2E5NzY0ZTQ5Li42MDhh OTIxMzAyNWQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2lwdS12My9pcHUtcHJnLmMKKysrIGIv ZHJpdmVycy9ncHUvaXB1LXYzL2lwdS1wcmcuYwpAQCAtMTQsNiArMTQsNyBAQAogI2luY2x1ZGUg PGRybS9kcm1fZm91cmNjLmg+CiAjaW5jbHVkZSA8bGludXgvY2xrLmg+CiAjaW5jbHVkZSA8bGlu dXgvZXJyLmg+CisjaW5jbHVkZSA8bGludXgvaW1hZ2UtZm9ybWF0cy5oPgogI2luY2x1ZGUgPGxp bnV4L2lvcG9sbC5oPgogI2luY2x1ZGUgPGxpbnV4L21mZC9zeXNjb24uaD4KICNpbmNsdWRlIDxs aW51eC9tZmQvc3lzY29uL2lteDZxLWlvbXV4Yy1ncHIuaD4KQEAgLTEzMiw3ICsxMzMsNyBAQCBF WFBPUlRfU1lNQk9MX0dQTChpcHVfcHJnX3ByZXNlbnQpOwogYm9vbCBpcHVfcHJnX2Zvcm1hdF9z dXBwb3J0ZWQoc3RydWN0IGlwdV9zb2MgKmlwdSwgdWludDMyX3QgZm9ybWF0LAogCQkJICAgICAg dWludDY0X3QgbW9kaWZpZXIpCiB7Ci0JY29uc3Qgc3RydWN0IGRybV9mb3JtYXRfaW5mbyAqaW5m byA9IGRybV9mb3JtYXRfaW5mbyhmb3JtYXQpOworCWNvbnN0IHN0cnVjdCBpbWFnZV9mb3JtYXRf aW5mbyAqaW5mbyA9IGltYWdlX2Zvcm1hdF9kcm1fbG9va3VwKGZvcm1hdCk7CiAKIAlpZiAoaW5m by0+bnVtX3BsYW5lcyAhPSAxKQogCQlyZXR1cm4gZmFsc2U7Ci0tIApnaXQtc2VyaWVzIDAuOS4x Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZl bCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbA==