diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2022-09-12 11:11:02 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2022-09-12 11:14:20 +0300 |
| commit | 6f3562b3bca078b40aa198db8fdc68439b7b0399 (patch) | |
| tree | bca5b69f6318824e66f9f6aa9a7f1eea0f216be3 /drivers/gpu/drm/tilcdc/tilcdc_drv.c | |
| parent | 3fecf93c86087d1e1a9db28d3423db276639e776 (diff) | |
| parent | 89b03aeaef16f8ab48c10c399f97c836bdbae838 (diff) | |
| download | linux-6f3562b3bca078b40aa198db8fdc68439b7b0399.tar.gz linux-6f3562b3bca078b40aa198db8fdc68439b7b0399.tar.bz2 linux-6f3562b3bca078b40aa198db8fdc68439b7b0399.zip | |
Merge drm/drm-next into drm-intel-next
Backmerge to sync the DP MST atomic changes to drm-intel-next.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/tilcdc/tilcdc_drv.c')
| -rw-r--r-- | drivers/gpu/drm/tilcdc/tilcdc_drv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c index eee3c447fbac..f72755b8ea14 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c @@ -18,7 +18,7 @@ #include <drm/drm_drv.h> #include <drm/drm_fb_helper.h> #include <drm/drm_fourcc.h> -#include <drm/drm_gem_cma_helper.h> +#include <drm/drm_gem_dma_helper.h> #include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_mm.h> #include <drm/drm_probe_helper.h> @@ -476,11 +476,11 @@ static void tilcdc_debugfs_init(struct drm_minor *minor) } #endif -DEFINE_DRM_GEM_CMA_FOPS(fops); +DEFINE_DRM_GEM_DMA_FOPS(fops); static const struct drm_driver tilcdc_driver = { .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, - DRM_GEM_CMA_DRIVER_OPS, + DRM_GEM_DMA_DRIVER_OPS, #ifdef CONFIG_DEBUG_FS .debugfs_init = tilcdc_debugfs_init, #endif |