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_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 B0DDEC04AAF for ; Thu, 16 May 2019 10:32:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 887BF20881 for ; Thu, 16 May 2019 10:32:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727133AbfEPKc2 (ORCPT ); Thu, 16 May 2019 06:32:28 -0400 Received: from relay10.mail.gandi.net ([217.70.178.230]:55857 "EHLO relay10.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726336AbfEPKc2 (ORCPT ); Thu, 16 May 2019 06:32:28 -0400 Received: from localhost (unknown [80.215.244.179]) (Authenticated sender: maxime.ripard@bootlin.com) by relay10.mail.gandi.net (Postfix) with ESMTPSA id 78FE3240007; Thu, 16 May 2019 10:32:20 +0000 (UTC) From: Maxime Ripard To: Daniel Vetter , David Airlie , Maarten Lankhorst , Sean Paul , Maxime Ripard Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Emil Velikov , Paul Kocialkowski Subject: [PATCH v3 6/7] drm: Replace instances of drm_format_info by drm_get_format_info Date: Thu, 16 May 2019 12:31:51 +0200 Message-Id: <5859d68664b8f0804a56e7386937f6db986b9e0f.1558002671.git-series.maxime.ripard@bootlin.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <27b0041c7977402df4a087c78d2849ffe51c9f1c.1558002671.git-series.maxime.ripard@bootlin.com> References: <27b0041c7977402df4a087c78d2849ffe51c9f1c.1558002671.git-series.maxime.ripard@bootlin.com> 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 drm_get_format_info directly calls into drm_format_info, but takes directly a struct drm_mode_fb_cmd2 pointer, instead of the fourcc directly. It's shorter to not dereference it, and we can customise the behaviour at the driver level if we want to, so let's switch to it where it makes sense. Reviewed-by: Emil Velikov Reviewed-by: Paul Kocialkowski Signed-off-by: Maxime Ripard --- drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 4 ++-- drivers/gpu/drm/gma500/framebuffer.c | 2 +- drivers/gpu/drm/omapdrm/omap_fb.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c index 06e73a343724..6edae6458be8 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c @@ -121,8 +121,7 @@ static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev, struct drm_mode_fb_cmd2 *mode_cmd, struct drm_gem_object **gobj_p) { - const struct drm_format_info *info = drm_get_format_info(dev, - mode_cmd); + const struct drm_format_info *info; struct amdgpu_device *adev = rfbdev->adev; struct drm_gem_object *gobj = NULL; struct amdgpu_bo *abo = NULL; @@ -133,6 +132,7 @@ static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev, int height = mode_cmd->height; u32 cpp; + info = drm_get_format_info(adev->ddev, mode_cmd); cpp = drm_format_info_plane_cpp(info, 0); /* need to align pitch with crtc limits */ diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c index a9d3a4a30ab8..1794ab90b2cc 100644 --- a/drivers/gpu/drm/gma500/framebuffer.c +++ b/drivers/gpu/drm/gma500/framebuffer.c @@ -232,7 +232,7 @@ static int psb_framebuffer_init(struct drm_device *dev, * Reject unknown formats, YUV formats, and formats with more than * 4 bytes per pixel. */ - info = drm_format_info(mode_cmd->pixel_format); + info = drm_get_format_info(dev, mode_cmd); if (!info || !info->depth || info->cpp[0] > 4) return -EINVAL; diff --git a/drivers/gpu/drm/omapdrm/omap_fb.c b/drivers/gpu/drm/omapdrm/omap_fb.c index cfb641363a32..6557b2d6e16e 100644 --- a/drivers/gpu/drm/omapdrm/omap_fb.c +++ b/drivers/gpu/drm/omapdrm/omap_fb.c @@ -339,7 +339,7 @@ struct drm_framebuffer *omap_framebuffer_init(struct drm_device *dev, dev, mode_cmd, mode_cmd->width, mode_cmd->height, (char *)&mode_cmd->pixel_format); - format = drm_format_info(mode_cmd->pixel_format); + format = drm_get_format_info(dev, mode_cmd); for (i = 0; i < ARRAY_SIZE(formats); i++) { if (formats[i] == mode_cmd->pixel_format) -- git-series 0.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maxime Ripard Subject: [PATCH v3 6/7] drm: Replace instances of drm_format_info by drm_get_format_info Date: Thu, 16 May 2019 12:31:51 +0200 Message-ID: <5859d68664b8f0804a56e7386937f6db986b9e0f.1558002671.git-series.maxime.ripard@bootlin.com> References: <27b0041c7977402df4a087c78d2849ffe51c9f1c.1558002671.git-series.maxime.ripard@bootlin.com> 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 29D838936E for ; Thu, 16 May 2019 10:32:26 +0000 (UTC) In-Reply-To: <27b0041c7977402df4a087c78d2849ffe51c9f1c.1558002671.git-series.maxime.ripard@bootlin.com> 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 Cc: Paul Kocialkowski , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Emil Velikov List-Id: dri-devel@lists.freedesktop.org ZHJtX2dldF9mb3JtYXRfaW5mbyBkaXJlY3RseSBjYWxscyBpbnRvIGRybV9mb3JtYXRfaW5mbywg YnV0IHRha2VzIGRpcmVjdGx5CmEgc3RydWN0IGRybV9tb2RlX2ZiX2NtZDIgcG9pbnRlciwgaW5z dGVhZCBvZiB0aGUgZm91cmNjIGRpcmVjdGx5LiBJdCdzCnNob3J0ZXIgdG8gbm90IGRlcmVmZXJl bmNlIGl0LCBhbmQgd2UgY2FuIGN1c3RvbWlzZSB0aGUgYmVoYXZpb3VyIGF0IHRoZQpkcml2ZXIg bGV2ZWwgaWYgd2Ugd2FudCB0bywgc28gbGV0J3Mgc3dpdGNoIHRvIGl0IHdoZXJlIGl0IG1ha2Vz IHNlbnNlLgoKUmV2aWV3ZWQtYnk6IEVtaWwgVmVsaWtvdiA8ZW1pbC52ZWxpa292QGNvbGxhYm9y YS5jb20+ClJldmlld2VkLWJ5OiBQYXVsIEtvY2lhbGtvd3NraSA8cGF1bC5rb2NpYWxrb3dza2lA Ym9vdGxpbi5jb20+ClNpZ25lZC1vZmYtYnk6IE1heGltZSBSaXBhcmQgPG1heGltZS5yaXBhcmRA Ym9vdGxpbi5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2ZiLmMg fCA0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9nbWE1MDAvZnJhbWVidWZmZXIuYyAgIHwgMiArLQog ZHJpdmVycy9ncHUvZHJtL29tYXBkcm0vb21hcF9mYi5jICAgICAgfCAyICstCiAzIGZpbGVzIGNo YW5nZWQsIDQgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZmIuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2FtZGdwdV9mYi5jCmluZGV4IDA2ZTczYTM0MzcyNC4uNmVkYWU2NDU4YmU4IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZmIuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZmIuYwpAQCAtMTIxLDggKzEyMSw3IEBAIHN0 YXRpYyBpbnQgYW1kZ3B1ZmJfY3JlYXRlX3Bpbm5lZF9vYmplY3Qoc3RydWN0IGFtZGdwdV9mYmRl diAqcmZiZGV2LAogCQkJCQkgc3RydWN0IGRybV9tb2RlX2ZiX2NtZDIgKm1vZGVfY21kLAogCQkJ CQkgc3RydWN0IGRybV9nZW1fb2JqZWN0ICoqZ29ial9wKQogewotCWNvbnN0IHN0cnVjdCBkcm1f Zm9ybWF0X2luZm8gKmluZm8gPSBkcm1fZ2V0X2Zvcm1hdF9pbmZvKGRldiwKLQkJCQkJCQkJIG1v ZGVfY21kKTsKKwljb25zdCBzdHJ1Y3QgZHJtX2Zvcm1hdF9pbmZvICppbmZvOwogCXN0cnVjdCBh bWRncHVfZGV2aWNlICphZGV2ID0gcmZiZGV2LT5hZGV2OwogCXN0cnVjdCBkcm1fZ2VtX29iamVj dCAqZ29iaiA9IE5VTEw7CiAJc3RydWN0IGFtZGdwdV9ibyAqYWJvID0gTlVMTDsKQEAgLTEzMyw2 ICsxMzIsNyBAQCBzdGF0aWMgaW50IGFtZGdwdWZiX2NyZWF0ZV9waW5uZWRfb2JqZWN0KHN0cnVj dCBhbWRncHVfZmJkZXYgKnJmYmRldiwKIAlpbnQgaGVpZ2h0ID0gbW9kZV9jbWQtPmhlaWdodDsK IAl1MzIgY3BwOwogCisJaW5mbyA9IGRybV9nZXRfZm9ybWF0X2luZm8oYWRldi0+ZGRldiwgbW9k ZV9jbWQpOwogCWNwcCA9IGRybV9mb3JtYXRfaW5mb19wbGFuZV9jcHAoaW5mbywgMCk7CiAKIAkv KiBuZWVkIHRvIGFsaWduIHBpdGNoIHdpdGggY3J0YyBsaW1pdHMgKi8KZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9nbWE1MDAvZnJhbWVidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9nbWE1 MDAvZnJhbWVidWZmZXIuYwppbmRleCBhOWQzYTRhMzBhYjguLjE3OTRhYjkwYjJjYyAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2dtYTUwMC9mcmFtZWJ1ZmZlci5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9nbWE1MDAvZnJhbWVidWZmZXIuYwpAQCAtMjMyLDcgKzIzMiw3IEBAIHN0YXRpYyBp bnQgcHNiX2ZyYW1lYnVmZmVyX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkgKiBSZWpl Y3QgdW5rbm93biBmb3JtYXRzLCBZVVYgZm9ybWF0cywgYW5kIGZvcm1hdHMgd2l0aCBtb3JlIHRo YW4KIAkgKiA0IGJ5dGVzIHBlciBwaXhlbC4KIAkgKi8KLQlpbmZvID0gZHJtX2Zvcm1hdF9pbmZv KG1vZGVfY21kLT5waXhlbF9mb3JtYXQpOworCWluZm8gPSBkcm1fZ2V0X2Zvcm1hdF9pbmZvKGRl diwgbW9kZV9jbWQpOwogCWlmICghaW5mbyB8fCAhaW5mby0+ZGVwdGggfHwgaW5mby0+Y3BwWzBd ID4gNCkKIAkJcmV0dXJuIC1FSU5WQUw7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9v bWFwZHJtL29tYXBfZmIuYyBiL2RyaXZlcnMvZ3B1L2RybS9vbWFwZHJtL29tYXBfZmIuYwppbmRl eCBjZmI2NDEzNjNhMzIuLjY1NTdiMmQ2ZTE2ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L29tYXBkcm0vb21hcF9mYi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9vbWFwZHJtL29tYXBfZmIu YwpAQCAtMzM5LDcgKzMzOSw3IEBAIHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKm9tYXBfZnJhbWVi dWZmZXJfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJZGV2LCBtb2RlX2NtZCwgbW9k ZV9jbWQtPndpZHRoLCBtb2RlX2NtZC0+aGVpZ2h0LAogCQkJKGNoYXIgKikmbW9kZV9jbWQtPnBp eGVsX2Zvcm1hdCk7CiAKLQlmb3JtYXQgPSBkcm1fZm9ybWF0X2luZm8obW9kZV9jbWQtPnBpeGVs X2Zvcm1hdCk7CisJZm9ybWF0ID0gZHJtX2dldF9mb3JtYXRfaW5mbyhkZXYsIG1vZGVfY21kKTsK IAogCWZvciAoaSA9IDA7IGkgPCBBUlJBWV9TSVpFKGZvcm1hdHMpOyBpKyspIHsKIAkJaWYgKGZv cm1hdHNbaV0gPT0gbW9kZV9jbWQtPnBpeGVsX2Zvcm1hdCkKLS0gCmdpdC1zZXJpZXMgMC45LjEK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVs IG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs