From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Date: Mon, 7 Feb 2022 16:01:37 +0000 (+0100)
Subject: Merge remote-tracking branch 'drm/drm-next' into drm-misc-next
X-Git-Tag: v5.18-rc1~134^2~14^2~94
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/542898c5aa5c6a3179dffb1d1606884a63f75fed

Merge remote-tracking branch 'drm/drm-next' into drm-misc-next

First backmerge into drm-misc-next. Required for more helpers backmerged,
and to pull in 5.17 (rc2).

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---

542898c5aa5c6a3179dffb1d1606884a63f75fed
diff --cc drivers/gpu/drm/msm/msm_drv.c
index 8f30e68ae3b5,555666e3f960..ff19c5a94d6f
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@@ -512,15 -507,11 +507,14 @@@ static int msm_init_vram(struct drm_dev
  static int msm_drm_init(struct device *dev, const struct drm_driver *drv)
  {
  	struct platform_device *pdev = to_platform_device(dev);
+ 	struct msm_drm_private *priv = dev_get_drvdata(dev);
  	struct drm_device *ddev;
- 	struct msm_drm_private *priv;
  	struct msm_kms *kms;
- 	struct msm_mdss *mdss;
  	int ret, i;
  
 +	if (drm_firmware_drivers_only())
 +		return -ENODEV;
 +
  	ddev = drm_dev_alloc(drv, dev);
  	if (IS_ERR(ddev)) {
  		DRM_DEV_ERROR(dev, "failed to allocate drm_device\n");