From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gerd Hoffmann Subject: [PATCH v3 2/5] drm: use drm_mode_legacy_fb_format2 in drm_gem_fbdev_fb_create Date: Wed, 19 Sep 2018 13:12:49 +0200 Message-ID: <20180919111252.7932-3-kraxel@redhat.com> References: <20180919111252.7932-1-kraxel@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6F91F883F4 for ; Wed, 19 Sep 2018 11:12:57 +0000 (UTC) In-Reply-To: <20180919111252.7932-1-kraxel@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: David Airlie , michel@daenzer.net, open list , Gerd Hoffmann , Sean Paul List-Id: dri-devel@lists.freedesktop.org Q3JlYXRpbmcgZnJhbWVidWZmZXJzIGZvciBmYmRldiBlbXVsYXRpb24gc2hvdWxkIHVzZSB0aGUg Y29ycmVjdCBmb3JtYXQKY29kZSB0b28sIHNvIHN3aXRjaCBkcm1fZ2VtX2ZiZGV2X2ZiX2NyZWF0 ZSgpIG92ZXIgdG8gdXNlIHRoZSBuZXcKZHJtX21vZGVfbGVnYWN5X2ZiX2Zvcm1hdDIoKSBmdW5j dGlvbi4KClNpZ25lZC1vZmYtYnk6IEdlcmQgSG9mZm1hbm4gPGtyYXhlbEByZWRoYXQuY29tPgot LS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fZ2VtX2ZyYW1lYnVmZmVyX2hlbHBlci5jIHwgNiArKysr LS0KIDEgZmlsZSBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9nZW1fZnJhbWVidWZmZXJfaGVscGVyLmMgYi9k cml2ZXJzL2dwdS9kcm0vZHJtX2dlbV9mcmFtZWJ1ZmZlcl9oZWxwZXIuYwppbmRleCA3NjA3Zjlj ZDZmLi4zNjE5ZjFjNzhhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2dlbV9mcmFt ZWJ1ZmZlcl9oZWxwZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2dlbV9mcmFtZWJ1ZmZl cl9oZWxwZXIuYwpAQCAtMzA4LDYgKzMwOCw3IEBAIGRybV9nZW1fZmJkZXZfZmJfY3JlYXRlKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQljb25zdCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyX2Z1 bmNzICpmdW5jcykKIHsKIAlzdHJ1Y3QgZHJtX21vZGVfZmJfY21kMiBtb2RlX2NtZCA9IHsgMCB9 OworCWJvb2wgbmF0aXZlID0gZGV2LT5tb2RlX2NvbmZpZy5xdWlya19hZGRmYl9wcmVmZXJfaG9z dF9ieXRlX29yZGVyOwogCiAJbW9kZV9jbWQud2lkdGggPSBzaXplcy0+c3VyZmFjZV93aWR0aDsK IAltb2RlX2NtZC5oZWlnaHQgPSBzaXplcy0+c3VyZmFjZV9oZWlnaHQ7CkBAIC0zMTYsOCArMzE3 LDkgQEAgZHJtX2dlbV9mYmRldl9mYl9jcmVhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlp ZiAocGl0Y2hfYWxpZ24pCiAJCW1vZGVfY21kLnBpdGNoZXNbMF0gPSByb3VuZHVwKG1vZGVfY21k LnBpdGNoZXNbMF0sCiAJCQkJCSAgICAgIHBpdGNoX2FsaWduKTsKLQltb2RlX2NtZC5waXhlbF9m b3JtYXQgPSBkcm1fbW9kZV9sZWdhY3lfZmJfZm9ybWF0KHNpemVzLT5zdXJmYWNlX2JwcCwKLQkJ CQkJCQlzaXplcy0+c3VyZmFjZV9kZXB0aCk7CisJbW9kZV9jbWQucGl4ZWxfZm9ybWF0ID0gZHJt X21vZGVfbGVnYWN5X2ZiX2Zvcm1hdDIoc2l6ZXMtPnN1cmZhY2VfYnBwLAorCQkJCQkJCSAgIHNp emVzLT5zdXJmYWNlX2RlcHRoLAorCQkJCQkJCSAgIG5hdGl2ZSk7CiAJaWYgKG9iai0+c2l6ZSA8 IG1vZGVfY21kLnBpdGNoZXNbMF0gKiBtb2RlX2NtZC5oZWlnaHQpCiAJCXJldHVybiBFUlJfUFRS KC1FSU5WQUwpOwogCi0tIAoyLjkuMwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vZHJpLWRldmVsCg== 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=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS 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 25E4DECE562 for ; Wed, 19 Sep 2018 11:13:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C088A2150B for ; Wed, 19 Sep 2018 11:12:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C088A2150B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731193AbeISQuV (ORCPT ); Wed, 19 Sep 2018 12:50:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55192 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727675AbeISQuV (ORCPT ); Wed, 19 Sep 2018 12:50:21 -0400 Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BE4743091D64; Wed, 19 Sep 2018 11:12:56 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-56.phx2.redhat.com [10.3.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0C02089F2A; Wed, 19 Sep 2018 11:12:54 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id A2BB09C40B; Wed, 19 Sep 2018 13:12:52 +0200 (CEST) From: Gerd Hoffmann To: dri-devel@lists.freedesktop.org Cc: michel@daenzer.net, imirkin@alum.mit.edu, Gerd Hoffmann , Gustavo Padovan , Maarten Lankhorst , Sean Paul , David Airlie , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v3 2/5] drm: use drm_mode_legacy_fb_format2 in drm_gem_fbdev_fb_create Date: Wed, 19 Sep 2018 13:12:49 +0200 Message-Id: <20180919111252.7932-3-kraxel@redhat.com> In-Reply-To: <20180919111252.7932-1-kraxel@redhat.com> References: <20180919111252.7932-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Wed, 19 Sep 2018 11:12:56 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Creating framebuffers for fbdev emulation should use the correct format code too, so switch drm_gem_fbdev_fb_create() over to use the new drm_mode_legacy_fb_format2() function. Signed-off-by: Gerd Hoffmann --- drivers/gpu/drm/drm_gem_framebuffer_helper.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_gem_framebuffer_helper.c b/drivers/gpu/drm/drm_gem_framebuffer_helper.c index 7607f9cd6f..3619f1c78a 100644 --- a/drivers/gpu/drm/drm_gem_framebuffer_helper.c +++ b/drivers/gpu/drm/drm_gem_framebuffer_helper.c @@ -308,6 +308,7 @@ drm_gem_fbdev_fb_create(struct drm_device *dev, const struct drm_framebuffer_funcs *funcs) { struct drm_mode_fb_cmd2 mode_cmd = { 0 }; + bool native = dev->mode_config.quirk_addfb_prefer_host_byte_order; mode_cmd.width = sizes->surface_width; mode_cmd.height = sizes->surface_height; @@ -316,8 +317,9 @@ drm_gem_fbdev_fb_create(struct drm_device *dev, if (pitch_align) mode_cmd.pitches[0] = roundup(mode_cmd.pitches[0], pitch_align); - mode_cmd.pixel_format = drm_mode_legacy_fb_format(sizes->surface_bpp, - sizes->surface_depth); + mode_cmd.pixel_format = drm_mode_legacy_fb_format2(sizes->surface_bpp, + sizes->surface_depth, + native); if (obj->size < mode_cmd.pitches[0] * mode_cmd.height) return ERR_PTR(-EINVAL); -- 2.9.3