diff options
| author | Rob Clark <robdclark@chromium.org> | 2023-12-10 10:07:54 -0800 |
|---|---|---|
| committer | Rob Clark <robdclark@chromium.org> | 2023-12-10 10:07:54 -0800 |
| commit | cbaf84e73811ed0ff7ff6d7f52b73fd7ed082d65 (patch) | |
| tree | 307e1e7bd42f3b451182f3a548f2169aef3c6ddf /drivers/gpu/drm/msm/msm_drv.c | |
| parent | a08935fc859b22884dcb6b5126d3a986467101ce (diff) | |
| parent | fca9448ae2f5ddebd841c727ee86136e1b5cbd86 (diff) | |
Merge remote-tracking branch 'drm-misc/drm-misc-next' into msm-next
Backmerge drm-misc-next to pick up some dependencies for drm/msm
patches, in particular:
https://patchwork.freedesktop.org/patch/570219/?series=127251&rev=1
https://patchwork.freedesktop.org/series/123411/
Signed-off-by: Rob Clark <robdclark@chromium.org>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_drv.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_drv.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 75d60aab5780..50b65ffc24b1 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -289,8 +289,6 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv) if (ret) goto err_msm_uninit; - drm_kms_helper_poll_init(ddev); - if (priv->kms_init) { drm_kms_helper_poll_init(ddev); msm_fbdev_setup(ddev); |