dri-devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Fritz Koenig <frkoenig@google.com>
To: dri-devel@lists.freedesktop.org
Cc: Fritz Koenig <frkoenig@google.com>, sean@poorly.run
Subject: [PATCH 5/5] drm/msm/dpu: Correct initialization of modifiers
Date: Tue, 11 Dec 2018 10:42:24 -0800	[thread overview]
Message-ID: <20181211184224.131478-5-frkoenig@google.com> (raw)
In-Reply-To: <20181211184224.131478-1-frkoenig@google.com>

allow_fb_modifiers needs to be set before drm_universal_plane_init
is called.

Signed-off-by: Fritz Koenig <frkoenig@google.com>
---
 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);
-- 
2.20.0.rc2.403.gdbc3b29805-goog

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  parent reply	other threads:[~2018-12-11 18:42 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-11 18:42 [PATCH 1/5] drm/msm/dpu: Remove unused format tables Fritz Koenig
2018-12-11 18:42 ` [PATCH 2/5] drm/msm/dpu: Use simple list for plane format init Fritz Koenig
2018-12-12 16:08   ` Sean Paul
2018-12-11 18:42 ` [PATCH 3/5] drm/msm/dpu: Plane helper for modifiers Fritz Koenig
2018-12-12 16:11   ` Sean Paul
2018-12-11 18:42 ` [PATCH 4/5] drm/msm/dpu: Initialize supported modifiers Fritz Koenig
2018-12-12 16:12   ` Sean Paul
2018-12-12 18:02     ` Fritz Koenig
2018-12-12 20:35       ` Sean Paul
2018-12-11 18:42 ` Fritz Koenig [this message]
2018-12-12 16:13   ` [PATCH 5/5] drm/msm/dpu: Correct initialization of modifiers Sean Paul
2018-12-12 16:05 ` [PATCH 1/5] drm/msm/dpu: Remove unused format tables Sean Paul

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181211184224.131478-5-frkoenig@google.com \
    --to=frkoenig@google.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=sean@poorly.run \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox