diff options
| author | Daniel Stone <daniels@collabora.com> | 2018-07-12 12:16:47 +0100 |
|---|---|---|
| committer | Derek Foreman <derekf@osg.samsung.com> | 2018-07-27 11:21:10 -0500 |
| commit | 48687982b55771b19b958e6a8d62794c61b2d797 (patch) | |
| tree | 08c566f45b04e12707c0729c32a5e41daf91ef89 | |
| parent | 117892259014d02e3ed41d241c6068d026f4c440 (diff) | |
| download | weston-48687982b55771b19b958e6a8d62794c61b2d797.tar.gz | |
compositor-drm: Remove addfb warning for user buffers
THe KMS AddFB call can fail for any reason at all: format/modifier not
suitable, stride not aligned, allocation not contiguous, etc. If this
happens with Weston's own buffers, the result is bad - no composition
output.
Failing AddFB from user-supplied buffers though, is not an error. The
user can't necessarily allocate suitable buffers, nor does it have to.
Don't spam the log with warnings when we fail on user buffers.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Reported-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Derek Foreman <derek.foreman.samsung@gmail.com>
| -rw-r--r-- | libweston/compositor-drm.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c index 704ac32c..70e966c9 100644 --- a/libweston/compositor-drm.c +++ b/libweston/compositor-drm.c @@ -1168,10 +1168,8 @@ drm_fb_get_from_dmabuf(struct linux_dmabuf_buffer *dmabuf, goto err_free; } - if (drm_fb_addfb(fb) != 0) { - weston_log("failed to create kms fb: %m\n"); + if (drm_fb_addfb(fb) != 0) goto err_free; - } return fb; @@ -1242,7 +1240,8 @@ drm_fb_get_from_bo(struct gbm_bo *bo, struct drm_backend *backend, } if (drm_fb_addfb(fb) != 0) { - weston_log("failed to create kms fb: %m\n"); + if (type == BUFFER_GBM_SURFACE) + weston_log("failed to create kms fb: %m\n"); goto err_free; } |