Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 918ce5b9 authored by Fritz Koenig's avatar Fritz Koenig Committed by Sean Paul
Browse files

drm/msm/dpu: Correct initialization of modifiers 



allow_fb_modifiers needs to be set before drm_universal_plane_init
is called.

Signed-off-by: default avatarFritz Koenig <frkoenig@google.com>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
parent 3ba25595

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c

+10 −10
Original line number Diff line number Diff line
@@ -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);