Commit fa0706e9 authored by Thomas Zimmermann's avatar Thomas Zimmermann

drm/plane-helper: Warn if atomic drivers call non-atomic helpers

The plane update and disable helpers are only useful for non-atomic
drivers. Print a warning if an atomic driver calls them.
Suggested-by: default avatarDaniel Vetter <daniel@ffwll.ch>
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220909105947.6487-4-tzimmermann@suse.de
parent e71def05
...@@ -30,8 +30,10 @@ ...@@ -30,8 +30,10 @@
#include <drm/drm_atomic_uapi.h> #include <drm/drm_atomic_uapi.h>
#include <drm/drm_crtc_helper.h> #include <drm/drm_crtc_helper.h>
#include <drm/drm_device.h> #include <drm/drm_device.h>
#include <drm/drm_drv.h>
#include <drm/drm_encoder.h> #include <drm/drm_encoder.h>
#include <drm/drm_plane_helper.h> #include <drm/drm_plane_helper.h>
#include <drm/drm_print.h>
#include <drm/drm_rect.h> #include <drm/drm_rect.h>
#define SUBPIXEL_MASK 0xffff #define SUBPIXEL_MASK 0xffff
...@@ -195,10 +197,14 @@ int drm_plane_helper_update_primary(struct drm_plane *plane, struct drm_crtc *cr ...@@ -195,10 +197,14 @@ int drm_plane_helper_update_primary(struct drm_plane *plane, struct drm_crtc *cr
.x2 = crtc_x + crtc_w, .x2 = crtc_x + crtc_w,
.y2 = crtc_y + crtc_h, .y2 = crtc_y + crtc_h,
}; };
struct drm_device *dev = plane->dev;
struct drm_connector **connector_list; struct drm_connector **connector_list;
int num_connectors, ret; int num_connectors, ret;
bool visible; bool visible;
if (drm_WARN_ON_ONCE(dev, drm_drv_uses_atomic_modeset(dev)))
return -EINVAL;
ret = drm_plane_helper_check_update(plane, crtc, fb, ret = drm_plane_helper_check_update(plane, crtc, fb,
&src, &dest, &src, &dest,
DRM_MODE_ROTATE_0, DRM_MODE_ROTATE_0,
...@@ -260,6 +266,10 @@ EXPORT_SYMBOL(drm_plane_helper_update_primary); ...@@ -260,6 +266,10 @@ EXPORT_SYMBOL(drm_plane_helper_update_primary);
int drm_plane_helper_disable_primary(struct drm_plane *plane, int drm_plane_helper_disable_primary(struct drm_plane *plane,
struct drm_modeset_acquire_ctx *ctx) struct drm_modeset_acquire_ctx *ctx)
{ {
struct drm_device *dev = plane->dev;
drm_WARN_ON_ONCE(dev, drm_drv_uses_atomic_modeset(dev));
return -EINVAL; return -EINVAL;
} }
EXPORT_SYMBOL(drm_plane_helper_disable_primary); EXPORT_SYMBOL(drm_plane_helper_disable_primary);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment