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 9536EC10F12 for ; Wed, 17 Apr 2019 07:55:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6D1C020835 for ; Wed, 17 Apr 2019 07:55:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731464AbfDQHzw (ORCPT ); Wed, 17 Apr 2019 03:55:52 -0400 Received: from relay1-d.mail.gandi.net ([217.70.183.193]:35851 "EHLO relay1-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731392AbfDQHzr (ORCPT ); Wed, 17 Apr 2019 03:55:47 -0400 X-Originating-IP: 90.88.160.238 Received: from localhost (aaubervilliers-681-1-42-238.w90-88.abo.wanadoo.fr [90.88.160.238]) (Authenticated sender: maxime.ripard@bootlin.com) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id BDF3D240005; Wed, 17 Apr 2019 07:55:42 +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 14/20] drm/omap: Convert to generic image format library Date: Wed, 17 Apr 2019 09:54:40 +0200 Message-Id: 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/omapdrm/dss/dispc.c | 9 +++++---- drivers/gpu/drm/omapdrm/omap_fb.c | 7 ++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/dss/dispc.c b/drivers/gpu/drm/omapdrm/dss/dispc.c index ba82d916719c..bf60d49ad6ca 100644 --- a/drivers/gpu/drm/omapdrm/dss/dispc.c +++ b/drivers/gpu/drm/omapdrm/dss/dispc.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -1898,9 +1899,9 @@ static void dispc_ovl_set_scaling_uv(struct dispc_device *dispc, int scale_x = out_width != orig_width; int scale_y = out_height != orig_height; bool chroma_upscale = plane != OMAP_DSS_WB; - const struct drm_format_info *info; + const struct image_format_info *info; - info = drm_format_info(fourcc); + info = image_format_drm_lookup(fourcc); if (!dispc_has_feature(dispc, FEAT_HANDLE_UV_SEPARATE)) return; @@ -2623,9 +2624,9 @@ static int dispc_ovl_setup_common(struct dispc_device *dispc, bool ilace = !!(vm->flags & DISPLAY_FLAGS_INTERLACED); unsigned long pclk = dispc_plane_pclk_rate(dispc, plane); unsigned long lclk = dispc_plane_lclk_rate(dispc, plane); - const struct drm_format_info *info; + const struct image_format_info *info; - info = drm_format_info(fourcc); + info = image_format_drm_lookup(fourcc); /* when setting up WB, dispc_plane_pclk_rate() returns 0 */ if (plane == OMAP_DSS_WB) diff --git a/drivers/gpu/drm/omapdrm/omap_fb.c b/drivers/gpu/drm/omapdrm/omap_fb.c index 1d4143adf829..8caecfc8d1db 100644 --- a/drivers/gpu/drm/omapdrm/omap_fb.c +++ b/drivers/gpu/drm/omapdrm/omap_fb.c @@ -15,6 +15,7 @@ * this program. If not, see . */ +#include #include #include @@ -60,7 +61,7 @@ struct plane { struct omap_framebuffer { struct drm_framebuffer base; int pin_count; - const struct drm_format_info *format; + const struct image_format_info *format; struct plane planes[2]; /* lock for pinning (pin_count and planes.dma_addr) */ struct mutex lock; @@ -72,7 +73,7 @@ static const struct drm_framebuffer_funcs omap_framebuffer_funcs = { }; static u32 get_linear_addr(struct drm_framebuffer *fb, - const struct drm_format_info *format, int n, int x, int y) + const struct image_format_info *format, int n, int x, int y) { struct omap_framebuffer *omap_fb = to_omap_framebuffer(fb); struct plane *plane = &omap_fb->planes[n]; @@ -126,7 +127,7 @@ void omap_framebuffer_update_scanout(struct drm_framebuffer *fb, struct drm_plane_state *state, struct omap_overlay_info *info) { struct omap_framebuffer *omap_fb = to_omap_framebuffer(fb); - const struct drm_format_info *format = omap_fb->format; + const struct image_format_info *format = omap_fb->format; struct plane *plane = &omap_fb->planes[0]; u32 x, y, orient = 0; -- git-series 0.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maxime Ripard Subject: [PATCH 14/20] drm/omap: Convert to generic image format library Date: Wed, 17 Apr 2019 09:54:40 +0200 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by gabe.freedesktop.org (Postfix) with ESMTPS id A2CD789FD3 for ; Wed, 17 Apr 2019 07:55:46 +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 bGluLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vb21hcGRybS9kc3MvZGlzcGMuYyB8ICA5ICsr KysrLS0tLQogZHJpdmVycy9ncHUvZHJtL29tYXBkcm0vb21hcF9mYi5jICAgfCAgNyArKysrLS0t CiAyIGZpbGVzIGNoYW5nZWQsIDkgaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vb21hcGRybS9kc3MvZGlzcGMuYyBiL2RyaXZlcnMvZ3B1 L2RybS9vbWFwZHJtL2Rzcy9kaXNwYy5jCmluZGV4IGJhODJkOTE2NzE5Yy4uYmY2MGQ0OWFkNmNh IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vb21hcGRybS9kc3MvZGlzcGMuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vb21hcGRybS9kc3MvZGlzcGMuYwpAQCAtMjUsNiArMjUsNyBAQAogI2lu Y2x1ZGUgPGxpbnV4L3ZtYWxsb2MuaD4KICNpbmNsdWRlIDxsaW51eC9leHBvcnQuaD4KICNpbmNs dWRlIDxsaW51eC9jbGsuaD4KKyNpbmNsdWRlIDxsaW51eC9pbWFnZS1mb3JtYXRzLmg+CiAjaW5j bHVkZSA8bGludXgvaW8uaD4KICNpbmNsdWRlIDxsaW51eC9qaWZmaWVzLmg+CiAjaW5jbHVkZSA8 bGludXgvc2VxX2ZpbGUuaD4KQEAgLTE4OTgsOSArMTg5OSw5IEBAIHN0YXRpYyB2b2lkIGRpc3Bj X292bF9zZXRfc2NhbGluZ191dihzdHJ1Y3QgZGlzcGNfZGV2aWNlICpkaXNwYywKIAlpbnQgc2Nh bGVfeCA9IG91dF93aWR0aCAhPSBvcmlnX3dpZHRoOwogCWludCBzY2FsZV95ID0gb3V0X2hlaWdo dCAhPSBvcmlnX2hlaWdodDsKIAlib29sIGNocm9tYV91cHNjYWxlID0gcGxhbmUgIT0gT01BUF9E U1NfV0I7Ci0JY29uc3Qgc3RydWN0IGRybV9mb3JtYXRfaW5mbyAqaW5mbzsKKwljb25zdCBzdHJ1 Y3QgaW1hZ2VfZm9ybWF0X2luZm8gKmluZm87CiAKLQlpbmZvID0gZHJtX2Zvcm1hdF9pbmZvKGZv dXJjYyk7CisJaW5mbyA9IGltYWdlX2Zvcm1hdF9kcm1fbG9va3VwKGZvdXJjYyk7CiAKIAlpZiAo IWRpc3BjX2hhc19mZWF0dXJlKGRpc3BjLCBGRUFUX0hBTkRMRV9VVl9TRVBBUkFURSkpCiAJCXJl dHVybjsKQEAgLTI2MjMsOSArMjYyNCw5IEBAIHN0YXRpYyBpbnQgZGlzcGNfb3ZsX3NldHVwX2Nv bW1vbihzdHJ1Y3QgZGlzcGNfZGV2aWNlICpkaXNwYywKIAlib29sIGlsYWNlID0gISEodm0tPmZs YWdzICYgRElTUExBWV9GTEFHU19JTlRFUkxBQ0VEKTsKIAl1bnNpZ25lZCBsb25nIHBjbGsgPSBk aXNwY19wbGFuZV9wY2xrX3JhdGUoZGlzcGMsIHBsYW5lKTsKIAl1bnNpZ25lZCBsb25nIGxjbGsg PSBkaXNwY19wbGFuZV9sY2xrX3JhdGUoZGlzcGMsIHBsYW5lKTsKLQljb25zdCBzdHJ1Y3QgZHJt X2Zvcm1hdF9pbmZvICppbmZvOworCWNvbnN0IHN0cnVjdCBpbWFnZV9mb3JtYXRfaW5mbyAqaW5m bzsKIAotCWluZm8gPSBkcm1fZm9ybWF0X2luZm8oZm91cmNjKTsKKwlpbmZvID0gaW1hZ2VfZm9y bWF0X2RybV9sb29rdXAoZm91cmNjKTsKIAogCS8qIHdoZW4gc2V0dGluZyB1cCBXQiwgZGlzcGNf cGxhbmVfcGNsa19yYXRlKCkgcmV0dXJucyAwICovCiAJaWYgKHBsYW5lID09IE9NQVBfRFNTX1dC KQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL29tYXBkcm0vb21hcF9mYi5jIGIvZHJpdmVy cy9ncHUvZHJtL29tYXBkcm0vb21hcF9mYi5jCmluZGV4IDFkNDE0M2FkZjgyOS4uOGNhZWNmYzhk MWRiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vb21hcGRybS9vbWFwX2ZiLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL29tYXBkcm0vb21hcF9mYi5jCkBAIC0xNSw2ICsxNSw3IEBACiAgKiB0 aGlzIHByb2dyYW0uICBJZiBub3QsIHNlZSA8aHR0cDovL3d3dy5nbnUub3JnL2xpY2Vuc2VzLz4u CiAgKi8KIAorI2luY2x1ZGUgPGxpbnV4L2ltYWdlLWZvcm1hdHMuaD4KICNpbmNsdWRlIDxsaW51 eC9zZXFfZmlsZS5oPgogCiAjaW5jbHVkZSA8ZHJtL2RybV9jcnRjLmg+CkBAIC02MCw3ICs2MSw3 IEBAIHN0cnVjdCBwbGFuZSB7CiBzdHJ1Y3Qgb21hcF9mcmFtZWJ1ZmZlciB7CiAJc3RydWN0IGRy bV9mcmFtZWJ1ZmZlciBiYXNlOwogCWludCBwaW5fY291bnQ7Ci0JY29uc3Qgc3RydWN0IGRybV9m b3JtYXRfaW5mbyAqZm9ybWF0OworCWNvbnN0IHN0cnVjdCBpbWFnZV9mb3JtYXRfaW5mbyAqZm9y bWF0OwogCXN0cnVjdCBwbGFuZSBwbGFuZXNbMl07CiAJLyogbG9jayBmb3IgcGlubmluZyAocGlu X2NvdW50IGFuZCBwbGFuZXMuZG1hX2FkZHIpICovCiAJc3RydWN0IG11dGV4IGxvY2s7CkBAIC03 Miw3ICs3Myw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyX2Z1bmNzIG9t YXBfZnJhbWVidWZmZXJfZnVuY3MgPSB7CiB9OwogCiBzdGF0aWMgdTMyIGdldF9saW5lYXJfYWRk cihzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwKLQkJY29uc3Qgc3RydWN0IGRybV9mb3JtYXRf aW5mbyAqZm9ybWF0LCBpbnQgbiwgaW50IHgsIGludCB5KQorCQljb25zdCBzdHJ1Y3QgaW1hZ2Vf Zm9ybWF0X2luZm8gKmZvcm1hdCwgaW50IG4sIGludCB4LCBpbnQgeSkKIHsKIAlzdHJ1Y3Qgb21h cF9mcmFtZWJ1ZmZlciAqb21hcF9mYiA9IHRvX29tYXBfZnJhbWVidWZmZXIoZmIpOwogCXN0cnVj dCBwbGFuZSAqcGxhbmUgPSAmb21hcF9mYi0+cGxhbmVzW25dOwpAQCAtMTI2LDcgKzEyNyw3IEBA IHZvaWQgb21hcF9mcmFtZWJ1ZmZlcl91cGRhdGVfc2Nhbm91dChzdHJ1Y3QgZHJtX2ZyYW1lYnVm ZmVyICpmYiwKIAkJc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqc3RhdGUsIHN0cnVjdCBvbWFwX292 ZXJsYXlfaW5mbyAqaW5mbykKIHsKIAlzdHJ1Y3Qgb21hcF9mcmFtZWJ1ZmZlciAqb21hcF9mYiA9 IHRvX29tYXBfZnJhbWVidWZmZXIoZmIpOwotCWNvbnN0IHN0cnVjdCBkcm1fZm9ybWF0X2luZm8g KmZvcm1hdCA9IG9tYXBfZmItPmZvcm1hdDsKKwljb25zdCBzdHJ1Y3QgaW1hZ2VfZm9ybWF0X2lu Zm8gKmZvcm1hdCA9IG9tYXBfZmItPmZvcm1hdDsKIAlzdHJ1Y3QgcGxhbmUgKnBsYW5lID0gJm9t YXBfZmItPnBsYW5lc1swXTsKIAl1MzIgeCwgeSwgb3JpZW50ID0gMDsKIAotLSAKZ2l0LXNlcmll cyAwLjkuMQpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpk cmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw=