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/drm_simple_kms_helper.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/drm_simple_kms_helper.c')
| -rw-r--r-- | drivers/gpu/drm/drm_simple_kms_helper.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_simple_kms_helper.c b/drivers/gpu/drm/drm_simple_kms_helper.c index 36633590ebf3..e9f782119d3d 100644 --- a/drivers/gpu/drm/drm_simple_kms_helper.c +++ b/drivers/gpu/drm/drm_simple_kms_helper.c @@ -12,7 +12,6 @@ #include <drm/drm_drv.h> #include <drm/drm_gem_atomic_helper.h> #include <drm/drm_managed.h> -#include <drm/drm_plane_helper.h> #include <drm/drm_probe_helper.h> #include <drm/drm_simple_kms_helper.h> @@ -223,8 +222,8 @@ static int drm_simple_kms_plane_atomic_check(struct drm_plane *plane, &pipe->crtc); ret = drm_atomic_helper_check_plane_state(plane_state, crtc_state, - DRM_PLANE_HELPER_NO_SCALING, - DRM_PLANE_HELPER_NO_SCALING, + DRM_PLANE_NO_SCALING, + DRM_PLANE_NO_SCALING, false, false); if (ret) return ret; |