anierin/display-drivers
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "disp: msm: initialize and register drm device after splash_config"

Browse Source
This commit is contained in:
qctecmdr
2023-07-13 04:07:50 -07:00
committed by Gerrit - the friendly Code Review server
parent e7b6529ec5 b56a9415bd
commit a94f99c621
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
msm/msm_drv.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2016-2021, The Linux Foundation. All rights reserved. * Copyright (c) 2016-2021, The Linux Foundation. All rights reserved.
* Copyright (C) 2013 Red Hat * Copyright (C) 2013 Red Hat
* Author: Rob Clark <robdclark@gmail.com> * Author: Rob Clark <robdclark@gmail.com>
@@ -977,11 +977,6 @@ static int msm_drm_component_init(struct device *dev)
drm_mode_config_reset(ddev); drm_mode_config_reset(ddev);
ret = drm_dev_register(ddev, 0);
if (ret)
goto fail;
priv->registered = true;
if (kms && kms->funcs && kms->funcs->cont_splash_config) { if (kms && kms->funcs && kms->funcs->cont_splash_config) {
ret = kms->funcs->cont_splash_config(kms, NULL); ret = kms->funcs->cont_splash_config(kms, NULL);
if (ret) { if (ret) {
@@ -990,6 +985,11 @@ static int msm_drm_component_init(struct device *dev)
} }
} }
ret = drm_dev_register(ddev, 0);
if (ret)
goto fail;
priv->registered = true;
#if IS_ENABLED(CONFIG_DRM_FBDEV_EMULATION) #if IS_ENABLED(CONFIG_DRM_FBDEV_EMULATION)
if (fbdev) if (fbdev)
priv->fbdev = msm_fbdev_init(ddev); priv->fbdev = msm_fbdev_init(ddev);