From patchwork Tue Dec 11 18:42:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fritz Koenig X-Patchwork-Id: 10724441 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3810E14E2 for ; Tue, 11 Dec 2018 18:42:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B8B12B60A for ; Tue, 11 Dec 2018 18:42:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1EEC82B630; Tue, 11 Dec 2018 18:42:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D7D592B60A for ; Tue, 11 Dec 2018 18:42:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D60156E3B0; Tue, 11 Dec 2018 18:42:53 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ot1-x34a.google.com (mail-ot1-x34a.google.com [IPv6:2607:f8b0:4864:20::34a]) by gabe.freedesktop.org (Postfix) with ESMTPS id A7B176E3B0 for ; Tue, 11 Dec 2018 18:42:52 +0000 (UTC) Received: by mail-ot1-x34a.google.com with SMTP id p4so6626301otl.10 for ; Tue, 11 Dec 2018 10:42:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=FPcWclm51nE7ucc2tSxu4oLH6UCrhRq2L1eeUcssu28=; b=E3UZJQk3m9AwPg/yzWFmMITkY3wpUDHyFV++UzK2mHggRHwxNInz3sK2KtYFJ1sKO8 WQyTLh+2PHs7IkLklvENhG16/tUjPOhhZEUIK1zMdWzyZOHdNAryOUXBeJC0HGvpt1S4 X7gzJh3hYCFnbREXp9thVDvmIotdI0gWS6qny5NFZyiZiXCcwmZbj69F33d3u+USVMpx rMRjE/veIsbgJQEQfO2LmGxN1xRgTILQPaQMJaKN9qci/BQPxNYh7uiQlAZ2cpcicIJL t2BJPOxTz8nTuB8YiDEhviMjjpm98nIQAP52MFrkImvRSeNEGM1RaqMFXPJMv03dlGyT E2kQ== X-Gm-Message-State: AA+aEWYBTRfnl0N7UFChUahxxPNcdfkL/0mvLSjt5n1hlLbUYXMqOCzP NvuNfDRo1kIC3hwM9CwhgZy1ZzCFFh6MATTOTo9GjUMSjnTeYuYbdMGMdQ16/Esqo7CUGb5J+d+ dgqN8cJLUNH2/WpGMY9lkAW5FpASdIamA3ndjAj3aysSDiCOcp+G76JBdgJDNSA4J3KApTNBydM vn8bY= X-Google-Smtp-Source: AFSGD/XgSY1N9Tt2/zFw4o/YancisxNhb0VXzQeIudrb6rQzvYnmGMtAtNyIJuo2pEhwIL8wwQ99rOejj2+dtg== X-Received: by 2002:a05:6830:1014:: with SMTP id a20mr13565001otp.43.1544553771821; Tue, 11 Dec 2018 10:42:51 -0800 (PST) Date: Tue, 11 Dec 2018 10:42:24 -0800 In-Reply-To: <20181211184224.131478-1-frkoenig@google.com> Message-Id: <20181211184224.131478-5-frkoenig@google.com> Mime-Version: 1.0 References: <20181211184224.131478-1-frkoenig@google.com> X-Mailer: git-send-email 2.20.0.rc2.403.gdbc3b29805-goog Subject: [PATCH 5/5] drm/msm/dpu: Correct initialization of modifiers From: Fritz Koenig To: dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fritz Koenig , sean@poorly.run Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP allow_fb_modifiers needs to be set before drm_universal_plane_init is called. Signed-off-by: Fritz Koenig Reviewed-by: Sean Paul --- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c index 4d67b3c96702..56555c3a750a 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -926,16 +926,6 @@ static int dpu_kms_hw_init(struct msm_kms *kms) goto hw_intr_init_err; } - /* - * _dpu_kms_drm_obj_init should create the DRM related objects - * i.e. CRTCs, planes, encoders, connectors and so forth - */ - rc = _dpu_kms_drm_obj_init(dpu_kms); - if (rc) { - DPU_ERROR("modeset init failed: %d\n", rc); - goto drm_obj_init_err; - } - dev->mode_config.min_width = 0; dev->mode_config.min_height = 0; @@ -952,6 +942,16 @@ static int dpu_kms_hw_init(struct msm_kms *kms) */ dev->mode_config.allow_fb_modifiers = true; + /* + * _dpu_kms_drm_obj_init should create the DRM related objects + * i.e. CRTCs, planes, encoders, connectors and so forth + */ + rc = _dpu_kms_drm_obj_init(dpu_kms); + if (rc) { + DPU_ERROR("modeset init failed: %d\n", rc); + goto drm_obj_init_err; + } + dpu_vbif_init_memtypes(dpu_kms); pm_runtime_put_sync(&dpu_kms->pdev->dev);