| Message ID | 1470750091-16627-12-git-send-email-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Aug 9, 2016 at 9:41 AM, Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > Also start with drm_modeset.h with the core bits, since we need > to untangle this mess somehow. That allows us to move the drm_modes.h > include to the right spot, except for the temporary connector status > enum. That will get fixed as soon as drm_connector.h exists. > > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > Documentation/gpu/drm-kms.rst | 9 + > drivers/gpu/drm/Makefile | 3 +- > drivers/gpu/drm/drm_crtc.c | 832 +----------------------------------- > drivers/gpu/drm/drm_crtc_internal.h | 40 +- > drivers/gpu/drm/drm_framebuffer.c | 827 +++++++++++++++++++++++++++++++++++ > include/drm/drm_crtc.h | 162 +------ > include/drm/drm_framebuffer.h | 170 ++++++++ > include/drm/drm_modes.h | 2 + > include/drm/drm_modeset.h | 50 +++ > 9 files changed, 1106 insertions(+), 989 deletions(-) > create mode 100644 drivers/gpu/drm/drm_framebuffer.c > create mode 100644 include/drm/drm_framebuffer.h > create mode 100644 include/drm/drm_modeset.h > > diff --git a/Documentation/gpu/drm-kms.rst b/Documentation/gpu/drm-kms.rst > index 3ae4c12aca08..8264a88a8695 100644 > --- a/Documentation/gpu/drm-kms.rst > +++ b/Documentation/gpu/drm-kms.rst > @@ -64,6 +64,15 @@ fbdev framebuffer when the struct :c:type:`struct drm_framebuffer > drivers can manually clean up a framebuffer at module unload time with > :c:func:`drm_framebuffer_unregister_private()`. > > +Frame Buffer Functions Reference > +-------------------------------- > + > +.. kernel-doc:: drivers/gpu/drm/drm_framebuffer.c > + :export: > + > +.. kernel-doc:: include/drm/drm_framebuffer.h > + :internal: > + > DRM Format Handling > =================== > > diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile > index a5824d926dc9..c71ec42ce511 100644 > --- a/drivers/gpu/drm/Makefile > +++ b/drivers/gpu/drm/Makefile > @@ -12,7 +12,8 @@ drm-y := drm_auth.o drm_bufs.o drm_cache.o \ > drm_info.o drm_debugfs.o drm_encoder_slave.o \ > drm_trace_points.o drm_global.o drm_prime.o \ > drm_rect.o drm_vma_manager.o drm_flip_work.o \ > - drm_modeset_lock.o drm_atomic.o drm_bridge.o > + drm_modeset_lock.o drm_atomic.o drm_bridge.o \ > + drm_framebuffer.o > > drm-$(CONFIG_COMPAT) += drm_ioc32.o > drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o > diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c > index deed2e2c8cf1..a3c60f2caa88 100644 > --- a/drivers/gpu/drm/drm_crtc.c > +++ b/drivers/gpu/drm/drm_crtc.c > @@ -40,15 +40,11 @@ > #include <drm/drm_modeset_lock.h> > #include <drm/drm_atomic.h> > #include <drm/drm_auth.h> > +#include <drm/drm_framebuffer.h> > > #include "drm_crtc_internal.h" > #include "drm_internal.h" > > -static struct drm_framebuffer * > -internal_framebuffer_create(struct drm_device *dev, > - const struct drm_mode_fb_cmd2 *r, > - struct drm_file *file_priv); > - > /* Avoid boilerplate. I'm tired of typing. */ > #define DRM_ENUM_NAME_FN(fnname, list) \ > const char *fnname(int val) \ > @@ -238,11 +234,11 @@ EXPORT_SYMBOL(drm_get_subpixel_order_name); > * Internal function to assign a slot in the object idr and optionally > * register the object into the idr. > */ > -static int drm_mode_object_get_reg(struct drm_device *dev, > - struct drm_mode_object *obj, > - uint32_t obj_type, > - bool register_obj, > - void (*obj_free_cb)(struct kref *kref)) > +int drm_mode_object_get_reg(struct drm_device *dev, > + struct drm_mode_object *obj, > + uint32_t obj_type, > + bool register_obj, > + void (*obj_free_cb)(struct kref *kref)) > { > int ret; > > @@ -285,8 +281,8 @@ int drm_mode_object_get(struct drm_device *dev, > return drm_mode_object_get_reg(dev, obj, obj_type, true, NULL); > } > > -static void drm_mode_object_register(struct drm_device *dev, > - struct drm_mode_object *obj) > +void drm_mode_object_register(struct drm_device *dev, > + struct drm_mode_object *obj) > { > mutex_lock(&dev->mode_config.idr_mutex); > idr_replace(&dev->mode_config.crtc_idr, obj, obj->id); > @@ -315,8 +311,8 @@ void drm_mode_object_unregister(struct drm_device *dev, > mutex_unlock(&dev->mode_config.idr_mutex); > } > > -static struct drm_mode_object *_object_find(struct drm_device *dev, > - uint32_t id, uint32_t type) > +struct drm_mode_object *__drm_mode_object_find(struct drm_device *dev, > + uint32_t id, uint32_t type) > { > struct drm_mode_object *obj = NULL; > > @@ -351,7 +347,7 @@ struct drm_mode_object *drm_mode_object_find(struct drm_device *dev, > { > struct drm_mode_object *obj = NULL; > > - obj = _object_find(dev, id, type); > + obj = __drm_mode_object_find(dev, id, type); > return obj; > } > EXPORT_SYMBOL(drm_mode_object_find); > @@ -407,233 +403,6 @@ int drm_crtc_force_disable(struct drm_crtc *crtc) > } > EXPORT_SYMBOL(drm_crtc_force_disable); > > -/** > - * drm_crtc_force_disable_all - Forcibly turn off all enabled CRTCs > - * @dev: DRM device whose CRTCs to turn off > - * > - * Drivers may want to call this on unload to ensure that all displays are > - * unlit and the GPU is in a consistent, low power state. Takes modeset locks. > - * > - * Returns: > - * Zero on success, error code on failure. > - */ > -int drm_crtc_force_disable_all(struct drm_device *dev) > -{ > - struct drm_crtc *crtc; > - int ret = 0; > - > - drm_modeset_lock_all(dev); > - drm_for_each_crtc(crtc, dev) > - if (crtc->enabled) { > - ret = drm_crtc_force_disable(crtc); > - if (ret) > - goto out; > - } > -out: > - drm_modeset_unlock_all(dev); > - return ret; > -} > -EXPORT_SYMBOL(drm_crtc_force_disable_all); I'm not so sure about moving this one. If it's going to be declared in drm_crtc.h, it should stay here (with force_disable). Alternatively, assuming no one else is using this (didn't check), move it to drm_framebuffer and make it a static helper function there (removing the declaration from drm_crtc.h). Sean > - > -static void drm_framebuffer_free(struct kref *kref) > -{ > - struct drm_framebuffer *fb = > - container_of(kref, struct drm_framebuffer, base.refcount); > - struct drm_device *dev = fb->dev; > - > - /* > - * The lookup idr holds a weak reference, which has not necessarily been > - * removed at this point. Check for that. > - */ > - drm_mode_object_unregister(dev, &fb->base); > - > - fb->funcs->destroy(fb); > -} > - > -/** > - * drm_framebuffer_init - initialize a framebuffer > - * @dev: DRM device > - * @fb: framebuffer to be initialized > - * @funcs: ... with these functions > - * > - * Allocates an ID for the framebuffer's parent mode object, sets its mode > - * functions & device file and adds it to the master fd list. > - * > - * IMPORTANT: > - * This functions publishes the fb and makes it available for concurrent access > - * by other users. Which means by this point the fb _must_ be fully set up - > - * since all the fb attributes are invariant over its lifetime, no further > - * locking but only correct reference counting is required. > - * > - * Returns: > - * Zero on success, error code on failure. > - */ > -int drm_framebuffer_init(struct drm_device *dev, struct drm_framebuffer *fb, > - const struct drm_framebuffer_funcs *funcs) > -{ > - int ret; > - > - INIT_LIST_HEAD(&fb->filp_head); > - fb->dev = dev; > - fb->funcs = funcs; > - > - ret = drm_mode_object_get_reg(dev, &fb->base, DRM_MODE_OBJECT_FB, > - false, drm_framebuffer_free); > - if (ret) > - goto out; > - > - mutex_lock(&dev->mode_config.fb_lock); > - dev->mode_config.num_fb++; > - list_add(&fb->head, &dev->mode_config.fb_list); > - mutex_unlock(&dev->mode_config.fb_lock); > - > - drm_mode_object_register(dev, &fb->base); > -out: > - return ret; > -} > -EXPORT_SYMBOL(drm_framebuffer_init); > - > -/** > - * drm_framebuffer_lookup - look up a drm framebuffer and grab a reference > - * @dev: drm device > - * @id: id of the fb object > - * > - * If successful, this grabs an additional reference to the framebuffer - > - * callers need to make sure to eventually unreference the returned framebuffer > - * again, using @drm_framebuffer_unreference. > - */ > -struct drm_framebuffer *drm_framebuffer_lookup(struct drm_device *dev, > - uint32_t id) > -{ > - struct drm_mode_object *obj; > - struct drm_framebuffer *fb = NULL; > - > - obj = _object_find(dev, id, DRM_MODE_OBJECT_FB); > - if (obj) > - fb = obj_to_fb(obj); > - return fb; > -} > -EXPORT_SYMBOL(drm_framebuffer_lookup); > - > -/** > - * drm_framebuffer_unregister_private - unregister a private fb from the lookup idr > - * @fb: fb to unregister > - * > - * Drivers need to call this when cleaning up driver-private framebuffers, e.g. > - * those used for fbdev. Note that the caller must hold a reference of it's own, > - * i.e. the object may not be destroyed through this call (since it'll lead to a > - * locking inversion). > - */ > -void drm_framebuffer_unregister_private(struct drm_framebuffer *fb) > -{ > - struct drm_device *dev; > - > - if (!fb) > - return; > - > - dev = fb->dev; > - > - /* Mark fb as reaped and drop idr ref. */ > - drm_mode_object_unregister(dev, &fb->base); > -} > -EXPORT_SYMBOL(drm_framebuffer_unregister_private); > - > -/** > - * drm_framebuffer_cleanup - remove a framebuffer object > - * @fb: framebuffer to remove > - * > - * Cleanup framebuffer. This function is intended to be used from the drivers > - * ->destroy callback. It can also be used to clean up driver private > - * framebuffers embedded into a larger structure. > - * > - * Note that this function does not remove the fb from active usuage - if it is > - * still used anywhere, hilarity can ensue since userspace could call getfb on > - * the id and get back -EINVAL. Obviously no concern at driver unload time. > - * > - * Also, the framebuffer will not be removed from the lookup idr - for > - * user-created framebuffers this will happen in in the rmfb ioctl. For > - * driver-private objects (e.g. for fbdev) drivers need to explicitly call > - * drm_framebuffer_unregister_private. > - */ > -void drm_framebuffer_cleanup(struct drm_framebuffer *fb) > -{ > - struct drm_device *dev = fb->dev; > - > - mutex_lock(&dev->mode_config.fb_lock); > - list_del(&fb->head); > - dev->mode_config.num_fb--; > - mutex_unlock(&dev->mode_config.fb_lock); > -} > -EXPORT_SYMBOL(drm_framebuffer_cleanup); > - > -/** > - * drm_framebuffer_remove - remove and unreference a framebuffer object > - * @fb: framebuffer to remove > - * > - * Scans all the CRTCs and planes in @dev's mode_config. If they're > - * using @fb, removes it, setting it to NULL. Then drops the reference to the > - * passed-in framebuffer. Might take the modeset locks. > - * > - * Note that this function optimizes the cleanup away if the caller holds the > - * last reference to the framebuffer. It is also guaranteed to not take the > - * modeset locks in this case. > - */ > -void drm_framebuffer_remove(struct drm_framebuffer *fb) > -{ > - struct drm_device *dev; > - struct drm_crtc *crtc; > - struct drm_plane *plane; > - > - if (!fb) > - return; > - > - dev = fb->dev; > - > - WARN_ON(!list_empty(&fb->filp_head)); > - > - /* > - * drm ABI mandates that we remove any deleted framebuffers from active > - * useage. But since most sane clients only remove framebuffers they no > - * longer need, try to optimize this away. > - * > - * Since we're holding a reference ourselves, observing a refcount of 1 > - * means that we're the last holder and can skip it. Also, the refcount > - * can never increase from 1 again, so we don't need any barriers or > - * locks. > - * > - * Note that userspace could try to race with use and instate a new > - * usage _after_ we've cleared all current ones. End result will be an > - * in-use fb with fb-id == 0. Userspace is allowed to shoot its own foot > - * in this manner. > - */ > - if (drm_framebuffer_read_refcount(fb) > 1) { > - if (dev->mode_config.funcs->atomic_commit) { > - drm_atomic_remove_fb(fb); > - goto out; > - } > - > - drm_modeset_lock_all(dev); > - /* remove from any CRTC */ > - drm_for_each_crtc(crtc, dev) { > - if (crtc->primary->fb == fb) { > - /* should turn off the crtc */ > - if (drm_crtc_force_disable(crtc)) > - DRM_ERROR("failed to reset crtc %p when fb was deleted\n", crtc); > - } > - } > - > - drm_for_each_plane(plane, dev) { > - if (plane->fb == fb) > - drm_plane_force_disable(plane); > - } > - drm_modeset_unlock_all(dev); > - } > - > -out: > - drm_framebuffer_unreference(fb); > -} > -EXPORT_SYMBOL(drm_framebuffer_remove); > - > DEFINE_WW_CLASS(crtc_ww_class); > > static unsigned int drm_num_crtcs(struct drm_device *dev) > @@ -3010,7 +2779,7 @@ static int drm_mode_cursor_universal(struct drm_crtc *crtc, > */ > if (req->flags & DRM_MODE_CURSOR_BO) { > if (req->handle) { > - fb = internal_framebuffer_create(dev, &fbreq, file_priv); > + fb = drm_internal_framebuffer_create(dev, &fbreq, file_priv); > if (IS_ERR(fb)) { > DRM_DEBUG_KMS("failed to wrap cursor buffer in drm framebuffer\n"); > return PTR_ERR(fb); > @@ -3208,578 +2977,6 @@ uint32_t drm_mode_legacy_fb_format(uint32_t bpp, uint32_t depth) > } > EXPORT_SYMBOL(drm_mode_legacy_fb_format); > > -/** > - * drm_mode_addfb - add an FB to the graphics configuration > - * @dev: drm device for the ioctl > - * @data: data pointer for the ioctl > - * @file_priv: drm file for the ioctl call > - * > - * Add a new FB to the specified CRTC, given a user request. This is the > - * original addfb ioctl which only supported RGB formats. > - * > - * Called by the user via ioctl. > - * > - * Returns: > - * Zero on success, negative errno on failure. > - */ > -int drm_mode_addfb(struct drm_device *dev, > - void *data, struct drm_file *file_priv) > -{ > - struct drm_mode_fb_cmd *or = data; > - struct drm_mode_fb_cmd2 r = {}; > - int ret; > - > - /* convert to new format and call new ioctl */ > - r.fb_id = or->fb_id; > - r.width = or->width; > - r.height = or->height; > - r.pitches[0] = or->pitch; > - r.pixel_format = drm_mode_legacy_fb_format(or->bpp, or->depth); > - r.handles[0] = or->handle; > - > - ret = drm_mode_addfb2(dev, &r, file_priv); > - if (ret) > - return ret; > - > - or->fb_id = r.fb_id; > - > - return 0; > -} > - > -static int format_check(const struct drm_mode_fb_cmd2 *r) > -{ > - uint32_t format = r->pixel_format & ~DRM_FORMAT_BIG_ENDIAN; > - > - switch (format) { > - case DRM_FORMAT_C8: > - case DRM_FORMAT_RGB332: > - case DRM_FORMAT_BGR233: > - case DRM_FORMAT_XRGB4444: > - case DRM_FORMAT_XBGR4444: > - case DRM_FORMAT_RGBX4444: > - case DRM_FORMAT_BGRX4444: > - case DRM_FORMAT_ARGB4444: > - case DRM_FORMAT_ABGR4444: > - case DRM_FORMAT_RGBA4444: > - case DRM_FORMAT_BGRA4444: > - case DRM_FORMAT_XRGB1555: > - case DRM_FORMAT_XBGR1555: > - case DRM_FORMAT_RGBX5551: > - case DRM_FORMAT_BGRX5551: > - case DRM_FORMAT_ARGB1555: > - case DRM_FORMAT_ABGR1555: > - case DRM_FORMAT_RGBA5551: > - case DRM_FORMAT_BGRA5551: > - case DRM_FORMAT_RGB565: > - case DRM_FORMAT_BGR565: > - case DRM_FORMAT_RGB888: > - case DRM_FORMAT_BGR888: > - case DRM_FORMAT_XRGB8888: > - case DRM_FORMAT_XBGR8888: > - case DRM_FORMAT_RGBX8888: > - case DRM_FORMAT_BGRX8888: > - case DRM_FORMAT_ARGB8888: > - case DRM_FORMAT_ABGR8888: > - case DRM_FORMAT_RGBA8888: > - case DRM_FORMAT_BGRA8888: > - case DRM_FORMAT_XRGB2101010: > - case DRM_FORMAT_XBGR2101010: > - case DRM_FORMAT_RGBX1010102: > - case DRM_FORMAT_BGRX1010102: > - case DRM_FORMAT_ARGB2101010: > - case DRM_FORMAT_ABGR2101010: > - case DRM_FORMAT_RGBA1010102: > - case DRM_FORMAT_BGRA1010102: > - case DRM_FORMAT_YUYV: > - case DRM_FORMAT_YVYU: > - case DRM_FORMAT_UYVY: > - case DRM_FORMAT_VYUY: > - case DRM_FORMAT_AYUV: > - case DRM_FORMAT_NV12: > - case DRM_FORMAT_NV21: > - case DRM_FORMAT_NV16: > - case DRM_FORMAT_NV61: > - case DRM_FORMAT_NV24: > - case DRM_FORMAT_NV42: > - case DRM_FORMAT_YUV410: > - case DRM_FORMAT_YVU410: > - case DRM_FORMAT_YUV411: > - case DRM_FORMAT_YVU411: > - case DRM_FORMAT_YUV420: > - case DRM_FORMAT_YVU420: > - case DRM_FORMAT_YUV422: > - case DRM_FORMAT_YVU422: > - case DRM_FORMAT_YUV444: > - case DRM_FORMAT_YVU444: > - return 0; > - default: > - DRM_DEBUG_KMS("invalid pixel format %s\n", > - drm_get_format_name(r->pixel_format)); > - return -EINVAL; > - } > -} > - > -static int framebuffer_check(const struct drm_mode_fb_cmd2 *r) > -{ > - int ret, hsub, vsub, num_planes, i; > - > - ret = format_check(r); > - if (ret) { > - DRM_DEBUG_KMS("bad framebuffer format %s\n", > - drm_get_format_name(r->pixel_format)); > - return ret; > - } > - > - hsub = drm_format_horz_chroma_subsampling(r->pixel_format); > - vsub = drm_format_vert_chroma_subsampling(r->pixel_format); > - num_planes = drm_format_num_planes(r->pixel_format); > - > - if (r->width == 0 || r->width % hsub) { > - DRM_DEBUG_KMS("bad framebuffer width %u\n", r->width); > - return -EINVAL; > - } > - > - if (r->height == 0 || r->height % vsub) { > - DRM_DEBUG_KMS("bad framebuffer height %u\n", r->height); > - return -EINVAL; > - } > - > - for (i = 0; i < num_planes; i++) { > - unsigned int width = r->width / (i != 0 ? hsub : 1); > - unsigned int height = r->height / (i != 0 ? vsub : 1); > - unsigned int cpp = drm_format_plane_cpp(r->pixel_format, i); > - > - if (!r->handles[i]) { > - DRM_DEBUG_KMS("no buffer object handle for plane %d\n", i); > - return -EINVAL; > - } > - > - if ((uint64_t) width * cpp > UINT_MAX) > - return -ERANGE; > - > - if ((uint64_t) height * r->pitches[i] + r->offsets[i] > UINT_MAX) > - return -ERANGE; > - > - if (r->pitches[i] < width * cpp) { > - DRM_DEBUG_KMS("bad pitch %u for plane %d\n", r->pitches[i], i); > - return -EINVAL; > - } > - > - if (r->modifier[i] && !(r->flags & DRM_MODE_FB_MODIFIERS)) { > - DRM_DEBUG_KMS("bad fb modifier %llu for plane %d\n", > - r->modifier[i], i); > - return -EINVAL; > - } > - > - /* modifier specific checks: */ > - switch (r->modifier[i]) { > - case DRM_FORMAT_MOD_SAMSUNG_64_32_TILE: > - /* NOTE: the pitch restriction may be lifted later if it turns > - * out that no hw has this restriction: > - */ > - if (r->pixel_format != DRM_FORMAT_NV12 || > - width % 128 || height % 32 || > - r->pitches[i] % 128) { > - DRM_DEBUG_KMS("bad modifier data for plane %d\n", i); > - return -EINVAL; > - } > - break; > - > - default: > - break; > - } > - } > - > - for (i = num_planes; i < 4; i++) { > - if (r->modifier[i]) { > - DRM_DEBUG_KMS("non-zero modifier for unused plane %d\n", i); > - return -EINVAL; > - } > - > - /* Pre-FB_MODIFIERS userspace didn't clear the structs properly. */ > - if (!(r->flags & DRM_MODE_FB_MODIFIERS)) > - continue; > - > - if (r->handles[i]) { > - DRM_DEBUG_KMS("buffer object handle for unused plane %d\n", i); > - return -EINVAL; > - } > - > - if (r->pitches[i]) { > - DRM_DEBUG_KMS("non-zero pitch for unused plane %d\n", i); > - return -EINVAL; > - } > - > - if (r->offsets[i]) { > - DRM_DEBUG_KMS("non-zero offset for unused plane %d\n", i); > - return -EINVAL; > - } > - } > - > - return 0; > -} > - > -static struct drm_framebuffer * > -internal_framebuffer_create(struct drm_device *dev, > - const struct drm_mode_fb_cmd2 *r, > - struct drm_file *file_priv) > -{ > - struct drm_mode_config *config = &dev->mode_config; > - struct drm_framebuffer *fb; > - int ret; > - > - if (r->flags & ~(DRM_MODE_FB_INTERLACED | DRM_MODE_FB_MODIFIERS)) { > - DRM_DEBUG_KMS("bad framebuffer flags 0x%08x\n", r->flags); > - return ERR_PTR(-EINVAL); > - } > - > - if ((config->min_width > r->width) || (r->width > config->max_width)) { > - DRM_DEBUG_KMS("bad framebuffer width %d, should be >= %d && <= %d\n", > - r->width, config->min_width, config->max_width); > - return ERR_PTR(-EINVAL); > - } > - if ((config->min_height > r->height) || (r->height > config->max_height)) { > - DRM_DEBUG_KMS("bad framebuffer height %d, should be >= %d && <= %d\n", > - r->height, config->min_height, config->max_height); > - return ERR_PTR(-EINVAL); > - } > - > - if (r->flags & DRM_MODE_FB_MODIFIERS && > - !dev->mode_config.allow_fb_modifiers) { > - DRM_DEBUG_KMS("driver does not support fb modifiers\n"); > - return ERR_PTR(-EINVAL); > - } > - > - ret = framebuffer_check(r); > - if (ret) > - return ERR_PTR(ret); > - > - fb = dev->mode_config.funcs->fb_create(dev, file_priv, r); > - if (IS_ERR(fb)) { > - DRM_DEBUG_KMS("could not create framebuffer\n"); > - return fb; > - } > - > - return fb; > -} > - > -/** > - * drm_mode_addfb2 - add an FB to the graphics configuration > - * @dev: drm device for the ioctl > - * @data: data pointer for the ioctl > - * @file_priv: drm file for the ioctl call > - * > - * Add a new FB to the specified CRTC, given a user request with format. This is > - * the 2nd version of the addfb ioctl, which supports multi-planar framebuffers > - * and uses fourcc codes as pixel format specifiers. > - * > - * Called by the user via ioctl. > - * > - * Returns: > - * Zero on success, negative errno on failure. > - */ > -int drm_mode_addfb2(struct drm_device *dev, > - void *data, struct drm_file *file_priv) > -{ > - struct drm_mode_fb_cmd2 *r = data; > - struct drm_framebuffer *fb; > - > - if (!drm_core_check_feature(dev, DRIVER_MODESET)) > - return -EINVAL; > - > - fb = internal_framebuffer_create(dev, r, file_priv); > - if (IS_ERR(fb)) > - return PTR_ERR(fb); > - > - DRM_DEBUG_KMS("[FB:%d]\n", fb->base.id); > - r->fb_id = fb->base.id; > - > - /* Transfer ownership to the filp for reaping on close */ > - mutex_lock(&file_priv->fbs_lock); > - list_add(&fb->filp_head, &file_priv->fbs); > - mutex_unlock(&file_priv->fbs_lock); > - > - return 0; > -} > - > -struct drm_mode_rmfb_work { > - struct work_struct work; > - struct list_head fbs; > -}; > - > -static void drm_mode_rmfb_work_fn(struct work_struct *w) > -{ > - struct drm_mode_rmfb_work *arg = container_of(w, typeof(*arg), work); > - > - while (!list_empty(&arg->fbs)) { > - struct drm_framebuffer *fb = > - list_first_entry(&arg->fbs, typeof(*fb), filp_head); > - > - list_del_init(&fb->filp_head); > - drm_framebuffer_remove(fb); > - } > -} > - > -/** > - * drm_mode_rmfb - remove an FB from the configuration > - * @dev: drm device for the ioctl > - * @data: data pointer for the ioctl > - * @file_priv: drm file for the ioctl call > - * > - * Remove the FB specified by the user. > - * > - * Called by the user via ioctl. > - * > - * Returns: > - * Zero on success, negative errno on failure. > - */ > -int drm_mode_rmfb(struct drm_device *dev, > - void *data, struct drm_file *file_priv) > -{ > - struct drm_framebuffer *fb = NULL; > - struct drm_framebuffer *fbl = NULL; > - uint32_t *id = data; > - int found = 0; > - > - if (!drm_core_check_feature(dev, DRIVER_MODESET)) > - return -EINVAL; > - > - fb = drm_framebuffer_lookup(dev, *id); > - if (!fb) > - return -ENOENT; > - > - mutex_lock(&file_priv->fbs_lock); > - list_for_each_entry(fbl, &file_priv->fbs, filp_head) > - if (fb == fbl) > - found = 1; > - if (!found) { > - mutex_unlock(&file_priv->fbs_lock); > - goto fail_unref; > - } > - > - list_del_init(&fb->filp_head); > - mutex_unlock(&file_priv->fbs_lock); > - > - /* drop the reference we picked up in framebuffer lookup */ > - drm_framebuffer_unreference(fb); > - > - /* > - * we now own the reference that was stored in the fbs list > - * > - * drm_framebuffer_remove may fail with -EINTR on pending signals, > - * so run this in a separate stack as there's no way to correctly > - * handle this after the fb is already removed from the lookup table. > - */ > - if (drm_framebuffer_read_refcount(fb) > 1) { > - struct drm_mode_rmfb_work arg; > - > - INIT_WORK_ONSTACK(&arg.work, drm_mode_rmfb_work_fn); > - INIT_LIST_HEAD(&arg.fbs); > - list_add_tail(&fb->filp_head, &arg.fbs); > - > - schedule_work(&arg.work); > - flush_work(&arg.work); > - destroy_work_on_stack(&arg.work); > - } else > - drm_framebuffer_unreference(fb); > - > - return 0; > - > -fail_unref: > - drm_framebuffer_unreference(fb); > - return -ENOENT; > -} > - > -/** > - * drm_mode_getfb - get FB info > - * @dev: drm device for the ioctl > - * @data: data pointer for the ioctl > - * @file_priv: drm file for the ioctl call > - * > - * Lookup the FB given its ID and return info about it. > - * > - * Called by the user via ioctl. > - * > - * Returns: > - * Zero on success, negative errno on failure. > - */ > -int drm_mode_getfb(struct drm_device *dev, > - void *data, struct drm_file *file_priv) > -{ > - struct drm_mode_fb_cmd *r = data; > - struct drm_framebuffer *fb; > - int ret; > - > - if (!drm_core_check_feature(dev, DRIVER_MODESET)) > - return -EINVAL; > - > - fb = drm_framebuffer_lookup(dev, r->fb_id); > - if (!fb) > - return -ENOENT; > - > - r->height = fb->height; > - r->width = fb->width; > - r->depth = fb->depth; > - r->bpp = fb->bits_per_pixel; > - r->pitch = fb->pitches[0]; > - if (fb->funcs->create_handle) { > - if (drm_is_current_master(file_priv) || capable(CAP_SYS_ADMIN) || > - drm_is_control_client(file_priv)) { > - ret = fb->funcs->create_handle(fb, file_priv, > - &r->handle); > - } else { > - /* GET_FB() is an unprivileged ioctl so we must not > - * return a buffer-handle to non-master processes! For > - * backwards-compatibility reasons, we cannot make > - * GET_FB() privileged, so just return an invalid handle > - * for non-masters. */ > - r->handle = 0; > - ret = 0; > - } > - } else { > - ret = -ENODEV; > - } > - > - drm_framebuffer_unreference(fb); > - > - return ret; > -} > - > -/** > - * drm_mode_dirtyfb_ioctl - flush frontbuffer rendering on an FB > - * @dev: drm device for the ioctl > - * @data: data pointer for the ioctl > - * @file_priv: drm file for the ioctl call > - * > - * Lookup the FB and flush out the damaged area supplied by userspace as a clip > - * rectangle list. Generic userspace which does frontbuffer rendering must call > - * this ioctl to flush out the changes on manual-update display outputs, e.g. > - * usb display-link, mipi manual update panels or edp panel self refresh modes. > - * > - * Modesetting drivers which always update the frontbuffer do not need to > - * implement the corresponding ->dirty framebuffer callback. > - * > - * Called by the user via ioctl. > - * > - * Returns: > - * Zero on success, negative errno on failure. > - */ > -int drm_mode_dirtyfb_ioctl(struct drm_device *dev, > - void *data, struct drm_file *file_priv) > -{ > - struct drm_clip_rect __user *clips_ptr; > - struct drm_clip_rect *clips = NULL; > - struct drm_mode_fb_dirty_cmd *r = data; > - struct drm_framebuffer *fb; > - unsigned flags; > - int num_clips; > - int ret; > - > - if (!drm_core_check_feature(dev, DRIVER_MODESET)) > - return -EINVAL; > - > - fb = drm_framebuffer_lookup(dev, r->fb_id); > - if (!fb) > - return -ENOENT; > - > - num_clips = r->num_clips; > - clips_ptr = (struct drm_clip_rect __user *)(unsigned long)r->clips_ptr; > - > - if (!num_clips != !clips_ptr) { > - ret = -EINVAL; > - goto out_err1; > - } > - > - flags = DRM_MODE_FB_DIRTY_FLAGS & r->flags; > - > - /* If userspace annotates copy, clips must come in pairs */ > - if (flags & DRM_MODE_FB_DIRTY_ANNOTATE_COPY && (num_clips % 2)) { > - ret = -EINVAL; > - goto out_err1; > - } > - > - if (num_clips && clips_ptr) { > - if (num_clips < 0 || num_clips > DRM_MODE_FB_DIRTY_MAX_CLIPS) { > - ret = -EINVAL; > - goto out_err1; > - } > - clips = kcalloc(num_clips, sizeof(*clips), GFP_KERNEL); > - if (!clips) { > - ret = -ENOMEM; > - goto out_err1; > - } > - > - ret = copy_from_user(clips, clips_ptr, > - num_clips * sizeof(*clips)); > - if (ret) { > - ret = -EFAULT; > - goto out_err2; > - } > - } > - > - if (fb->funcs->dirty) { > - ret = fb->funcs->dirty(fb, file_priv, flags, r->color, > - clips, num_clips); > - } else { > - ret = -ENOSYS; > - } > - > -out_err2: > - kfree(clips); > -out_err1: > - drm_framebuffer_unreference(fb); > - > - return ret; > -} > - > -/** > - * drm_fb_release - remove and free the FBs on this file > - * @priv: drm file for the ioctl > - * > - * Destroy all the FBs associated with @filp. > - * > - * Called by the user via ioctl. > - * > - * Returns: > - * Zero on success, negative errno on failure. > - */ > -void drm_fb_release(struct drm_file *priv) > -{ > - struct drm_framebuffer *fb, *tfb; > - struct drm_mode_rmfb_work arg; > - > - INIT_LIST_HEAD(&arg.fbs); > - > - /* > - * When the file gets released that means no one else can access the fb > - * list any more, so no need to grab fpriv->fbs_lock. And we need to > - * avoid upsetting lockdep since the universal cursor code adds a > - * framebuffer while holding mutex locks. > - * > - * Note that a real deadlock between fpriv->fbs_lock and the modeset > - * locks is impossible here since no one else but this function can get > - * at it any more. > - */ > - list_for_each_entry_safe(fb, tfb, &priv->fbs, filp_head) { > - if (drm_framebuffer_read_refcount(fb) > 1) { > - list_move_tail(&fb->filp_head, &arg.fbs); > - } else { > - list_del_init(&fb->filp_head); > - > - /* This drops the fpriv->fbs reference. */ > - drm_framebuffer_unreference(fb); > - } > - } > - > - if (!list_empty(&arg.fbs)) { > - INIT_WORK_ONSTACK(&arg.work, drm_mode_rmfb_work_fn); > - > - schedule_work(&arg.work); > - flush_work(&arg.work); > - destroy_work_on_stack(&arg.work); > - } > -} > - > static bool drm_property_type_valid(struct drm_property *property) > { > if (property->flags & DRM_MODE_PROP_EXTENDED_TYPE) > @@ -4492,7 +3689,7 @@ struct drm_property_blob *drm_property_lookup_blob(struct drm_device *dev, > struct drm_mode_object *obj; > struct drm_property_blob *blob = NULL; > > - obj = _object_find(dev, id, DRM_MODE_OBJECT_BLOB); > + obj = __drm_mode_object_find(dev, id, DRM_MODE_OBJECT_BLOB); > if (obj) > blob = obj_to_blob(obj); > return blob; > @@ -4888,7 +4085,8 @@ bool drm_property_change_valid_get(struct drm_property *property, > if (value == 0) > return true; > > - *ref = _object_find(property->dev, value, property->values[0]); > + *ref = __drm_mode_object_find(property->dev, value, > + property->values[0]); > return *ref != NULL; > } > > diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h > index 3ea72e1780b1..5f1e9ff71ae4 100644 > --- a/drivers/gpu/drm/drm_crtc_internal.h > +++ b/drivers/gpu/drm/drm_crtc_internal.h > @@ -35,8 +35,17 @@ > /* drm_crtc.c */ > void drm_connector_ida_init(void); > void drm_connector_ida_destroy(void); > +int drm_mode_object_get_reg(struct drm_device *dev, > + struct drm_mode_object *obj, > + uint32_t obj_type, > + bool register_obj, > + void (*obj_free_cb)(struct kref *kref)); > +void drm_mode_object_register(struct drm_device *dev, > + struct drm_mode_object *obj); > int drm_mode_object_get(struct drm_device *dev, > struct drm_mode_object *obj, uint32_t obj_type); > +struct drm_mode_object *__drm_mode_object_find(struct drm_device *dev, > + uint32_t id, uint32_t type); > void drm_mode_object_unregister(struct drm_device *dev, > struct drm_mode_object *object); > bool drm_property_change_valid_get(struct drm_property *property, > @@ -64,18 +73,6 @@ int drm_mode_mmap_dumb_ioctl(struct drm_device *dev, > int drm_mode_destroy_dumb_ioctl(struct drm_device *dev, > void *data, struct drm_file *file_priv); > > -/* framebuffer IOCTLs */ > -extern int drm_mode_addfb(struct drm_device *dev, > - void *data, struct drm_file *file_priv); > -extern int drm_mode_addfb2(struct drm_device *dev, > - void *data, struct drm_file *file_priv); > -int drm_mode_rmfb(struct drm_device *dev, > - void *data, struct drm_file *file_priv); > -int drm_mode_getfb(struct drm_device *dev, > - void *data, struct drm_file *file_priv); > -int drm_mode_dirtyfb_ioctl(struct drm_device *dev, > - void *data, struct drm_file *file_priv); > - > /* IOCTLs */ > int drm_mode_obj_get_properties_ioctl(struct drm_device *dev, void *data, > struct drm_file *file_priv); > @@ -120,6 +117,25 @@ int drm_mode_gamma_set_ioctl(struct drm_device *dev, > int drm_mode_page_flip_ioctl(struct drm_device *dev, > void *data, struct drm_file *file_priv); > > +/* drm_framebuffer.c */ > +struct drm_framebuffer * > +drm_internal_framebuffer_create(struct drm_device *dev, > + const struct drm_mode_fb_cmd2 *r, > + struct drm_file *file_priv); > +void drm_framebuffer_free(struct kref *kref); > + > +/* IOCTL */ > +int drm_mode_addfb(struct drm_device *dev, > + void *data, struct drm_file *file_priv); > +int drm_mode_addfb2(struct drm_device *dev, > + void *data, struct drm_file *file_priv); > +int drm_mode_rmfb(struct drm_device *dev, > + void *data, struct drm_file *file_priv); > +int drm_mode_getfb(struct drm_device *dev, > + void *data, struct drm_file *file_priv); > +int drm_mode_dirtyfb_ioctl(struct drm_device *dev, > + void *data, struct drm_file *file_priv); > + > /* drm_atomic.c */ > int drm_atomic_get_property(struct drm_mode_object *obj, > struct drm_property *property, uint64_t *val); > diff --git a/drivers/gpu/drm/drm_framebuffer.c b/drivers/gpu/drm/drm_framebuffer.c > new file mode 100644 > index 000000000000..c7a8a623b336 > --- /dev/null > +++ b/drivers/gpu/drm/drm_framebuffer.c > @@ -0,0 +1,827 @@ > +/* > + * Copyright (c) 2016 Intel Corporation > + * > + * Permission to use, copy, modify, distribute, and sell this software and its > + * documentation for any purpose is hereby granted without fee, provided that > + * the above copyright notice appear in all copies and that both that copyright > + * notice and this permission notice appear in supporting documentation, and > + * that the name of the copyright holders not be used in advertising or > + * publicity pertaining to distribution of the software without specific, > + * written prior permission. The copyright holders make no representations > + * about the suitability of this software for any purpose. It is provided "as > + * is" without express or implied warranty. > + * > + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, > + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO > + * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR > + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, > + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER > + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE > + * OF THIS SOFTWARE. > + */ > + > +#include <linux/export.h> > +#include <drm/drmP.h> > +#include <drm/drm_auth.h> > +#include <drm/drm_framebuffer.h> > + > +#include "drm_crtc_internal.h" > + > +/** > + * drm_mode_addfb - add an FB to the graphics configuration > + * @dev: drm device for the ioctl > + * @data: data pointer for the ioctl > + * @file_priv: drm file for the ioctl call > + * > + * Add a new FB to the specified CRTC, given a user request. This is the > + * original addfb ioctl which only supported RGB formats. > + * > + * Called by the user via ioctl. > + * > + * Returns: > + * Zero on success, negative errno on failure. > + */ > +int drm_mode_addfb(struct drm_device *dev, > + void *data, struct drm_file *file_priv) > +{ > + struct drm_mode_fb_cmd *or = data; > + struct drm_mode_fb_cmd2 r = {}; > + int ret; > + > + /* convert to new format and call new ioctl */ > + r.fb_id = or->fb_id; > + r.width = or->width; > + r.height = or->height; > + r.pitches[0] = or->pitch; > + r.pixel_format = drm_mode_legacy_fb_format(or->bpp, or->depth); > + r.handles[0] = or->handle; > + > + ret = drm_mode_addfb2(dev, &r, file_priv); > + if (ret) > + return ret; > + > + or->fb_id = r.fb_id; > + > + return 0; > +} > + > +static int format_check(const struct drm_mode_fb_cmd2 *r) > +{ > + uint32_t format = r->pixel_format & ~DRM_FORMAT_BIG_ENDIAN; > + > + switch (format) { > + case DRM_FORMAT_C8: > + case DRM_FORMAT_RGB332: > + case DRM_FORMAT_BGR233: > + case DRM_FORMAT_XRGB4444: > + case DRM_FORMAT_XBGR4444: > + case DRM_FORMAT_RGBX4444: > + case DRM_FORMAT_BGRX4444: > + case DRM_FORMAT_ARGB4444: > + case DRM_FORMAT_ABGR4444: > + case DRM_FORMAT_RGBA4444: > + case DRM_FORMAT_BGRA4444: > + case DRM_FORMAT_XRGB1555: > + case DRM_FORMAT_XBGR1555: > + case DRM_FORMAT_RGBX5551: > + case DRM_FORMAT_BGRX5551: > + case DRM_FORMAT_ARGB1555: > + case DRM_FORMAT_ABGR1555: > + case DRM_FORMAT_RGBA5551: > + case DRM_FORMAT_BGRA5551: > + case DRM_FORMAT_RGB565: > + case DRM_FORMAT_BGR565: > + case DRM_FORMAT_RGB888: > + case DRM_FORMAT_BGR888: > + case DRM_FORMAT_XRGB8888: > + case DRM_FORMAT_XBGR8888: > + case DRM_FORMAT_RGBX8888: > + case DRM_FORMAT_BGRX8888: > + case DRM_FORMAT_ARGB8888: > + case DRM_FORMAT_ABGR8888: > + case DRM_FORMAT_RGBA8888: > + case DRM_FORMAT_BGRA8888: > + case DRM_FORMAT_XRGB2101010: > + case DRM_FORMAT_XBGR2101010: > + case DRM_FORMAT_RGBX1010102: > + case DRM_FORMAT_BGRX1010102: > + case DRM_FORMAT_ARGB2101010: > + case DRM_FORMAT_ABGR2101010: > + case DRM_FORMAT_RGBA1010102: > + case DRM_FORMAT_BGRA1010102: > + case DRM_FORMAT_YUYV: > + case DRM_FORMAT_YVYU: > + case DRM_FORMAT_UYVY: > + case DRM_FORMAT_VYUY: > + case DRM_FORMAT_AYUV: > + case DRM_FORMAT_NV12: > + case DRM_FORMAT_NV21: > + case DRM_FORMAT_NV16: > + case DRM_FORMAT_NV61: > + case DRM_FORMAT_NV24: > + case DRM_FORMAT_NV42: > + case DRM_FORMAT_YUV410: > + case DRM_FORMAT_YVU410: > + case DRM_FORMAT_YUV411: > + case DRM_FORMAT_YVU411: > + case DRM_FORMAT_YUV420: > + case DRM_FORMAT_YVU420: > + case DRM_FORMAT_YUV422: > + case DRM_FORMAT_YVU422: > + case DRM_FORMAT_YUV444: > + case DRM_FORMAT_YVU444: > + return 0; > + default: > + DRM_DEBUG_KMS("invalid pixel format %s\n", > + drm_get_format_name(r->pixel_format)); > + return -EINVAL; > + } > +} > + > +static int framebuffer_check(const struct drm_mode_fb_cmd2 *r) > +{ > + int ret, hsub, vsub, num_planes, i; > + > + ret = format_check(r); > + if (ret) { > + DRM_DEBUG_KMS("bad framebuffer format %s\n", > + drm_get_format_name(r->pixel_format)); > + return ret; > + } > + > + hsub = drm_format_horz_chroma_subsampling(r->pixel_format); > + vsub = drm_format_vert_chroma_subsampling(r->pixel_format); > + num_planes = drm_format_num_planes(r->pixel_format); > + > + if (r->width == 0 || r->width % hsub) { > + DRM_DEBUG_KMS("bad framebuffer width %u\n", r->width); > + return -EINVAL; > + } > + > + if (r->height == 0 || r->height % vsub) { > + DRM_DEBUG_KMS("bad framebuffer height %u\n", r->height); > + return -EINVAL; > + } > + > + for (i = 0; i < num_planes; i++) { > + unsigned int width = r->width / (i != 0 ? hsub : 1); > + unsigned int height = r->height / (i != 0 ? vsub : 1); > + unsigned int cpp = drm_format_plane_cpp(r->pixel_format, i); > + > + if (!r->handles[i]) { > + DRM_DEBUG_KMS("no buffer object handle for plane %d\n", i); > + return -EINVAL; > + } > + > + if ((uint64_t) width * cpp > UINT_MAX) > + return -ERANGE; > + > + if ((uint64_t) height * r->pitches[i] + r->offsets[i] > UINT_MAX) > + return -ERANGE; > + > + if (r->pitches[i] < width * cpp) { > + DRM_DEBUG_KMS("bad pitch %u for plane %d\n", r->pitches[i], i); > + return -EINVAL; > + } > + > + if (r->modifier[i] && !(r->flags & DRM_MODE_FB_MODIFIERS)) { > + DRM_DEBUG_KMS("bad fb modifier %llu for plane %d\n", > + r->modifier[i], i); > + return -EINVAL; > + } > + > + /* modifier specific checks: */ > + switch (r->modifier[i]) { > + case DRM_FORMAT_MOD_SAMSUNG_64_32_TILE: > + /* NOTE: the pitch restriction may be lifted later if it turns > + * out that no hw has this restriction: > + */ > + if (r->pixel_format != DRM_FORMAT_NV12 || > + width % 128 || height % 32 || > + r->pitches[i] % 128) { > + DRM_DEBUG_KMS("bad modifier data for plane %d\n", i); > + return -EINVAL; > + } > + break; > + > + default: > + break; > + } > + } > + > + for (i = num_planes; i < 4; i++) { > + if (r->modifier[i]) { > + DRM_DEBUG_KMS("non-zero modifier for unused plane %d\n", i); > + return -EINVAL; > + } > + > + /* Pre-FB_MODIFIERS userspace didn't clear the structs properly. */ > + if (!(r->flags & DRM_MODE_FB_MODIFIERS)) > + continue; > + > + if (r->handles[i]) { > + DRM_DEBUG_KMS("buffer object handle for unused plane %d\n", i); > + return -EINVAL; > + } > + > + if (r->pitches[i]) { > + DRM_DEBUG_KMS("non-zero pitch for unused plane %d\n", i); > + return -EINVAL; > + } > + > + if (r->offsets[i]) { > + DRM_DEBUG_KMS("non-zero offset for unused plane %d\n", i); > + return -EINVAL; > + } > + } > + > + return 0; > +} > + > +struct drm_framebuffer * > +drm_internal_framebuffer_create(struct drm_device *dev, > + const struct drm_mode_fb_cmd2 *r, > + struct drm_file *file_priv) > +{ > + struct drm_mode_config *config = &dev->mode_config; > + struct drm_framebuffer *fb; > + int ret; > + > + if (r->flags & ~(DRM_MODE_FB_INTERLACED | DRM_MODE_FB_MODIFIERS)) { > + DRM_DEBUG_KMS("bad framebuffer flags 0x%08x\n", r->flags); > + return ERR_PTR(-EINVAL); > + } > + > + if ((config->min_width > r->width) || (r->width > config->max_width)) { > + DRM_DEBUG_KMS("bad framebuffer width %d, should be >= %d && <= %d\n", > + r->width, config->min_width, config->max_width); > + return ERR_PTR(-EINVAL); > + } > + if ((config->min_height > r->height) || (r->height > config->max_height)) { > + DRM_DEBUG_KMS("bad framebuffer height %d, should be >= %d && <= %d\n", > + r->height, config->min_height, config->max_height); > + return ERR_PTR(-EINVAL); > + } > + > + if (r->flags & DRM_MODE_FB_MODIFIERS && > + !dev->mode_config.allow_fb_modifiers) { > + DRM_DEBUG_KMS("driver does not support fb modifiers\n"); > + return ERR_PTR(-EINVAL); > + } > + > + ret = framebuffer_check(r); > + if (ret) > + return ERR_PTR(ret); > + > + fb = dev->mode_config.funcs->fb_create(dev, file_priv, r); > + if (IS_ERR(fb)) { > + DRM_DEBUG_KMS("could not create framebuffer\n"); > + return fb; > + } > + > + return fb; > +} > + > +/** > + * drm_mode_addfb2 - add an FB to the graphics configuration > + * @dev: drm device for the ioctl > + * @data: data pointer for the ioctl > + * @file_priv: drm file for the ioctl call > + * > + * Add a new FB to the specified CRTC, given a user request with format. This is > + * the 2nd version of the addfb ioctl, which supports multi-planar framebuffers > + * and uses fourcc codes as pixel format specifiers. > + * > + * Called by the user via ioctl. > + * > + * Returns: > + * Zero on success, negative errno on failure. > + */ > +int drm_mode_addfb2(struct drm_device *dev, > + void *data, struct drm_file *file_priv) > +{ > + struct drm_mode_fb_cmd2 *r = data; > + struct drm_framebuffer *fb; > + > + if (!drm_core_check_feature(dev, DRIVER_MODESET)) > + return -EINVAL; > + > + fb = drm_internal_framebuffer_create(dev, r, file_priv); > + if (IS_ERR(fb)) > + return PTR_ERR(fb); > + > + DRM_DEBUG_KMS("[FB:%d]\n", fb->base.id); > + r->fb_id = fb->base.id; > + > + /* Transfer ownership to the filp for reaping on close */ > + mutex_lock(&file_priv->fbs_lock); > + list_add(&fb->filp_head, &file_priv->fbs); > + mutex_unlock(&file_priv->fbs_lock); > + > + return 0; > +} > + > +struct drm_mode_rmfb_work { > + struct work_struct work; > + struct list_head fbs; > +}; > + > +static void drm_mode_rmfb_work_fn(struct work_struct *w) > +{ > + struct drm_mode_rmfb_work *arg = container_of(w, typeof(*arg), work); > + > + while (!list_empty(&arg->fbs)) { > + struct drm_framebuffer *fb = > + list_first_entry(&arg->fbs, typeof(*fb), filp_head); > + > + list_del_init(&fb->filp_head); > + drm_framebuffer_remove(fb); > + } > +} > + > +/** > + * drm_mode_rmfb - remove an FB from the configuration > + * @dev: drm device for the ioctl > + * @data: data pointer for the ioctl > + * @file_priv: drm file for the ioctl call > + * > + * Remove the FB specified by the user. > + * > + * Called by the user via ioctl. > + * > + * Returns: > + * Zero on success, negative errno on failure. > + */ > +int drm_mode_rmfb(struct drm_device *dev, > + void *data, struct drm_file *file_priv) > +{ > + struct drm_framebuffer *fb = NULL; > + struct drm_framebuffer *fbl = NULL; > + uint32_t *id = data; > + int found = 0; > + > + if (!drm_core_check_feature(dev, DRIVER_MODESET)) > + return -EINVAL; > + > + fb = drm_framebuffer_lookup(dev, *id); > + if (!fb) > + return -ENOENT; > + > + mutex_lock(&file_priv->fbs_lock); > + list_for_each_entry(fbl, &file_priv->fbs, filp_head) > + if (fb == fbl) > + found = 1; > + if (!found) { > + mutex_unlock(&file_priv->fbs_lock); > + goto fail_unref; > + } > + > + list_del_init(&fb->filp_head); > + mutex_unlock(&file_priv->fbs_lock); > + > + /* drop the reference we picked up in framebuffer lookup */ > + drm_framebuffer_unreference(fb); > + > + /* > + * we now own the reference that was stored in the fbs list > + * > + * drm_framebuffer_remove may fail with -EINTR on pending signals, > + * so run this in a separate stack as there's no way to correctly > + * handle this after the fb is already removed from the lookup table. > + */ > + if (drm_framebuffer_read_refcount(fb) > 1) { > + struct drm_mode_rmfb_work arg; > + > + INIT_WORK_ONSTACK(&arg.work, drm_mode_rmfb_work_fn); > + INIT_LIST_HEAD(&arg.fbs); > + list_add_tail(&fb->filp_head, &arg.fbs); > + > + schedule_work(&arg.work); > + flush_work(&arg.work); > + destroy_work_on_stack(&arg.work); > + } else > + drm_framebuffer_unreference(fb); > + > + return 0; > + > +fail_unref: > + drm_framebuffer_unreference(fb); > + return -ENOENT; > +} > + > +/** > + * drm_mode_getfb - get FB info > + * @dev: drm device for the ioctl > + * @data: data pointer for the ioctl > + * @file_priv: drm file for the ioctl call > + * > + * Lookup the FB given its ID and return info about it. > + * > + * Called by the user via ioctl. > + * > + * Returns: > + * Zero on success, negative errno on failure. > + */ > +int drm_mode_getfb(struct drm_device *dev, > + void *data, struct drm_file *file_priv) > +{ > + struct drm_mode_fb_cmd *r = data; > + struct drm_framebuffer *fb; > + int ret; > + > + if (!drm_core_check_feature(dev, DRIVER_MODESET)) > + return -EINVAL; > + > + fb = drm_framebuffer_lookup(dev, r->fb_id); > + if (!fb) > + return -ENOENT; > + > + r->height = fb->height; > + r->width = fb->width; > + r->depth = fb->depth; > + r->bpp = fb->bits_per_pixel; > + r->pitch = fb->pitches[0]; > + if (fb->funcs->create_handle) { > + if (drm_is_current_master(file_priv) || capable(CAP_SYS_ADMIN) || > + drm_is_control_client(file_priv)) { > + ret = fb->funcs->create_handle(fb, file_priv, > + &r->handle); > + } else { > + /* GET_FB() is an unprivileged ioctl so we must not > + * return a buffer-handle to non-master processes! For > + * backwards-compatibility reasons, we cannot make > + * GET_FB() privileged, so just return an invalid handle > + * for non-masters. */ > + r->handle = 0; > + ret = 0; > + } > + } else { > + ret = -ENODEV; > + } > + > + drm_framebuffer_unreference(fb); > + > + return ret; > +} > + > +/** > + * drm_mode_dirtyfb_ioctl - flush frontbuffer rendering on an FB > + * @dev: drm device for the ioctl > + * @data: data pointer for the ioctl > + * @file_priv: drm file for the ioctl call > + * > + * Lookup the FB and flush out the damaged area supplied by userspace as a clip > + * rectangle list. Generic userspace which does frontbuffer rendering must call > + * this ioctl to flush out the changes on manual-update display outputs, e.g. > + * usb display-link, mipi manual update panels or edp panel self refresh modes. > + * > + * Modesetting drivers which always update the frontbuffer do not need to > + * implement the corresponding ->dirty framebuffer callback. > + * > + * Called by the user via ioctl. > + * > + * Returns: > + * Zero on success, negative errno on failure. > + */ > +int drm_mode_dirtyfb_ioctl(struct drm_device *dev, > + void *data, struct drm_file *file_priv) > +{ > + struct drm_clip_rect __user *clips_ptr; > + struct drm_clip_rect *clips = NULL; > + struct drm_mode_fb_dirty_cmd *r = data; > + struct drm_framebuffer *fb; > + unsigned flags; > + int num_clips; > + int ret; > + > + if (!drm_core_check_feature(dev, DRIVER_MODESET)) > + return -EINVAL; > + > + fb = drm_framebuffer_lookup(dev, r->fb_id); > + if (!fb) > + return -ENOENT; > + > + num_clips = r->num_clips; > + clips_ptr = (struct drm_clip_rect __user *)(unsigned long)r->clips_ptr; > + > + if (!num_clips != !clips_ptr) { > + ret = -EINVAL; > + goto out_err1; > + } > + > + flags = DRM_MODE_FB_DIRTY_FLAGS & r->flags; > + > + /* If userspace annotates copy, clips must come in pairs */ > + if (flags & DRM_MODE_FB_DIRTY_ANNOTATE_COPY && (num_clips % 2)) { > + ret = -EINVAL; > + goto out_err1; > + } > + > + if (num_clips && clips_ptr) { > + if (num_clips < 0 || num_clips > DRM_MODE_FB_DIRTY_MAX_CLIPS) { > + ret = -EINVAL; > + goto out_err1; > + } > + clips = kcalloc(num_clips, sizeof(*clips), GFP_KERNEL); > + if (!clips) { > + ret = -ENOMEM; > + goto out_err1; > + } > + > + ret = copy_from_user(clips, clips_ptr, > + num_clips * sizeof(*clips)); > + if (ret) { > + ret = -EFAULT; > + goto out_err2; > + } > + } > + > + if (fb->funcs->dirty) { > + ret = fb->funcs->dirty(fb, file_priv, flags, r->color, > + clips, num_clips); > + } else { > + ret = -ENOSYS; > + } > + > +out_err2: > + kfree(clips); > +out_err1: > + drm_framebuffer_unreference(fb); > + > + return ret; > +} > + > +/** > + * drm_fb_release - remove and free the FBs on this file > + * @priv: drm file for the ioctl > + * > + * Destroy all the FBs associated with @filp. > + * > + * Called by the user via ioctl. > + * > + * Returns: > + * Zero on success, negative errno on failure. > + */ > +void drm_fb_release(struct drm_file *priv) > +{ > + struct drm_framebuffer *fb, *tfb; > + struct drm_mode_rmfb_work arg; > + > + INIT_LIST_HEAD(&arg.fbs); > + > + /* > + * When the file gets released that means no one else can access the fb > + * list any more, so no need to grab fpriv->fbs_lock. And we need to > + * avoid upsetting lockdep since the universal cursor code adds a > + * framebuffer while holding mutex locks. > + * > + * Note that a real deadlock between fpriv->fbs_lock and the modeset > + * locks is impossible here since no one else but this function can get > + * at it any more. > + */ > + list_for_each_entry_safe(fb, tfb, &priv->fbs, filp_head) { > + if (drm_framebuffer_read_refcount(fb) > 1) { > + list_move_tail(&fb->filp_head, &arg.fbs); > + } else { > + list_del_init(&fb->filp_head); > + > + /* This drops the fpriv->fbs reference. */ > + drm_framebuffer_unreference(fb); > + } > + } > + > + if (!list_empty(&arg.fbs)) { > + INIT_WORK_ONSTACK(&arg.work, drm_mode_rmfb_work_fn); > + > + schedule_work(&arg.work); > + flush_work(&arg.work); > + destroy_work_on_stack(&arg.work); > + } > +} > + > +/** > + * drm_crtc_force_disable_all - Forcibly turn off all enabled CRTCs > + * @dev: DRM device whose CRTCs to turn off > + * > + * Drivers may want to call this on unload to ensure that all displays are > + * unlit and the GPU is in a consistent, low power state. Takes modeset locks. > + * > + * Returns: > + * Zero on success, error code on failure. > + */ > +int drm_crtc_force_disable_all(struct drm_device *dev) > +{ > + struct drm_crtc *crtc; > + int ret = 0; > + > + drm_modeset_lock_all(dev); > + drm_for_each_crtc(crtc, dev) > + if (crtc->enabled) { > + ret = drm_crtc_force_disable(crtc); > + if (ret) > + goto out; > + } > +out: > + drm_modeset_unlock_all(dev); > + return ret; > +} > +EXPORT_SYMBOL(drm_crtc_force_disable_all); > + > +void drm_framebuffer_free(struct kref *kref) > +{ > + struct drm_framebuffer *fb = > + container_of(kref, struct drm_framebuffer, base.refcount); > + struct drm_device *dev = fb->dev; > + > + /* > + * The lookup idr holds a weak reference, which has not necessarily been > + * removed at this point. Check for that. > + */ > + drm_mode_object_unregister(dev, &fb->base); > + > + fb->funcs->destroy(fb); > +} > + > +/** > + * drm_framebuffer_init - initialize a framebuffer > + * @dev: DRM device > + * @fb: framebuffer to be initialized > + * @funcs: ... with these functions > + * > + * Allocates an ID for the framebuffer's parent mode object, sets its mode > + * functions & device file and adds it to the master fd list. > + * > + * IMPORTANT: > + * This functions publishes the fb and makes it available for concurrent access > + * by other users. Which means by this point the fb _must_ be fully set up - > + * since all the fb attributes are invariant over its lifetime, no further > + * locking but only correct reference counting is required. > + * > + * Returns: > + * Zero on success, error code on failure. > + */ > +int drm_framebuffer_init(struct drm_device *dev, struct drm_framebuffer *fb, > + const struct drm_framebuffer_funcs *funcs) > +{ > + int ret; > + > + INIT_LIST_HEAD(&fb->filp_head); > + fb->dev = dev; > + fb->funcs = funcs; > + > + ret = drm_mode_object_get_reg(dev, &fb->base, DRM_MODE_OBJECT_FB, > + false, drm_framebuffer_free); > + if (ret) > + goto out; > + > + mutex_lock(&dev->mode_config.fb_lock); > + dev->mode_config.num_fb++; > + list_add(&fb->head, &dev->mode_config.fb_list); > + mutex_unlock(&dev->mode_config.fb_lock); > + > + drm_mode_object_register(dev, &fb->base); > +out: > + return ret; > +} > +EXPORT_SYMBOL(drm_framebuffer_init); > + > +/** > + * drm_framebuffer_lookup - look up a drm framebuffer and grab a reference > + * @dev: drm device > + * @id: id of the fb object > + * > + * If successful, this grabs an additional reference to the framebuffer - > + * callers need to make sure to eventually unreference the returned framebuffer > + * again, using @drm_framebuffer_unreference. > + */ > +struct drm_framebuffer *drm_framebuffer_lookup(struct drm_device *dev, > + uint32_t id) > +{ > + struct drm_mode_object *obj; > + struct drm_framebuffer *fb = NULL; > + > + obj = __drm_mode_object_find(dev, id, DRM_MODE_OBJECT_FB); > + if (obj) > + fb = obj_to_fb(obj); > + return fb; > +} > +EXPORT_SYMBOL(drm_framebuffer_lookup); > + > +/** > + * drm_framebuffer_unregister_private - unregister a private fb from the lookup idr > + * @fb: fb to unregister > + * > + * Drivers need to call this when cleaning up driver-private framebuffers, e.g. > + * those used for fbdev. Note that the caller must hold a reference of it's own, > + * i.e. the object may not be destroyed through this call (since it'll lead to a > + * locking inversion). > + */ > +void drm_framebuffer_unregister_private(struct drm_framebuffer *fb) > +{ > + struct drm_device *dev; > + > + if (!fb) > + return; > + > + dev = fb->dev; > + > + /* Mark fb as reaped and drop idr ref. */ > + drm_mode_object_unregister(dev, &fb->base); > +} > +EXPORT_SYMBOL(drm_framebuffer_unregister_private); > + > +/** > + * drm_framebuffer_cleanup - remove a framebuffer object > + * @fb: framebuffer to remove > + * > + * Cleanup framebuffer. This function is intended to be used from the drivers > + * ->destroy callback. It can also be used to clean up driver private > + * framebuffers embedded into a larger structure. > + * > + * Note that this function does not remove the fb from active usuage - if it is > + * still used anywhere, hilarity can ensue since userspace could call getfb on > + * the id and get back -EINVAL. Obviously no concern at driver unload time. > + * > + * Also, the framebuffer will not be removed from the lookup idr - for > + * user-created framebuffers this will happen in in the rmfb ioctl. For > + * driver-private objects (e.g. for fbdev) drivers need to explicitly call > + * drm_framebuffer_unregister_private. > + */ > +void drm_framebuffer_cleanup(struct drm_framebuffer *fb) > +{ > + struct drm_device *dev = fb->dev; > + > + mutex_lock(&dev->mode_config.fb_lock); > + list_del(&fb->head); > + dev->mode_config.num_fb--; > + mutex_unlock(&dev->mode_config.fb_lock); > +} > +EXPORT_SYMBOL(drm_framebuffer_cleanup); > + > +/** > + * drm_framebuffer_remove - remove and unreference a framebuffer object > + * @fb: framebuffer to remove > + * > + * Scans all the CRTCs and planes in @dev's mode_config. If they're > + * using @fb, removes it, setting it to NULL. Then drops the reference to the > + * passed-in framebuffer. Might take the modeset locks. > + * > + * Note that this function optimizes the cleanup away if the caller holds the > + * last reference to the framebuffer. It is also guaranteed to not take the > + * modeset locks in this case. > + */ > +void drm_framebuffer_remove(struct drm_framebuffer *fb) > +{ > + struct drm_device *dev; > + struct drm_crtc *crtc; > + struct drm_plane *plane; > + > + if (!fb) > + return; > + > + dev = fb->dev; > + > + WARN_ON(!list_empty(&fb->filp_head)); > + > + /* > + * drm ABI mandates that we remove any deleted framebuffers from active > + * useage. But since most sane clients only remove framebuffers they no > + * longer need, try to optimize this away. > + * > + * Since we're holding a reference ourselves, observing a refcount of 1 > + * means that we're the last holder and can skip it. Also, the refcount > + * can never increase from 1 again, so we don't need any barriers or > + * locks. > + * > + * Note that userspace could try to race with use and instate a new > + * usage _after_ we've cleared all current ones. End result will be an > + * in-use fb with fb-id == 0. Userspace is allowed to shoot its own foot > + * in this manner. > + */ > + if (drm_framebuffer_read_refcount(fb) > 1) { > + if (dev->mode_config.funcs->atomic_commit) { > + drm_atomic_remove_fb(fb); > + goto out; > + } > + > + drm_modeset_lock_all(dev); > + /* remove from any CRTC */ > + drm_for_each_crtc(crtc, dev) { > + if (crtc->primary->fb == fb) { > + /* should turn off the crtc */ > + if (drm_crtc_force_disable(crtc)) > + DRM_ERROR("failed to reset crtc %p when fb was deleted\n", crtc); > + } > + } > + > + drm_for_each_plane(plane, dev) { > + if (plane->fb == fb) > + drm_plane_force_disable(plane); > + } > + drm_modeset_unlock_all(dev); > + } > + > +out: > + drm_framebuffer_unreference(fb); > +} > +EXPORT_SYMBOL(drm_framebuffer_remove); > diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h > index 52edecef5325..e973b54c1e9f 100644 > --- a/include/drm/drm_crtc.h > +++ b/include/drm/drm_crtc.h > @@ -35,10 +35,12 @@ > #include <uapi/drm/drm_mode.h> > #include <uapi/drm/drm_fourcc.h> > #include <drm/drm_modeset_lock.h> > +#include <drm/drm_modeset.h> > +#include <drm/drm_framebuffer.h> > +#include <drm/drm_modes.h> > > struct drm_device; > struct drm_mode_set; > -struct drm_framebuffer; > struct drm_object_properties; > struct drm_file; > struct drm_clip_rect; > @@ -46,14 +48,6 @@ struct device_node; > struct fence; > struct edid; > > -struct drm_mode_object { > - uint32_t id; > - uint32_t type; > - struct drm_object_properties *properties; > - struct kref refcount; > - void (*free_cb)(struct kref *kref); > -}; > - > #define DRM_OBJECT_MAX_PROPERTY 24 > struct drm_object_properties { > int count, atomic_count; > @@ -92,15 +86,6 @@ static inline uint64_t I642U64(int64_t val) > #define DRM_REFLECT_X 4 > #define DRM_REFLECT_Y 5 > > -enum drm_connector_force { > - DRM_FORCE_UNSPECIFIED, > - DRM_FORCE_OFF, > - DRM_FORCE_ON, /* force on analog part normally */ > - DRM_FORCE_ON_DIGITAL, /* for DVI-I use digital connector */ > -}; > - > -#include <drm/drm_modes.h> > - > enum drm_connector_status { > connector_status_connected = 1, > connector_status_disconnected = 2, > @@ -164,101 +149,6 @@ struct drm_tile_group { > u8 group_data[8]; > }; > > -/** > - * struct drm_framebuffer_funcs - framebuffer hooks > - */ > -struct drm_framebuffer_funcs { > - /** > - * @destroy: > - * > - * Clean up framebuffer resources, specifically also unreference the > - * backing storage. The core guarantees to call this function for every > - * framebuffer successfully created by ->fb_create() in > - * &drm_mode_config_funcs. Drivers must also call > - * drm_framebuffer_cleanup() to release DRM core resources for this > - * framebuffer. > - */ > - void (*destroy)(struct drm_framebuffer *framebuffer); > - > - /** > - * @create_handle: > - * > - * Create a buffer handle in the driver-specific buffer manager (either > - * GEM or TTM) valid for the passed-in struct &drm_file. This is used by > - * the core to implement the GETFB IOCTL, which returns (for > - * sufficiently priviledged user) also a native buffer handle. This can > - * be used for seamless transitions between modesetting clients by > - * copying the current screen contents to a private buffer and blending > - * between that and the new contents. > - * > - * GEM based drivers should call drm_gem_handle_create() to create the > - * handle. > - * > - * RETURNS: > - * > - * 0 on success or a negative error code on failure. > - */ > - int (*create_handle)(struct drm_framebuffer *fb, > - struct drm_file *file_priv, > - unsigned int *handle); > - /** > - * @dirty: > - * > - * Optional callback for the dirty fb IOCTL. > - * > - * Userspace can notify the driver via this callback that an area of the > - * framebuffer has changed and should be flushed to the display > - * hardware. This can also be used internally, e.g. by the fbdev > - * emulation, though that's not the case currently. > - * > - * See documentation in drm_mode.h for the struct drm_mode_fb_dirty_cmd > - * for more information as all the semantics and arguments have a one to > - * one mapping on this function. > - * > - * RETURNS: > - * > - * 0 on success or a negative error code on failure. > - */ > - int (*dirty)(struct drm_framebuffer *framebuffer, > - struct drm_file *file_priv, unsigned flags, > - unsigned color, struct drm_clip_rect *clips, > - unsigned num_clips); > -}; > - > -struct drm_framebuffer { > - struct drm_device *dev; > - /* > - * Note that the fb is refcounted for the benefit of driver internals, > - * for example some hw, disabling a CRTC/plane is asynchronous, and > - * scanout does not actually complete until the next vblank. So some > - * cleanup (like releasing the reference(s) on the backing GEM bo(s)) > - * should be deferred. In cases like this, the driver would like to > - * hold a ref to the fb even though it has already been removed from > - * userspace perspective. > - * The refcount is stored inside the mode object. > - */ > - /* > - * Place on the dev->mode_config.fb_list, access protected by > - * dev->mode_config.fb_lock. > - */ > - struct list_head head; > - struct drm_mode_object base; > - const struct drm_framebuffer_funcs *funcs; > - unsigned int pitches[4]; > - unsigned int offsets[4]; > - uint64_t modifier[4]; > - unsigned int width; > - unsigned int height; > - /* depth can be 15 or 16 */ > - unsigned int depth; > - int bits_per_pixel; > - int flags; > - uint32_t pixel_format; /* fourcc format */ > - int hot_x; > - int hot_y; > - struct list_head filp_head; > -}; > - > struct drm_property_blob { > struct drm_mode_object base; > struct drm_device *dev; > @@ -2874,14 +2764,6 @@ extern int drm_object_property_set_value(struct drm_mode_object *obj, > extern int drm_object_property_get_value(struct drm_mode_object *obj, > struct drm_property *property, > uint64_t *value); > -extern int drm_framebuffer_init(struct drm_device *dev, > - struct drm_framebuffer *fb, > - const struct drm_framebuffer_funcs *funcs); > -extern struct drm_framebuffer *drm_framebuffer_lookup(struct drm_device *dev, > - uint32_t id); > -extern void drm_framebuffer_remove(struct drm_framebuffer *fb); > -extern void drm_framebuffer_cleanup(struct drm_framebuffer *fb); > -extern void drm_framebuffer_unregister_private(struct drm_framebuffer *fb); > > extern void drm_object_attach_property(struct drm_mode_object *obj, > struct drm_property *property, > @@ -2962,11 +2844,6 @@ int drm_plane_create_zpos_immutable_property(struct drm_plane *plane, > unsigned int zpos); > > /* Helpers */ > -struct drm_mode_object *drm_mode_object_find(struct drm_device *dev, > - uint32_t id, uint32_t type); > -void drm_mode_object_reference(struct drm_mode_object *obj); > -void drm_mode_object_unreference(struct drm_mode_object *obj); > - > static inline struct drm_plane *drm_plane_find(struct drm_device *dev, > uint32_t id) > { > @@ -3035,39 +2912,6 @@ static inline uint32_t drm_color_lut_extract(uint32_t user_input, > } > > /** > - * drm_framebuffer_reference - incr the fb refcnt > - * @fb: framebuffer > - * > - * This functions increments the fb's refcount. > - */ > -static inline void drm_framebuffer_reference(struct drm_framebuffer *fb) > -{ > - drm_mode_object_reference(&fb->base); > -} > - > -/** > - * drm_framebuffer_unreference - unref a framebuffer > - * @fb: framebuffer to unref > - * > - * This functions decrements the fb's refcount and frees it if it drops to zero. > - */ > -static inline void drm_framebuffer_unreference(struct drm_framebuffer *fb) > -{ > - drm_mode_object_unreference(&fb->base); > -} > - > -/** > - * drm_framebuffer_read_refcount - read the framebuffer reference count. > - * @fb: framebuffer > - * > - * This functions returns the framebuffer's reference count. > - */ > -static inline uint32_t drm_framebuffer_read_refcount(struct drm_framebuffer *fb) > -{ > - return atomic_read(&fb->base.refcount.refcount); > -} > - > -/** > * drm_connector_reference - incr the connector refcnt > * @connector: connector > * > diff --git a/include/drm/drm_framebuffer.h b/include/drm/drm_framebuffer.h > new file mode 100644 > index 000000000000..46abdace8fa5 > --- /dev/null > +++ b/include/drm/drm_framebuffer.h > @@ -0,0 +1,170 @@ > +/* > + * Copyright (c) 2016 Intel Corporation > + * > + * Permission to use, copy, modify, distribute, and sell this software and its > + * documentation for any purpose is hereby granted without fee, provided that > + * the above copyright notice appear in all copies and that both that copyright > + * notice and this permission notice appear in supporting documentation, and > + * that the name of the copyright holders not be used in advertising or > + * publicity pertaining to distribution of the software without specific, > + * written prior permission. The copyright holders make no representations > + * about the suitability of this software for any purpose. It is provided "as > + * is" without express or implied warranty. > + * > + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, > + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO > + * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR > + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, > + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER > + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE > + * OF THIS SOFTWARE. > + */ > + > +#ifndef __DRM_FRAMEBUFFER_H__ > +#define __DRM_FRAMEBUFFER_H__ > + > +#include <linux/list.h> > +#include <linux/ctype.h> > +#include <drm/drm_modeset.h> > + > +struct drm_framebuffer; > +struct drm_file; > +struct drm_device; > + > +/** > + * struct drm_framebuffer_funcs - framebuffer hooks > + */ > +struct drm_framebuffer_funcs { > + /** > + * @destroy: > + * > + * Clean up framebuffer resources, specifically also unreference the > + * backing storage. The core guarantees to call this function for every > + * framebuffer successfully created by ->fb_create() in > + * &drm_mode_config_funcs. Drivers must also call > + * drm_framebuffer_cleanup() to release DRM core resources for this > + * framebuffer. > + */ > + void (*destroy)(struct drm_framebuffer *framebuffer); > + > + /** > + * @create_handle: > + * > + * Create a buffer handle in the driver-specific buffer manager (either > + * GEM or TTM) valid for the passed-in struct &drm_file. This is used by > + * the core to implement the GETFB IOCTL, which returns (for > + * sufficiently priviledged user) also a native buffer handle. This can > + * be used for seamless transitions between modesetting clients by > + * copying the current screen contents to a private buffer and blending > + * between that and the new contents. > + * > + * GEM based drivers should call drm_gem_handle_create() to create the > + * handle. > + * > + * RETURNS: > + * > + * 0 on success or a negative error code on failure. > + */ > + int (*create_handle)(struct drm_framebuffer *fb, > + struct drm_file *file_priv, > + unsigned int *handle); > + /** > + * @dirty: > + * > + * Optional callback for the dirty fb IOCTL. > + * > + * Userspace can notify the driver via this callback that an area of the > + * framebuffer has changed and should be flushed to the display > + * hardware. This can also be used internally, e.g. by the fbdev > + * emulation, though that's not the case currently. > + * > + * See documentation in drm_mode.h for the struct drm_mode_fb_dirty_cmd > + * for more information as all the semantics and arguments have a one to > + * one mapping on this function. > + * > + * RETURNS: > + * > + * 0 on success or a negative error code on failure. > + */ > + int (*dirty)(struct drm_framebuffer *framebuffer, > + struct drm_file *file_priv, unsigned flags, > + unsigned color, struct drm_clip_rect *clips, > + unsigned num_clips); > +}; > + > +struct drm_framebuffer { > + struct drm_device *dev; > + /* > + * Note that the fb is refcounted for the benefit of driver internals, > + * for example some hw, disabling a CRTC/plane is asynchronous, and > + * scanout does not actually complete until the next vblank. So some > + * cleanup (like releasing the reference(s) on the backing GEM bo(s)) > + * should be deferred. In cases like this, the driver would like to > + * hold a ref to the fb even though it has already been removed from > + * userspace perspective. > + * The refcount is stored inside the mode object. > + */ > + /* > + * Place on the dev->mode_config.fb_list, access protected by > + * dev->mode_config.fb_lock. > + */ > + struct list_head head; > + struct drm_mode_object base; > + const struct drm_framebuffer_funcs *funcs; > + unsigned int pitches[4]; > + unsigned int offsets[4]; > + uint64_t modifier[4]; > + unsigned int width; > + unsigned int height; > + /* depth can be 15 or 16 */ > + unsigned int depth; > + int bits_per_pixel; > + int flags; > + uint32_t pixel_format; /* fourcc format */ > + int hot_x; > + int hot_y; > + struct list_head filp_head; > +}; > + > +int drm_framebuffer_init(struct drm_device *dev, > + struct drm_framebuffer *fb, > + const struct drm_framebuffer_funcs *funcs); > +struct drm_framebuffer *drm_framebuffer_lookup(struct drm_device *dev, > + uint32_t id); > +void drm_framebuffer_remove(struct drm_framebuffer *fb); > +void drm_framebuffer_cleanup(struct drm_framebuffer *fb); > +void drm_framebuffer_unregister_private(struct drm_framebuffer *fb); > + > +/** > + * drm_framebuffer_reference - incr the fb refcnt > + * @fb: framebuffer > + * > + * This functions increments the fb's refcount. > + */ > +static inline void drm_framebuffer_reference(struct drm_framebuffer *fb) > +{ > + drm_mode_object_reference(&fb->base); > +} > + > +/** > + * drm_framebuffer_unreference - unref a framebuffer > + * @fb: framebuffer to unref > + * > + * This functions decrements the fb's refcount and frees it if it drops to zero. > + */ > +static inline void drm_framebuffer_unreference(struct drm_framebuffer *fb) > +{ > + drm_mode_object_unreference(&fb->base); > +} > + > +/** > + * drm_framebuffer_read_refcount - read the framebuffer reference count. > + * @fb: framebuffer > + * > + * This functions returns the framebuffer's reference count. > + */ > +static inline uint32_t drm_framebuffer_read_refcount(struct drm_framebuffer *fb) > +{ > + return atomic_read(&fb->base.refcount.refcount); > +} > +#endif > diff --git a/include/drm/drm_modes.h b/include/drm/drm_modes.h > index ff481770d76b..f0af1edcbefe 100644 > --- a/include/drm/drm_modes.h > +++ b/include/drm/drm_modes.h > @@ -27,6 +27,8 @@ > #ifndef __DRM_MODES_H__ > #define __DRM_MODES_H__ > > +#include <drm/drm_modeset.h> > + > /* > * Note on terminology: here, for brevity and convenience, we refer to connector > * control chips as 'CRTCs'. They can control any type of connector, VGA, LVDS, > diff --git a/include/drm/drm_modeset.h b/include/drm/drm_modeset.h > new file mode 100644 > index 000000000000..0c2b0f3c5f34 > --- /dev/null > +++ b/include/drm/drm_modeset.h > @@ -0,0 +1,50 @@ > +/* > + * Copyright (c) 2016 Intel Corporation > + * > + * Permission to use, copy, modify, distribute, and sell this software and its > + * documentation for any purpose is hereby granted without fee, provided that > + * the above copyright notice appear in all copies and that both that copyright > + * notice and this permission notice appear in supporting documentation, and > + * that the name of the copyright holders not be used in advertising or > + * publicity pertaining to distribution of the software without specific, > + * written prior permission. The copyright holders make no representations > + * about the suitability of this software for any purpose. It is provided "as > + * is" without express or implied warranty. > + * > + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, > + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO > + * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR > + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, > + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER > + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE > + * OF THIS SOFTWARE. > + */ > + > +#ifndef __DRM_MODESET_H__ > +#define __DRM_MODESET_H__ > + > +#include <linux/kref.h> > +struct drm_object_properties; > + > +struct drm_mode_object { > + uint32_t id; > + uint32_t type; > + struct drm_object_properties *properties; > + struct kref refcount; > + void (*free_cb)(struct kref *kref); > +}; > + > +struct drm_mode_object *drm_mode_object_find(struct drm_device *dev, > + uint32_t id, uint32_t type); > +void drm_mode_object_reference(struct drm_mode_object *obj); > +void drm_mode_object_unreference(struct drm_mode_object *obj); > + > +/* FIXME: This is temporary until we have a drm_connector.h */ > +enum drm_connector_force { > + DRM_FORCE_UNSPECIFIED, > + DRM_FORCE_OFF, > + DRM_FORCE_ON, /* force on analog part normally */ > + DRM_FORCE_ON_DIGITAL, /* for DVI-I use digital connector */ > +}; > + > +#endif > -- > 2.8.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
On Wed, Aug 10, 2016 at 10:48:20AM -0400, Sean Paul wrote: > On Tue, Aug 9, 2016 at 9:41 AM, Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > > > > -/** > > - * drm_crtc_force_disable_all - Forcibly turn off all enabled CRTCs > > - * @dev: DRM device whose CRTCs to turn off > > - * > > - * Drivers may want to call this on unload to ensure that all displays are > > - * unlit and the GPU is in a consistent, low power state. Takes modeset locks. > > - * > > - * Returns: > > - * Zero on success, error code on failure. > > - */ > > -int drm_crtc_force_disable_all(struct drm_device *dev) > > -{ > > - struct drm_crtc *crtc; > > - int ret = 0; > > - > > - drm_modeset_lock_all(dev); > > - drm_for_each_crtc(crtc, dev) > > - if (crtc->enabled) { > > - ret = drm_crtc_force_disable(crtc); > > - if (ret) > > - goto out; > > - } > > -out: > > - drm_modeset_unlock_all(dev); > > - return ret; > > -} > > -EXPORT_SYMBOL(drm_crtc_force_disable_all); > > > I'm not so sure about moving this one. If it's going to be declared in > drm_crtc.h, it should stay here (with force_disable). Alternatively, > assuming no one else is using this (didn't check), move it to > drm_framebuffer and make it a static helper function there (removing > the declaration from drm_crtc.h). This shouldn't be moved, accidentally overselected. Will fix. -Daniel
diff --git a/Documentation/gpu/drm-kms.rst b/Documentation/gpu/drm-kms.rst index 3ae4c12aca08..8264a88a8695 100644 --- a/Documentation/gpu/drm-kms.rst +++ b/Documentation/gpu/drm-kms.rst @@ -64,6 +64,15 @@ fbdev framebuffer when the struct :c:type:`struct drm_framebuffer drivers can manually clean up a framebuffer at module unload time with :c:func:`drm_framebuffer_unregister_private()`. +Frame Buffer Functions Reference +-------------------------------- + +.. kernel-doc:: drivers/gpu/drm/drm_framebuffer.c + :export: + +.. kernel-doc:: include/drm/drm_framebuffer.h + :internal: + DRM Format Handling =================== diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index a5824d926dc9..c71ec42ce511 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -12,7 +12,8 @@ drm-y := drm_auth.o drm_bufs.o drm_cache.o \ drm_info.o drm_debugfs.o drm_encoder_slave.o \ drm_trace_points.o drm_global.o drm_prime.o \ drm_rect.o drm_vma_manager.o drm_flip_work.o \ - drm_modeset_lock.o drm_atomic.o drm_bridge.o + drm_modeset_lock.o drm_atomic.o drm_bridge.o \ + drm_framebuffer.o drm-$(CONFIG_COMPAT) += drm_ioc32.o drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index deed2e2c8cf1..a3c60f2caa88 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -40,15 +40,11 @@ #include <drm/drm_modeset_lock.h> #include <drm/drm_atomic.h> #include <drm/drm_auth.h> +#include <drm/drm_framebuffer.h> #include "drm_crtc_internal.h" #include "drm_internal.h" -static struct drm_framebuffer * -internal_framebuffer_create(struct drm_device *dev, - const struct drm_mode_fb_cmd2 *r, - struct drm_file *file_priv); - /* Avoid boilerplate. I'm tired of typing. */ #define DRM_ENUM_NAME_FN(fnname, list) \ const char *fnname(int val) \ @@ -238,11 +234,11 @@ EXPORT_SYMBOL(drm_get_subpixel_order_name); * Internal function to assign a slot in the object idr and optionally * register the object into the idr. */ -static int drm_mode_object_get_reg(struct drm_device *dev, - struct drm_mode_object *obj, - uint32_t obj_type, - bool register_obj, - void (*obj_free_cb)(struct kref *kref)) +int drm_mode_object_get_reg(struct drm_device *dev, + struct drm_mode_object *obj, + uint32_t obj_type, + bool register_obj, + void (*obj_free_cb)(struct kref *kref)) { int ret; @@ -285,8 +281,8 @@ int drm_mode_object_get(struct drm_device *dev, return drm_mode_object_get_reg(dev, obj, obj_type, true, NULL); } -static void drm_mode_object_register(struct drm_device *dev, - struct drm_mode_object *obj) +void drm_mode_object_register(struct drm_device *dev, + struct drm_mode_object *obj) { mutex_lock(&dev->mode_config.idr_mutex); idr_replace(&dev->mode_config.crtc_idr, obj, obj->id); @@ -315,8 +311,8 @@ void drm_mode_object_unregister(struct drm_device *dev, mutex_unlock(&dev->mode_config.idr_mutex); } -static struct drm_mode_object *_object_find(struct drm_device *dev, - uint32_t id, uint32_t type) +struct drm_mode_object *__drm_mode_object_find(struct drm_device *dev, + uint32_t id, uint32_t type) { struct drm_mode_object *obj = NULL; @@ -351,7 +347,7 @@ struct drm_mode_object *drm_mode_object_find(struct drm_device *dev, { struct drm_mode_object *obj = NULL; - obj = _object_find(dev, id, type); + obj = __drm_mode_object_find(dev, id, type); return obj; } EXPORT_SYMBOL(drm_mode_object_find); @@ -407,233 +403,6 @@ int drm_crtc_force_disable(struct drm_crtc *crtc) } EXPORT_SYMBOL(drm_crtc_force_disable); -/** - * drm_crtc_force_disable_all - Forcibly turn off all enabled CRTCs - * @dev: DRM device whose CRTCs to turn off - * - * Drivers may want to call this on unload to ensure that all displays are - * unlit and the GPU is in a consistent, low power state. Takes modeset locks. - * - * Returns: - * Zero on success, error code on failure. - */ -int drm_crtc_force_disable_all(struct drm_device *dev) -{ - struct drm_crtc *crtc; - int ret = 0; - - drm_modeset_lock_all(dev); - drm_for_each_crtc(crtc, dev) - if (crtc->enabled) { - ret = drm_crtc_force_disable(crtc); - if (ret) - goto out; - } -out: - drm_modeset_unlock_all(dev); - return ret; -} -EXPORT_SYMBOL(drm_crtc_force_disable_all); - -static void drm_framebuffer_free(struct kref *kref) -{ - struct drm_framebuffer *fb = - container_of(kref, struct drm_framebuffer, base.refcount); - struct drm_device *dev = fb->dev; - - /* - * The lookup idr holds a weak reference, which has not necessarily been - * removed at this point. Check for that. - */ - drm_mode_object_unregister(dev, &fb->base); - - fb->funcs->destroy(fb); -} - -/** - * drm_framebuffer_init - initialize a framebuffer - * @dev: DRM device - * @fb: framebuffer to be initialized - * @funcs: ... with these functions - * - * Allocates an ID for the framebuffer's parent mode object, sets its mode - * functions & device file and adds it to the master fd list. - * - * IMPORTANT: - * This functions publishes the fb and makes it available for concurrent access - * by other users. Which means by this point the fb _must_ be fully set up - - * since all the fb attributes are invariant over its lifetime, no further - * locking but only correct reference counting is required. - * - * Returns: - * Zero on success, error code on failure. - */ -int drm_framebuffer_init(struct drm_device *dev, struct drm_framebuffer *fb, - const struct drm_framebuffer_funcs *funcs) -{ - int ret; - - INIT_LIST_HEAD(&fb->filp_head); - fb->dev = dev; - fb->funcs = funcs; - - ret = drm_mode_object_get_reg(dev, &fb->base, DRM_MODE_OBJECT_FB, - false, drm_framebuffer_free); - if (ret) - goto out; - - mutex_lock(&dev->mode_config.fb_lock); - dev->mode_config.num_fb++; - list_add(&fb->head, &dev->mode_config.fb_list); - mutex_unlock(&dev->mode_config.fb_lock); - - drm_mode_object_register(dev, &fb->base); -out: - return ret; -} -EXPORT_SYMBOL(drm_framebuffer_init); - -/** - * drm_framebuffer_lookup - look up a drm framebuffer and grab a reference - * @dev: drm device - * @id: id of the fb object - * - * If successful, this grabs an additional reference to the framebuffer - - * callers need to make sure to eventually unreference the returned framebuffer - * again, using @drm_framebuffer_unreference. - */ -struct drm_framebuffer *drm_framebuffer_lookup(struct drm_device *dev, - uint32_t id) -{ - struct drm_mode_object *obj; - struct drm_framebuffer *fb = NULL; - - obj = _object_find(dev, id, DRM_MODE_OBJECT_FB); - if (obj) - fb = obj_to_fb(obj); - return fb; -} -EXPORT_SYMBOL(drm_framebuffer_lookup); - -/** - * drm_framebuffer_unregister_private - unregister a private fb from the lookup idr - * @fb: fb to unregister - * - * Drivers need to call this when cleaning up driver-private framebuffers, e.g. - * those used for fbdev. Note that the caller must hold a reference of it's own, - * i.e. the object may not be destroyed through this call (since it'll lead to a - * locking inversion). - */ -void drm_framebuffer_unregister_private(struct drm_framebuffer *fb) -{ - struct drm_device *dev; - - if (!fb) - return; - - dev = fb->dev; - - /* Mark fb as reaped and drop idr ref. */ - drm_mode_object_unregister(dev, &fb->base); -} -EXPORT_SYMBOL(drm_framebuffer_unregister_private); - -/** - * drm_framebuffer_cleanup - remove a framebuffer object - * @fb: framebuffer to remove - * - * Cleanup framebuffer. This function is intended to be used from the drivers - * ->destroy callback. It can also be used to clean up driver private - * framebuffers embedded into a larger structure. - * - * Note that this function does not remove the fb from active usuage - if it is - * still used anywhere, hilarity can ensue since userspace could call getfb on - * the id and get back -EINVAL. Obviously no concern at driver unload time. - * - * Also, the framebuffer will not be removed from the lookup idr - for - * user-created framebuffers this will happen in in the rmfb ioctl. For - * driver-private objects (e.g. for fbdev) drivers need to explicitly call - * drm_framebuffer_unregister_private. - */ -void drm_framebuffer_cleanup(struct drm_framebuffer *fb) -{ - struct drm_device *dev = fb->dev; - - mutex_lock(&dev->mode_config.fb_lock); - list_del(&fb->head); - dev->mode_config.num_fb--; - mutex_unlock(&dev->mode_config.fb_lock); -} -EXPORT_SYMBOL(drm_framebuffer_cleanup); - -/** - * drm_framebuffer_remove - remove and unreference a framebuffer object - * @fb: framebuffer to remove - * - * Scans all the CRTCs and planes in @dev's mode_config. If they're - * using @fb, removes it, setting it to NULL. Then drops the reference to the - * passed-in framebuffer. Might take the modeset locks. - * - * Note that this function optimizes the cleanup away if the caller holds the - * last reference to the framebuffer. It is also guaranteed to not take the - * modeset locks in this case. - */ -void drm_framebuffer_remove(struct drm_framebuffer *fb) -{ - struct drm_device *dev; - struct drm_crtc *crtc; - struct drm_plane *plane; - - if (!fb) - return; - - dev = fb->dev; - - WARN_ON(!list_empty(&fb->filp_head)); - - /* - * drm ABI mandates that we remove any deleted framebuffers from active - * useage. But since most sane clients only remove framebuffers they no - * longer need, try to optimize this away. - * - * Since we're holding a reference ourselves, observing a refcount of 1 - * means that we're the last holder and can skip it. Also, the refcount - * can never increase from 1 again, so we don't need any barriers or - * locks. - * - * Note that userspace could try to race with use and instate a new - * usage _after_ we've cleared all current ones. End result will be an - * in-use fb with fb-id == 0. Userspace is allowed to shoot its own foot - * in this manner. - */ - if (drm_framebuffer_read_refcount(fb) > 1) { - if (dev->mode_config.funcs->atomic_commit) { - drm_atomic_remove_fb(fb); - goto out; - } - - drm_modeset_lock_all(dev); - /* remove from any CRTC */ - drm_for_each_crtc(crtc, dev) { - if (crtc->primary->fb == fb) { - /* should turn off the crtc */ - if (drm_crtc_force_disable(crtc)) - DRM_ERROR("failed to reset crtc %p when fb was deleted\n", crtc); - } - } - - drm_for_each_plane(plane, dev) { - if (plane->fb == fb) - drm_plane_force_disable(plane); - } - drm_modeset_unlock_all(dev); - } - -out: - drm_framebuffer_unreference(fb); -} -EXPORT_SYMBOL(drm_framebuffer_remove); - DEFINE_WW_CLASS(crtc_ww_class); static unsigned int drm_num_crtcs(struct drm_device *dev) @@ -3010,7 +2779,7 @@ static int drm_mode_cursor_universal(struct drm_crtc *crtc, */ if (req->flags & DRM_MODE_CURSOR_BO) { if (req->handle) { - fb = internal_framebuffer_create(dev, &fbreq, file_priv); + fb = drm_internal_framebuffer_create(dev, &fbreq, file_priv); if (IS_ERR(fb)) { DRM_DEBUG_KMS("failed to wrap cursor buffer in drm framebuffer\n"); return PTR_ERR(fb); @@ -3208,578 +2977,6 @@ uint32_t drm_mode_legacy_fb_format(uint32_t bpp, uint32_t depth) } EXPORT_SYMBOL(drm_mode_legacy_fb_format); -/** - * drm_mode_addfb - add an FB to the graphics configuration - * @dev: drm device for the ioctl - * @data: data pointer for the ioctl - * @file_priv: drm file for the ioctl call - * - * Add a new FB to the specified CRTC, given a user request. This is the - * original addfb ioctl which only supported RGB formats. - * - * Called by the user via ioctl. - * - * Returns: - * Zero on success, negative errno on failure. - */ -int drm_mode_addfb(struct drm_device *dev, - void *data, struct drm_file *file_priv) -{ - struct drm_mode_fb_cmd *or = data; - struct drm_mode_fb_cmd2 r = {}; - int ret; - - /* convert to new format and call new ioctl */ - r.fb_id = or->fb_id; - r.width = or->width; - r.height = or->height; - r.pitches[0] = or->pitch; - r.pixel_format = drm_mode_legacy_fb_format(or->bpp, or->depth); - r.handles[0] = or->handle; - - ret = drm_mode_addfb2(dev, &r, file_priv); - if (ret) - return ret; - - or->fb_id = r.fb_id; - - return 0; -} - -static int format_check(const struct drm_mode_fb_cmd2 *r) -{ - uint32_t format = r->pixel_format & ~DRM_FORMAT_BIG_ENDIAN; - - switch (format) { - case DRM_FORMAT_C8: - case DRM_FORMAT_RGB332: - case DRM_FORMAT_BGR233: - case DRM_FORMAT_XRGB4444: - case DRM_FORMAT_XBGR4444: - case DRM_FORMAT_RGBX4444: - case DRM_FORMAT_BGRX4444: - case DRM_FORMAT_ARGB4444: - case DRM_FORMAT_ABGR4444: - case DRM_FORMAT_RGBA4444: - case DRM_FORMAT_BGRA4444: - case DRM_FORMAT_XRGB1555: - case DRM_FORMAT_XBGR1555: - case DRM_FORMAT_RGBX5551: - case DRM_FORMAT_BGRX5551: - case DRM_FORMAT_ARGB1555: - case DRM_FORMAT_ABGR1555: - case DRM_FORMAT_RGBA5551: - case DRM_FORMAT_BGRA5551: - case DRM_FORMAT_RGB565: - case DRM_FORMAT_BGR565: - case DRM_FORMAT_RGB888: - case DRM_FORMAT_BGR888: - case DRM_FORMAT_XRGB8888: - case DRM_FORMAT_XBGR8888: - case DRM_FORMAT_RGBX8888: - case DRM_FORMAT_BGRX8888: - case DRM_FORMAT_ARGB8888: - case DRM_FORMAT_ABGR8888: - case DRM_FORMAT_RGBA8888: - case DRM_FORMAT_BGRA8888: - case DRM_FORMAT_XRGB2101010: - case DRM_FORMAT_XBGR2101010: - case DRM_FORMAT_RGBX1010102: - case DRM_FORMAT_BGRX1010102: - case DRM_FORMAT_ARGB2101010: - case DRM_FORMAT_ABGR2101010: - case DRM_FORMAT_RGBA1010102: - case DRM_FORMAT_BGRA1010102: - case DRM_FORMAT_YUYV: - case DRM_FORMAT_YVYU: - case DRM_FORMAT_UYVY: - case DRM_FORMAT_VYUY: - case DRM_FORMAT_AYUV: - case DRM_FORMAT_NV12: - case DRM_FORMAT_NV21: - case DRM_FORMAT_NV16: - case DRM_FORMAT_NV61: - case DRM_FORMAT_NV24: - case DRM_FORMAT_NV42: - case DRM_FORMAT_YUV410: - case DRM_FORMAT_YVU410: - case DRM_FORMAT_YUV411: - case DRM_FORMAT_YVU411: - case DRM_FORMAT_YUV420: - case DRM_FORMAT_YVU420: - case DRM_FORMAT_YUV422: - case DRM_FORMAT_YVU422: - case DRM_FORMAT_YUV444: - case DRM_FORMAT_YVU444: - return 0; - default: - DRM_DEBUG_KMS("invalid pixel format %s\n", - drm_get_format_name(r->pixel_format)); - return -EINVAL; - } -} - -static int framebuffer_check(const struct drm_mode_fb_cmd2 *r) -{ - int ret, hsub, vsub, num_planes, i; - - ret = format_check(r); - if (ret) { - DRM_DEBUG_KMS("bad framebuffer format %s\n", - drm_get_format_name(r->pixel_format)); - return ret; - } - - hsub = drm_format_horz_chroma_subsampling(r->pixel_format); - vsub = drm_format_vert_chroma_subsampling(r->pixel_format); - num_planes = drm_format_num_planes(r->pixel_format); - - if (r->width == 0 || r->width % hsub) { - DRM_DEBUG_KMS("bad framebuffer width %u\n", r->width); - return -EINVAL; - } - - if (r->height == 0 || r->height % vsub) { - DRM_DEBUG_KMS("bad framebuffer height %u\n", r->height); - return -EINVAL; - } - - for (i = 0; i < num_planes; i++) { - unsigned int width = r->width / (i != 0 ? hsub : 1); - unsigned int height = r->height / (i != 0 ? vsub : 1); - unsigned int cpp = drm_format_plane_cpp(r->pixel_format, i); - - if (!r->handles[i]) { - DRM_DEBUG_KMS("no buffer object handle for plane %d\n", i); - return -EINVAL; - } - - if ((uint64_t) width * cpp > UINT_MAX) - return -ERANGE; - - if ((uint64_t) height * r->pitches[i] + r->offsets[i] > UINT_MAX) - return -ERANGE; - - if (r->pitches[i] < width * cpp) { - DRM_DEBUG_KMS("bad pitch %u for plane %d\n", r->pitches[i], i); - return -EINVAL; - } - - if (r->modifier[i] && !(r->flags & DRM_MODE_FB_MODIFIERS)) { - DRM_DEBUG_KMS("bad fb modifier %llu for plane %d\n", - r->modifier[i], i); - return -EINVAL; - } - - /* modifier specific checks: */ - switch (r->modifier[i]) { - case DRM_FORMAT_MOD_SAMSUNG_64_32_TILE: - /* NOTE: the pitch restriction may be lifted later if it turns - * out that no hw has this restriction: - */ - if (r->pixel_format != DRM_FORMAT_NV12 || - width % 128 || height % 32 || - r->pitches[i] % 128) { - DRM_DEBUG_KMS("bad modifier data for plane %d\n", i); - return -EINVAL; - } - break; - - default: - break; - } - } - - for (i = num_planes; i < 4; i++) { - if (r->modifier[i]) { - DRM_DEBUG_KMS("non-zero modifier for unused plane %d\n", i); - return -EINVAL; - } - - /* Pre-FB_MODIFIERS userspace didn't clear the structs properly. */ - if (!(r->flags & DRM_MODE_FB_MODIFIERS)) - continue; - - if (r->handles[i]) { - DRM_DEBUG_KMS("buffer object handle for unused plane %d\n", i); - return -EINVAL; - } - - if (r->pitches[i]) { - DRM_DEBUG_KMS("non-zero pitch for unused plane %d\n", i); - return -EINVAL; - } - - if (r->offsets[i]) { - DRM_DEBUG_KMS("non-zero offset for unused plane %d\n", i); - return -EINVAL; - } - } - - return 0; -} - -static struct drm_framebuffer * -internal_framebuffer_create(struct drm_device *dev, - const struct drm_mode_fb_cmd2 *r, - struct drm_file *file_priv) -{ - struct drm_mode_config *config = &dev->mode_config; - struct drm_framebuffer *fb; - int ret; - - if (r->flags & ~(DRM_MODE_FB_INTERLACED | DRM_MODE_FB_MODIFIERS)) { - DRM_DEBUG_KMS("bad framebuffer flags 0x%08x\n", r->flags); - return ERR_PTR(-EINVAL); - } - - if ((config->min_width > r->width) || (r->width > config->max_width)) { - DRM_DEBUG_KMS("bad framebuffer width %d, should be >= %d && <= %d\n", - r->width, config->min_width, config->max_width); - return ERR_PTR(-EINVAL); - } - if ((config->min_height > r->height) || (r->height > config->max_height)) { - DRM_DEBUG_KMS("bad framebuffer height %d, should be >= %d && <= %d\n", - r->height, config->min_height, config->max_height); - return ERR_PTR(-EINVAL); - } - - if (r->flags & DRM_MODE_FB_MODIFIERS && - !dev->mode_config.allow_fb_modifiers) { - DRM_DEBUG_KMS("driver does not support fb modifiers\n"); - return ERR_PTR(-EINVAL); - } - - ret = framebuffer_check(r); - if (ret) - return ERR_PTR(ret); - - fb = dev->mode_config.funcs->fb_create(dev, file_priv, r); - if (IS_ERR(fb)) { - DRM_DEBUG_KMS("could not create framebuffer\n"); - return fb; - } - - return fb; -} - -/** - * drm_mode_addfb2 - add an FB to the graphics configuration - * @dev: drm device for the ioctl - * @data: data pointer for the ioctl - * @file_priv: drm file for the ioctl call - * - * Add a new FB to the specified CRTC, given a user request with format. This is - * the 2nd version of the addfb ioctl, which supports multi-planar framebuffers - * and uses fourcc codes as pixel format specifiers. - * - * Called by the user via ioctl. - * - * Returns: - * Zero on success, negative errno on failure. - */ -int drm_mode_addfb2(struct drm_device *dev, - void *data, struct drm_file *file_priv) -{ - struct drm_mode_fb_cmd2 *r = data; - struct drm_framebuffer *fb; - - if (!drm_core_check_feature(dev, DRIVER_MODESET)) - return -EINVAL; - - fb = internal_framebuffer_create(dev, r, file_priv); - if (IS_ERR(fb)) - return PTR_ERR(fb); - - DRM_DEBUG_KMS("[FB:%d]\n", fb->base.id); - r->fb_id = fb->base.id; - - /* Transfer ownership to the filp for reaping on close */ - mutex_lock(&file_priv->fbs_lock); - list_add(&fb->filp_head, &file_priv->fbs); - mutex_unlock(&file_priv->fbs_lock); - - return 0; -} - -struct drm_mode_rmfb_work { - struct work_struct work; - struct list_head fbs; -}; - -static void drm_mode_rmfb_work_fn(struct work_struct *w) -{ - struct drm_mode_rmfb_work *arg = container_of(w, typeof(*arg), work); - - while (!list_empty(&arg->fbs)) { - struct drm_framebuffer *fb = - list_first_entry(&arg->fbs, typeof(*fb), filp_head); - - list_del_init(&fb->filp_head); - drm_framebuffer_remove(fb); - } -} - -/** - * drm_mode_rmfb - remove an FB from the configuration - * @dev: drm device for the ioctl - * @data: data pointer for the ioctl - * @file_priv: drm file for the ioctl call - * - * Remove the FB specified by the user. - * - * Called by the user via ioctl. - * - * Returns: - * Zero on success, negative errno on failure. - */ -int drm_mode_rmfb(struct drm_device *dev, - void *data, struct drm_file *file_priv) -{ - struct drm_framebuffer *fb = NULL; - struct drm_framebuffer *fbl = NULL; - uint32_t *id = data; - int found = 0; - - if (!drm_core_check_feature(dev, DRIVER_MODESET)) - return -EINVAL; - - fb = drm_framebuffer_lookup(dev, *id); - if (!fb) - return -ENOENT; - - mutex_lock(&file_priv->fbs_lock); - list_for_each_entry(fbl, &file_priv->fbs, filp_head) - if (fb == fbl) - found = 1; - if (!found) { - mutex_unlock(&file_priv->fbs_lock); - goto fail_unref; - } - - list_del_init(&fb->filp_head); - mutex_unlock(&file_priv->fbs_lock); - - /* drop the reference we picked up in framebuffer lookup */ - drm_framebuffer_unreference(fb); - - /* - * we now own the reference that was stored in the fbs list - * - * drm_framebuffer_remove may fail with -EINTR on pending signals, - * so run this in a separate stack as there's no way to correctly - * handle this after the fb is already removed from the lookup table. - */ - if (drm_framebuffer_read_refcount(fb) > 1) { - struct drm_mode_rmfb_work arg; - - INIT_WORK_ONSTACK(&arg.work, drm_mode_rmfb_work_fn); - INIT_LIST_HEAD(&arg.fbs); - list_add_tail(&fb->filp_head, &arg.fbs); - - schedule_work(&arg.work); - flush_work(&arg.work); - destroy_work_on_stack(&arg.work); - } else - drm_framebuffer_unreference(fb); - - return 0; - -fail_unref: - drm_framebuffer_unreference(fb); - return -ENOENT; -} - -/** - * drm_mode_getfb - get FB info - * @dev: drm device for the ioctl - * @data: data pointer for the ioctl - * @file_priv: drm file for the ioctl call - * - * Lookup the FB given its ID and return info about it. - * - * Called by the user via ioctl. - * - * Returns: - * Zero on success, negative errno on failure. - */ -int drm_mode_getfb(struct drm_device *dev, - void *data, struct drm_file *file_priv) -{ - struct drm_mode_fb_cmd *r = data; - struct drm_framebuffer *fb; - int ret; - - if (!drm_core_check_feature(dev, DRIVER_MODESET)) - return -EINVAL; - - fb = drm_framebuffer_lookup(dev, r->fb_id); - if (!fb) - return -ENOENT; - - r->height = fb->height; - r->width = fb->width; - r->depth = fb->depth; - r->bpp = fb->bits_per_pixel; - r->pitch = fb->pitches[0]; - if (fb->funcs->create_handle) { - if (drm_is_current_master(file_priv) || capable(CAP_SYS_ADMIN) || - drm_is_control_client(file_priv)) { - ret = fb->funcs->create_handle(fb, file_priv, - &r->handle); - } else { - /* GET_FB() is an unprivileged ioctl so we must not - * return a buffer-handle to non-master processes! For - * backwards-compatibility reasons, we cannot make - * GET_FB() privileged, so just return an invalid handle - * for non-masters. */ - r->handle = 0; - ret = 0; - } - } else { - ret = -ENODEV; - } - - drm_framebuffer_unreference(fb); - - return ret; -} - -/** - * drm_mode_dirtyfb_ioctl - flush frontbuffer rendering on an FB - * @dev: drm device for the ioctl - * @data: data pointer for the ioctl - * @file_priv: drm file for the ioctl call - * - * Lookup the FB and flush out the damaged area supplied by userspace as a clip - * rectangle list. Generic userspace which does frontbuffer rendering must call - * this ioctl to flush out the changes on manual-update display outputs, e.g. - * usb display-link, mipi manual update panels or edp panel self refresh modes. - * - * Modesetting drivers which always update the frontbuffer do not need to - * implement the corresponding ->dirty framebuffer callback. - * - * Called by the user via ioctl. - * - * Returns: - * Zero on success, negative errno on failure. - */ -int drm_mode_dirtyfb_ioctl(struct drm_device *dev, - void *data, struct drm_file *file_priv) -{ - struct drm_clip_rect __user *clips_ptr; - struct drm_clip_rect *clips = NULL; - struct drm_mode_fb_dirty_cmd *r = data; - struct drm_framebuffer *fb; - unsigned flags; - int num_clips; - int ret; - - if (!drm_core_check_feature(dev, DRIVER_MODESET)) - return -EINVAL; - - fb = drm_framebuffer_lookup(dev, r->fb_id); - if (!fb) - return -ENOENT; - - num_clips = r->num_clips; - clips_ptr = (struct drm_clip_rect __user *)(unsigned long)r->clips_ptr; - - if (!num_clips != !clips_ptr) { - ret = -EINVAL; - goto out_err1; - } - - flags = DRM_MODE_FB_DIRTY_FLAGS & r->flags; - - /* If userspace annotates copy, clips must come in pairs */ - if (flags & DRM_MODE_FB_DIRTY_ANNOTATE_COPY && (num_clips % 2)) { - ret = -EINVAL; - goto out_err1; - } - - if (num_clips && clips_ptr) { - if (num_clips < 0 || num_clips > DRM_MODE_FB_DIRTY_MAX_CLIPS) { - ret = -EINVAL; - goto out_err1; - } - clips = kcalloc(num_clips, sizeof(*clips), GFP_KERNEL); - if (!clips) { - ret = -ENOMEM; - goto out_err1; - } - - ret = copy_from_user(clips, clips_ptr, - num_clips * sizeof(*clips)); - if (ret) { - ret = -EFAULT; - goto out_err2; - } - } - - if (fb->funcs->dirty) { - ret = fb->funcs->dirty(fb, file_priv, flags, r->color, - clips, num_clips); - } else { - ret = -ENOSYS; - } - -out_err2: - kfree(clips); -out_err1: - drm_framebuffer_unreference(fb); - - return ret; -} - -/** - * drm_fb_release - remove and free the FBs on this file - * @priv: drm file for the ioctl - * - * Destroy all the FBs associated with @filp. - * - * Called by the user via ioctl. - * - * Returns: - * Zero on success, negative errno on failure. - */ -void drm_fb_release(struct drm_file *priv) -{ - struct drm_framebuffer *fb, *tfb; - struct drm_mode_rmfb_work arg; - - INIT_LIST_HEAD(&arg.fbs); - - /* - * When the file gets released that means no one else can access the fb - * list any more, so no need to grab fpriv->fbs_lock. And we need to - * avoid upsetting lockdep since the universal cursor code adds a - * framebuffer while holding mutex locks. - * - * Note that a real deadlock between fpriv->fbs_lock and the modeset - * locks is impossible here since no one else but this function can get - * at it any more. - */ - list_for_each_entry_safe(fb, tfb, &priv->fbs, filp_head) { - if (drm_framebuffer_read_refcount(fb) > 1) { - list_move_tail(&fb->filp_head, &arg.fbs); - } else { - list_del_init(&fb->filp_head); - - /* This drops the fpriv->fbs reference. */ - drm_framebuffer_unreference(fb); - } - } - - if (!list_empty(&arg.fbs)) { - INIT_WORK_ONSTACK(&arg.work, drm_mode_rmfb_work_fn); - - schedule_work(&arg.work); - flush_work(&arg.work); - destroy_work_on_stack(&arg.work); - } -} - static bool drm_property_type_valid(struct drm_property *property) { if (property->flags & DRM_MODE_PROP_EXTENDED_TYPE) @@ -4492,7 +3689,7 @@ struct drm_property_blob *drm_property_lookup_blob(struct drm_device *dev, struct drm_mode_object *obj; struct drm_property_blob *blob = NULL; - obj = _object_find(dev, id, DRM_MODE_OBJECT_BLOB); + obj = __drm_mode_object_find(dev, id, DRM_MODE_OBJECT_BLOB); if (obj) blob = obj_to_blob(obj); return blob; @@ -4888,7 +4085,8 @@ bool drm_property_change_valid_get(struct drm_property *property, if (value == 0) return true; - *ref = _object_find(property->dev, value, property->values[0]); + *ref = __drm_mode_object_find(property->dev, value, + property->values[0]); return *ref != NULL; } diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h index 3ea72e1780b1..5f1e9ff71ae4 100644 --- a/drivers/gpu/drm/drm_crtc_internal.h +++ b/drivers/gpu/drm/drm_crtc_internal.h @@ -35,8 +35,17 @@ /* drm_crtc.c */ void drm_connector_ida_init(void); void drm_connector_ida_destroy(void); +int drm_mode_object_get_reg(struct drm_device *dev, + struct drm_mode_object *obj, + uint32_t obj_type, + bool register_obj, + void (*obj_free_cb)(struct kref *kref)); +void drm_mode_object_register(struct drm_device *dev, + struct drm_mode_object *obj); int drm_mode_object_get(struct drm_device *dev, struct drm_mode_object *obj, uint32_t obj_type); +struct drm_mode_object *__drm_mode_object_find(struct drm_device *dev, + uint32_t id, uint32_t type); void drm_mode_object_unregister(struct drm_device *dev, struct drm_mode_object *object); bool drm_property_change_valid_get(struct drm_property *property, @@ -64,18 +73,6 @@ int drm_mode_mmap_dumb_ioctl(struct drm_device *dev, int drm_mode_destroy_dumb_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv); -/* framebuffer IOCTLs */ -extern int drm_mode_addfb(struct drm_device *dev, - void *data, struct drm_file *file_priv); -extern int drm_mode_addfb2(struct drm_device *dev, - void *data, struct drm_file *file_priv); -int drm_mode_rmfb(struct drm_device *dev, - void *data, struct drm_file *file_priv); -int drm_mode_getfb(struct drm_device *dev, - void *data, struct drm_file *file_priv); -int drm_mode_dirtyfb_ioctl(struct drm_device *dev, - void *data, struct drm_file *file_priv); - /* IOCTLs */ int drm_mode_obj_get_properties_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv); @@ -120,6 +117,25 @@ int drm_mode_gamma_set_ioctl(struct drm_device *dev, int drm_mode_page_flip_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv); +/* drm_framebuffer.c */ +struct drm_framebuffer * +drm_internal_framebuffer_create(struct drm_device *dev, + const struct drm_mode_fb_cmd2 *r, + struct drm_file *file_priv); +void drm_framebuffer_free(struct kref *kref); + +/* IOCTL */ +int drm_mode_addfb(struct drm_device *dev, + void *data, struct drm_file *file_priv); +int drm_mode_addfb2(struct drm_device *dev, + void *data, struct drm_file *file_priv); +int drm_mode_rmfb(struct drm_device *dev, + void *data, struct drm_file *file_priv); +int drm_mode_getfb(struct drm_device *dev, + void *data, struct drm_file *file_priv); +int drm_mode_dirtyfb_ioctl(struct drm_device *dev, + void *data, struct drm_file *file_priv); + /* drm_atomic.c */ int drm_atomic_get_property(struct drm_mode_object *obj, struct drm_property *property, uint64_t *val); diff --git a/drivers/gpu/drm/drm_framebuffer.c b/drivers/gpu/drm/drm_framebuffer.c new file mode 100644 index 000000000000..c7a8a623b336 --- /dev/null +++ b/drivers/gpu/drm/drm_framebuffer.c @@ -0,0 +1,827 @@ +/* + * Copyright (c) 2016 Intel Corporation + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that copyright + * notice and this permission notice appear in supporting documentation, and + * that the name of the copyright holders not be used in advertising or + * publicity pertaining to distribution of the software without specific, + * written prior permission. The copyright holders make no representations + * about the suitability of this software for any purpose. It is provided "as + * is" without express or implied warranty. + * + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * OF THIS SOFTWARE. + */ + +#include <linux/export.h> +#include <drm/drmP.h> +#include <drm/drm_auth.h> +#include <drm/drm_framebuffer.h> + +#include "drm_crtc_internal.h" + +/** + * drm_mode_addfb - add an FB to the graphics configuration + * @dev: drm device for the ioctl + * @data: data pointer for the ioctl + * @file_priv: drm file for the ioctl call + * + * Add a new FB to the specified CRTC, given a user request. This is the + * original addfb ioctl which only supported RGB formats. + * + * Called by the user via ioctl. + * + * Returns: + * Zero on success, negative errno on failure. + */ +int drm_mode_addfb(struct drm_device *dev, + void *data, struct drm_file *file_priv) +{ + struct drm_mode_fb_cmd *or = data; + struct drm_mode_fb_cmd2 r = {}; + int ret; + + /* convert to new format and call new ioctl */ + r.fb_id = or->fb_id; + r.width = or->width; + r.height = or->height; + r.pitches[0] = or->pitch; + r.pixel_format = drm_mode_legacy_fb_format(or->bpp, or->depth); + r.handles[0] = or->handle; + + ret = drm_mode_addfb2(dev, &r, file_priv); + if (ret) + return ret; + + or->fb_id = r.fb_id; + + return 0; +} + +static int format_check(const struct drm_mode_fb_cmd2 *r) +{ + uint32_t format = r->pixel_format & ~DRM_FORMAT_BIG_ENDIAN; + + switch (format) { + case DRM_FORMAT_C8: + case DRM_FORMAT_RGB332: + case DRM_FORMAT_BGR233: + case DRM_FORMAT_XRGB4444: + case DRM_FORMAT_XBGR4444: + case DRM_FORMAT_RGBX4444: + case DRM_FORMAT_BGRX4444: + case DRM_FORMAT_ARGB4444: + case DRM_FORMAT_ABGR4444: + case DRM_FORMAT_RGBA4444: + case DRM_FORMAT_BGRA4444: + case DRM_FORMAT_XRGB1555: + case DRM_FORMAT_XBGR1555: + case DRM_FORMAT_RGBX5551: + case DRM_FORMAT_BGRX5551: + case DRM_FORMAT_ARGB1555: + case DRM_FORMAT_ABGR1555: + case DRM_FORMAT_RGBA5551: + case DRM_FORMAT_BGRA5551: + case DRM_FORMAT_RGB565: + case DRM_FORMAT_BGR565: + case DRM_FORMAT_RGB888: + case DRM_FORMAT_BGR888: + case DRM_FORMAT_XRGB8888: + case DRM_FORMAT_XBGR8888: + case DRM_FORMAT_RGBX8888: + case DRM_FORMAT_BGRX8888: + case DRM_FORMAT_ARGB8888: + case DRM_FORMAT_ABGR8888: + case DRM_FORMAT_RGBA8888: + case DRM_FORMAT_BGRA8888: + case DRM_FORMAT_XRGB2101010: + case DRM_FORMAT_XBGR2101010: + case DRM_FORMAT_RGBX1010102: + case DRM_FORMAT_BGRX1010102: + case DRM_FORMAT_ARGB2101010: + case DRM_FORMAT_ABGR2101010: + case DRM_FORMAT_RGBA1010102: + case DRM_FORMAT_BGRA1010102: + case DRM_FORMAT_YUYV: + case DRM_FORMAT_YVYU: + case DRM_FORMAT_UYVY: + case DRM_FORMAT_VYUY: + case DRM_FORMAT_AYUV: + case DRM_FORMAT_NV12: + case DRM_FORMAT_NV21: + case DRM_FORMAT_NV16: + case DRM_FORMAT_NV61: + case DRM_FORMAT_NV24: + case DRM_FORMAT_NV42: + case DRM_FORMAT_YUV410: + case DRM_FORMAT_YVU410: + case DRM_FORMAT_YUV411: + case DRM_FORMAT_YVU411: + case DRM_FORMAT_YUV420: + case DRM_FORMAT_YVU420: + case DRM_FORMAT_YUV422: + case DRM_FORMAT_YVU422: + case DRM_FORMAT_YUV444: + case DRM_FORMAT_YVU444: + return 0; + default: + DRM_DEBUG_KMS("invalid pixel format %s\n", + drm_get_format_name(r->pixel_format)); + return -EINVAL; + } +} + +static int framebuffer_check(const struct drm_mode_fb_cmd2 *r) +{ + int ret, hsub, vsub, num_planes, i; + + ret = format_check(r); + if (ret) { + DRM_DEBUG_KMS("bad framebuffer format %s\n", + drm_get_format_name(r->pixel_format)); + return ret; + } + + hsub = drm_format_horz_chroma_subsampling(r->pixel_format); + vsub = drm_format_vert_chroma_subsampling(r->pixel_format); + num_planes = drm_format_num_planes(r->pixel_format); + + if (r->width == 0 || r->width % hsub) { + DRM_DEBUG_KMS("bad framebuffer width %u\n", r->width); + return -EINVAL; + } + + if (r->height == 0 || r->height % vsub) { + DRM_DEBUG_KMS("bad framebuffer height %u\n", r->height); + return -EINVAL; + } + + for (i = 0; i < num_planes; i++) { + unsigned int width = r->width / (i != 0 ? hsub : 1); + unsigned int height = r->height / (i != 0 ? vsub : 1); + unsigned int cpp = drm_format_plane_cpp(r->pixel_format, i); + + if (!r->handles[i]) { + DRM_DEBUG_KMS("no buffer object handle for plane %d\n", i); + return -EINVAL; + } + + if ((uint64_t) width * cpp > UINT_MAX) + return -ERANGE; + + if ((uint64_t) height * r->pitches[i] + r->offsets[i] > UINT_MAX) + return -ERANGE; + + if (r->pitches[i] < width * cpp) { + DRM_DEBUG_KMS("bad pitch %u for plane %d\n", r->pitches[i], i); + return -EINVAL; + } + + if (r->modifier[i] && !(r->flags & DRM_MODE_FB_MODIFIERS)) { + DRM_DEBUG_KMS("bad fb modifier %llu for plane %d\n", + r->modifier[i], i); + return -EINVAL; + } + + /* modifier specific checks: */ + switch (r->modifier[i]) { + case DRM_FORMAT_MOD_SAMSUNG_64_32_TILE: + /* NOTE: the pitch restriction may be lifted later if it turns + * out that no hw has this restriction: + */ + if (r->pixel_format != DRM_FORMAT_NV12 || + width % 128 || height % 32 || + r->pitches[i] % 128) { + DRM_DEBUG_KMS("bad modifier data for plane %d\n", i); + return -EINVAL; + } + break; + + default: + break; + } + } + + for (i = num_planes; i < 4; i++) { + if (r->modifier[i]) { + DRM_DEBUG_KMS("non-zero modifier for unused plane %d\n", i); + return -EINVAL; + } + + /* Pre-FB_MODIFIERS userspace didn't clear the structs properly. */ + if (!(r->flags & DRM_MODE_FB_MODIFIERS)) + continue; + + if (r->handles[i]) { + DRM_DEBUG_KMS("buffer object handle for unused plane %d\n", i); + return -EINVAL; + } + + if (r->pitches[i]) { + DRM_DEBUG_KMS("non-zero pitch for unused plane %d\n", i); + return -EINVAL; + } + + if (r->offsets[i]) { + DRM_DEBUG_KMS("non-zero offset for unused plane %d\n", i); + return -EINVAL; + } + } + + return 0; +} + +struct drm_framebuffer * +drm_internal_framebuffer_create(struct drm_device *dev, + const struct drm_mode_fb_cmd2 *r, + struct drm_file *file_priv) +{ + struct drm_mode_config *config = &dev->mode_config; + struct drm_framebuffer *fb; + int ret; + + if (r->flags & ~(DRM_MODE_FB_INTERLACED | DRM_MODE_FB_MODIFIERS)) { + DRM_DEBUG_KMS("bad framebuffer flags 0x%08x\n", r->flags); + return ERR_PTR(-EINVAL); + } + + if ((config->min_width > r->width) || (r->width > config->max_width)) { + DRM_DEBUG_KMS("bad framebuffer width %d, should be >= %d && <= %d\n", + r->width, config->min_width, config->max_width); + return ERR_PTR(-EINVAL); + } + if ((config->min_height > r->height) || (r->height > config->max_height)) { + DRM_DEBUG_KMS("bad framebuffer height %d, should be >= %d && <= %d\n", + r->height, config->min_height, config->max_height); + return ERR_PTR(-EINVAL); + } + + if (r->flags & DRM_MODE_FB_MODIFIERS && + !dev->mode_config.allow_fb_modifiers) { + DRM_DEBUG_KMS("driver does not support fb modifiers\n"); + return ERR_PTR(-EINVAL); + } + + ret = framebuffer_check(r); + if (ret) + return ERR_PTR(ret); + + fb = dev->mode_config.funcs->fb_create(dev, file_priv, r); + if (IS_ERR(fb)) { + DRM_DEBUG_KMS("could not create framebuffer\n"); + return fb; + } + + return fb; +} + +/** + * drm_mode_addfb2 - add an FB to the graphics configuration + * @dev: drm device for the ioctl + * @data: data pointer for the ioctl + * @file_priv: drm file for the ioctl call + * + * Add a new FB to the specified CRTC, given a user request with format. This is + * the 2nd version of the addfb ioctl, which supports multi-planar framebuffers + * and uses fourcc codes as pixel format specifiers. + * + * Called by the user via ioctl. + * + * Returns: + * Zero on success, negative errno on failure. + */ +int drm_mode_addfb2(struct drm_device *dev, + void *data, struct drm_file *file_priv) +{ + struct drm_mode_fb_cmd2 *r = data; + struct drm_framebuffer *fb; + + if (!drm_core_check_feature(dev, DRIVER_MODESET)) + return -EINVAL; + + fb = drm_internal_framebuffer_create(dev, r, file_priv); + if (IS_ERR(fb)) + return PTR_ERR(fb); + + DRM_DEBUG_KMS("[FB:%d]\n", fb->base.id); + r->fb_id = fb->base.id; + + /* Transfer ownership to the filp for reaping on close */ + mutex_lock(&file_priv->fbs_lock); + list_add(&fb->filp_head, &file_priv->fbs); + mutex_unlock(&file_priv->fbs_lock); + + return 0; +} + +struct drm_mode_rmfb_work { + struct work_struct work; + struct list_head fbs; +}; + +static void drm_mode_rmfb_work_fn(struct work_struct *w) +{ + struct drm_mode_rmfb_work *arg = container_of(w, typeof(*arg), work); + + while (!list_empty(&arg->fbs)) { + struct drm_framebuffer *fb = + list_first_entry(&arg->fbs, typeof(*fb), filp_head); + + list_del_init(&fb->filp_head); + drm_framebuffer_remove(fb); + } +} + +/** + * drm_mode_rmfb - remove an FB from the configuration + * @dev: drm device for the ioctl + * @data: data pointer for the ioctl + * @file_priv: drm file for the ioctl call + * + * Remove the FB specified by the user. + * + * Called by the user via ioctl. + * + * Returns: + * Zero on success, negative errno on failure. + */ +int drm_mode_rmfb(struct drm_device *dev, + void *data, struct drm_file *file_priv) +{ + struct drm_framebuffer *fb = NULL; + struct drm_framebuffer *fbl = NULL; + uint32_t *id = data; + int found = 0; + + if (!drm_core_check_feature(dev, DRIVER_MODESET)) + return -EINVAL; + + fb = drm_framebuffer_lookup(dev, *id); + if (!fb) + return -ENOENT; + + mutex_lock(&file_priv->fbs_lock); + list_for_each_entry(fbl, &file_priv->fbs, filp_head) + if (fb == fbl) + found = 1; + if (!found) { + mutex_unlock(&file_priv->fbs_lock); + goto fail_unref; + } + + list_del_init(&fb->filp_head); + mutex_unlock(&file_priv->fbs_lock); + + /* drop the reference we picked up in framebuffer lookup */ + drm_framebuffer_unreference(fb); + + /* + * we now own the reference that was stored in the fbs list + * + * drm_framebuffer_remove may fail with -EINTR on pending signals, + * so run this in a separate stack as there's no way to correctly + * handle this after the fb is already removed from the lookup table. + */ + if (drm_framebuffer_read_refcount(fb) > 1) { + struct drm_mode_rmfb_work arg; + + INIT_WORK_ONSTACK(&arg.work, drm_mode_rmfb_work_fn); + INIT_LIST_HEAD(&arg.fbs); + list_add_tail(&fb->filp_head, &arg.fbs); + + schedule_work(&arg.work); + flush_work(&arg.work); + destroy_work_on_stack(&arg.work); + } else + drm_framebuffer_unreference(fb); + + return 0; + +fail_unref: + drm_framebuffer_unreference(fb); + return -ENOENT; +} + +/** + * drm_mode_getfb - get FB info + * @dev: drm device for the ioctl + * @data: data pointer for the ioctl + * @file_priv: drm file for the ioctl call + * + * Lookup the FB given its ID and return info about it. + * + * Called by the user via ioctl. + * + * Returns: + * Zero on success, negative errno on failure. + */ +int drm_mode_getfb(struct drm_device *dev, + void *data, struct drm_file *file_priv) +{ + struct drm_mode_fb_cmd *r = data; + struct drm_framebuffer *fb; + int ret; + + if (!drm_core_check_feature(dev, DRIVER_MODESET)) + return -EINVAL; + + fb = drm_framebuffer_lookup(dev, r->fb_id); + if (!fb) + return -ENOENT; + + r->height = fb->height; + r->width = fb->width; + r->depth = fb->depth; + r->bpp = fb->bits_per_pixel; + r->pitch = fb->pitches[0]; + if (fb->funcs->create_handle) { + if (drm_is_current_master(file_priv) || capable(CAP_SYS_ADMIN) || + drm_is_control_client(file_priv)) { + ret = fb->funcs->create_handle(fb, file_priv, + &r->handle); + } else { + /* GET_FB() is an unprivileged ioctl so we must not + * return a buffer-handle to non-master processes! For + * backwards-compatibility reasons, we cannot make + * GET_FB() privileged, so just return an invalid handle + * for non-masters. */ + r->handle = 0; + ret = 0; + } + } else { + ret = -ENODEV; + } + + drm_framebuffer_unreference(fb); + + return ret; +} + +/** + * drm_mode_dirtyfb_ioctl - flush frontbuffer rendering on an FB + * @dev: drm device for the ioctl + * @data: data pointer for the ioctl + * @file_priv: drm file for the ioctl call + * + * Lookup the FB and flush out the damaged area supplied by userspace as a clip + * rectangle list. Generic userspace which does frontbuffer rendering must call + * this ioctl to flush out the changes on manual-update display outputs, e.g. + * usb display-link, mipi manual update panels or edp panel self refresh modes. + * + * Modesetting drivers which always update the frontbuffer do not need to + * implement the corresponding ->dirty framebuffer callback. + * + * Called by the user via ioctl. + * + * Returns: + * Zero on success, negative errno on failure. + */ +int drm_mode_dirtyfb_ioctl(struct drm_device *dev, + void *data, struct drm_file *file_priv) +{ + struct drm_clip_rect __user *clips_ptr; + struct drm_clip_rect *clips = NULL; + struct drm_mode_fb_dirty_cmd *r = data; + struct drm_framebuffer *fb; + unsigned flags; + int num_clips; + int ret; + + if (!drm_core_check_feature(dev, DRIVER_MODESET)) + return -EINVAL; + + fb = drm_framebuffer_lookup(dev, r->fb_id); + if (!fb) + return -ENOENT; + + num_clips = r->num_clips; + clips_ptr = (struct drm_clip_rect __user *)(unsigned long)r->clips_ptr; + + if (!num_clips != !clips_ptr) { + ret = -EINVAL; + goto out_err1; + } + + flags = DRM_MODE_FB_DIRTY_FLAGS & r->flags; + + /* If userspace annotates copy, clips must come in pairs */ + if (flags & DRM_MODE_FB_DIRTY_ANNOTATE_COPY && (num_clips % 2)) { + ret = -EINVAL; + goto out_err1; + } + + if (num_clips && clips_ptr) { + if (num_clips < 0 || num_clips > DRM_MODE_FB_DIRTY_MAX_CLIPS) { + ret = -EINVAL; + goto out_err1; + } + clips = kcalloc(num_clips, sizeof(*clips), GFP_KERNEL); + if (!clips) { + ret = -ENOMEM; + goto out_err1; + } + + ret = copy_from_user(clips, clips_ptr, + num_clips * sizeof(*clips)); + if (ret) { + ret = -EFAULT; + goto out_err2; + } + } + + if (fb->funcs->dirty) { + ret = fb->funcs->dirty(fb, file_priv, flags, r->color, + clips, num_clips); + } else { + ret = -ENOSYS; + } + +out_err2: + kfree(clips); +out_err1: + drm_framebuffer_unreference(fb); + + return ret; +} + +/** + * drm_fb_release - remove and free the FBs on this file + * @priv: drm file for the ioctl + * + * Destroy all the FBs associated with @filp. + * + * Called by the user via ioctl. + * + * Returns: + * Zero on success, negative errno on failure. + */ +void drm_fb_release(struct drm_file *priv) +{ + struct drm_framebuffer *fb, *tfb; + struct drm_mode_rmfb_work arg; + + INIT_LIST_HEAD(&arg.fbs); + + /* + * When the file gets released that means no one else can access the fb + * list any more, so no need to grab fpriv->fbs_lock. And we need to + * avoid upsetting lockdep since the universal cursor code adds a + * framebuffer while holding mutex locks. + * + * Note that a real deadlock between fpriv->fbs_lock and the modeset + * locks is impossible here since no one else but this function can get + * at it any more. + */ + list_for_each_entry_safe(fb, tfb, &priv->fbs, filp_head) { + if (drm_framebuffer_read_refcount(fb) > 1) { + list_move_tail(&fb->filp_head, &arg.fbs); + } else { + list_del_init(&fb->filp_head); + + /* This drops the fpriv->fbs reference. */ + drm_framebuffer_unreference(fb); + } + } + + if (!list_empty(&arg.fbs)) { + INIT_WORK_ONSTACK(&arg.work, drm_mode_rmfb_work_fn); + + schedule_work(&arg.work); + flush_work(&arg.work); + destroy_work_on_stack(&arg.work); + } +} + +/** + * drm_crtc_force_disable_all - Forcibly turn off all enabled CRTCs + * @dev: DRM device whose CRTCs to turn off + * + * Drivers may want to call this on unload to ensure that all displays are + * unlit and the GPU is in a consistent, low power state. Takes modeset locks. + * + * Returns: + * Zero on success, error code on failure. + */ +int drm_crtc_force_disable_all(struct drm_device *dev) +{ + struct drm_crtc *crtc; + int ret = 0; + + drm_modeset_lock_all(dev); + drm_for_each_crtc(crtc, dev) + if (crtc->enabled) { + ret = drm_crtc_force_disable(crtc); + if (ret) + goto out; + } +out: + drm_modeset_unlock_all(dev); + return ret; +} +EXPORT_SYMBOL(drm_crtc_force_disable_all); + +void drm_framebuffer_free(struct kref *kref) +{ + struct drm_framebuffer *fb = + container_of(kref, struct drm_framebuffer, base.refcount); + struct drm_device *dev = fb->dev; + + /* + * The lookup idr holds a weak reference, which has not necessarily been + * removed at this point. Check for that. + */ + drm_mode_object_unregister(dev, &fb->base); + + fb->funcs->destroy(fb); +} + +/** + * drm_framebuffer_init - initialize a framebuffer + * @dev: DRM device + * @fb: framebuffer to be initialized + * @funcs: ... with these functions + * + * Allocates an ID for the framebuffer's parent mode object, sets its mode + * functions & device file and adds it to the master fd list. + * + * IMPORTANT: + * This functions publishes the fb and makes it available for concurrent access + * by other users. Which means by this point the fb _must_ be fully set up - + * since all the fb attributes are invariant over its lifetime, no further + * locking but only correct reference counting is required. + * + * Returns: + * Zero on success, error code on failure. + */ +int drm_framebuffer_init(struct drm_device *dev, struct drm_framebuffer *fb, + const struct drm_framebuffer_funcs *funcs) +{ + int ret; + + INIT_LIST_HEAD(&fb->filp_head); + fb->dev = dev; + fb->funcs = funcs; + + ret = drm_mode_object_get_reg(dev, &fb->base, DRM_MODE_OBJECT_FB, + false, drm_framebuffer_free); + if (ret) + goto out; + + mutex_lock(&dev->mode_config.fb_lock); + dev->mode_config.num_fb++; + list_add(&fb->head, &dev->mode_config.fb_list); + mutex_unlock(&dev->mode_config.fb_lock); + + drm_mode_object_register(dev, &fb->base); +out: + return ret; +} +EXPORT_SYMBOL(drm_framebuffer_init); + +/** + * drm_framebuffer_lookup - look up a drm framebuffer and grab a reference + * @dev: drm device + * @id: id of the fb object + * + * If successful, this grabs an additional reference to the framebuffer - + * callers need to make sure to eventually unreference the returned framebuffer + * again, using @drm_framebuffer_unreference. + */ +struct drm_framebuffer *drm_framebuffer_lookup(struct drm_device *dev, + uint32_t id) +{ + struct drm_mode_object *obj; + struct drm_framebuffer *fb = NULL; + + obj = __drm_mode_object_find(dev, id, DRM_MODE_OBJECT_FB); + if (obj) + fb = obj_to_fb(obj); + return fb; +} +EXPORT_SYMBOL(drm_framebuffer_lookup); + +/** + * drm_framebuffer_unregister_private - unregister a private fb from the lookup idr + * @fb: fb to unregister + * + * Drivers need to call this when cleaning up driver-private framebuffers, e.g. + * those used for fbdev. Note that the caller must hold a reference of it's own, + * i.e. the object may not be destroyed through this call (since it'll lead to a + * locking inversion). + */ +void drm_framebuffer_unregister_private(struct drm_framebuffer *fb) +{ + struct drm_device *dev; + + if (!fb) + return; + + dev = fb->dev; + + /* Mark fb as reaped and drop idr ref. */ + drm_mode_object_unregister(dev, &fb->base); +} +EXPORT_SYMBOL(drm_framebuffer_unregister_private); + +/** + * drm_framebuffer_cleanup - remove a framebuffer object + * @fb: framebuffer to remove + * + * Cleanup framebuffer. This function is intended to be used from the drivers + * ->destroy callback. It can also be used to clean up driver private + * framebuffers embedded into a larger structure. + * + * Note that this function does not remove the fb from active usuage - if it is + * still used anywhere, hilarity can ensue since userspace could call getfb on + * the id and get back -EINVAL. Obviously no concern at driver unload time. + * + * Also, the framebuffer will not be removed from the lookup idr - for + * user-created framebuffers this will happen in in the rmfb ioctl. For + * driver-private objects (e.g. for fbdev) drivers need to explicitly call + * drm_framebuffer_unregister_private. + */ +void drm_framebuffer_cleanup(struct drm_framebuffer *fb) +{ + struct drm_device *dev = fb->dev; + + mutex_lock(&dev->mode_config.fb_lock); + list_del(&fb->head); + dev->mode_config.num_fb--; + mutex_unlock(&dev->mode_config.fb_lock); +} +EXPORT_SYMBOL(drm_framebuffer_cleanup); + +/** + * drm_framebuffer_remove - remove and unreference a framebuffer object + * @fb: framebuffer to remove + * + * Scans all the CRTCs and planes in @dev's mode_config. If they're + * using @fb, removes it, setting it to NULL. Then drops the reference to the + * passed-in framebuffer. Might take the modeset locks. + * + * Note that this function optimizes the cleanup away if the caller holds the + * last reference to the framebuffer. It is also guaranteed to not take the + * modeset locks in this case. + */ +void drm_framebuffer_remove(struct drm_framebuffer *fb) +{ + struct drm_device *dev; + struct drm_crtc *crtc; + struct drm_plane *plane; + + if (!fb) + return; + + dev = fb->dev; + + WARN_ON(!list_empty(&fb->filp_head)); + + /* + * drm ABI mandates that we remove any deleted framebuffers from active + * useage. But since most sane clients only remove framebuffers they no + * longer need, try to optimize this away. + * + * Since we're holding a reference ourselves, observing a refcount of 1 + * means that we're the last holder and can skip it. Also, the refcount + * can never increase from 1 again, so we don't need any barriers or + * locks. + * + * Note that userspace could try to race with use and instate a new + * usage _after_ we've cleared all current ones. End result will be an + * in-use fb with fb-id == 0. Userspace is allowed to shoot its own foot + * in this manner. + */ + if (drm_framebuffer_read_refcount(fb) > 1) { + if (dev->mode_config.funcs->atomic_commit) { + drm_atomic_remove_fb(fb); + goto out; + } + + drm_modeset_lock_all(dev); + /* remove from any CRTC */ + drm_for_each_crtc(crtc, dev) { + if (crtc->primary->fb == fb) { + /* should turn off the crtc */ + if (drm_crtc_force_disable(crtc)) + DRM_ERROR("failed to reset crtc %p when fb was deleted\n", crtc); + } + } + + drm_for_each_plane(plane, dev) { + if (plane->fb == fb) + drm_plane_force_disable(plane); + } + drm_modeset_unlock_all(dev); + } + +out: + drm_framebuffer_unreference(fb); +} +EXPORT_SYMBOL(drm_framebuffer_remove); diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index 52edecef5325..e973b54c1e9f 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -35,10 +35,12 @@ #include <uapi/drm/drm_mode.h> #include <uapi/drm/drm_fourcc.h> #include <drm/drm_modeset_lock.h> +#include <drm/drm_modeset.h> +#include <drm/drm_framebuffer.h> +#include <drm/drm_modes.h> struct drm_device; struct drm_mode_set; -struct drm_framebuffer; struct drm_object_properties; struct drm_file; struct drm_clip_rect; @@ -46,14 +48,6 @@ struct device_node; struct fence; struct edid; -struct drm_mode_object { - uint32_t id; - uint32_t type; - struct drm_object_properties *properties; - struct kref refcount; - void (*free_cb)(struct kref *kref); -}; - #define DRM_OBJECT_MAX_PROPERTY 24 struct drm_object_properties { int count, atomic_count; @@ -92,15 +86,6 @@ static inline uint64_t I642U64(int64_t val) #define DRM_REFLECT_X 4 #define DRM_REFLECT_Y 5 -enum drm_connector_force { - DRM_FORCE_UNSPECIFIED, - DRM_FORCE_OFF, - DRM_FORCE_ON, /* force on analog part normally */ - DRM_FORCE_ON_DIGITAL, /* for DVI-I use digital connector */ -}; - -#include <drm/drm_modes.h> - enum drm_connector_status { connector_status_connected = 1, connector_status_disconnected = 2, @@ -164,101 +149,6 @@ struct drm_tile_group { u8 group_data[8]; }; -/** - * struct drm_framebuffer_funcs - framebuffer hooks - */ -struct drm_framebuffer_funcs { - /** - * @destroy: - * - * Clean up framebuffer resources, specifically also unreference the - * backing storage. The core guarantees to call this function for every - * framebuffer successfully created by ->fb_create() in - * &drm_mode_config_funcs. Drivers must also call - * drm_framebuffer_cleanup() to release DRM core resources for this - * framebuffer. - */ - void (*destroy)(struct drm_framebuffer *framebuffer); - - /** - * @create_handle: - * - * Create a buffer handle in the driver-specific buffer manager (either - * GEM or TTM) valid for the passed-in struct &drm_file. This is used by - * the core to implement the GETFB IOCTL, which returns (for - * sufficiently priviledged user) also a native buffer handle. This can - * be used for seamless transitions between modesetting clients by - * copying the current screen contents to a private buffer and blending - * between that and the new contents. - * - * GEM based drivers should call drm_gem_handle_create() to create the - * handle. - * - * RETURNS: - * - * 0 on success or a negative error code on failure. - */ - int (*create_handle)(struct drm_framebuffer *fb, - struct drm_file *file_priv, - unsigned int *handle); - /** - * @dirty: - * - * Optional callback for the dirty fb IOCTL. - * - * Userspace can notify the driver via this callback that an area of the - * framebuffer has changed and should be flushed to the display - * hardware. This can also be used internally, e.g. by the fbdev - * emulation, though that's not the case currently. - * - * See documentation in drm_mode.h for the struct drm_mode_fb_dirty_cmd - * for more information as all the semantics and arguments have a one to - * one mapping on this function. - * - * RETURNS: - * - * 0 on success or a negative error code on failure. - */ - int (*dirty)(struct drm_framebuffer *framebuffer, - struct drm_file *file_priv, unsigned flags, - unsigned color, struct drm_clip_rect *clips, - unsigned num_clips); -}; - -struct drm_framebuffer { - struct drm_device *dev; - /* - * Note that the fb is refcounted for the benefit of driver internals, - * for example some hw, disabling a CRTC/plane is asynchronous, and - * scanout does not actually complete until the next vblank. So some - * cleanup (like releasing the reference(s) on the backing GEM bo(s)) - * should be deferred. In cases like this, the driver would like to - * hold a ref to the fb even though it has already been removed from - * userspace perspective. - * The refcount is stored inside the mode object. - */ - /* - * Place on the dev->mode_config.fb_list, access protected by - * dev->mode_config.fb_lock. - */ - struct list_head head; - struct drm_mode_object base; - const struct drm_framebuffer_funcs *funcs; - unsigned int pitches[4]; - unsigned int offsets[4]; - uint64_t modifier[4]; - unsigned int width; - unsigned int height; - /* depth can be 15 or 16 */ - unsigned int depth; - int bits_per_pixel; - int flags; - uint32_t pixel_format; /* fourcc format */ - int hot_x; - int hot_y; - struct list_head filp_head; -}; - struct drm_property_blob { struct drm_mode_object base; struct drm_device *dev; @@ -2874,14 +2764,6 @@ extern int drm_object_property_set_value(struct drm_mode_object *obj, extern int drm_object_property_get_value(struct drm_mode_object *obj, struct drm_property *property, uint64_t *value); -extern int drm_framebuffer_init(struct drm_device *dev, - struct drm_framebuffer *fb, - const struct drm_framebuffer_funcs *funcs); -extern struct drm_framebuffer *drm_framebuffer_lookup(struct drm_device *dev, - uint32_t id); -extern void drm_framebuffer_remove(struct drm_framebuffer *fb); -extern void drm_framebuffer_cleanup(struct drm_framebuffer *fb); -extern void drm_framebuffer_unregister_private(struct drm_framebuffer *fb); extern void drm_object_attach_property(struct drm_mode_object *obj, struct drm_property *property, @@ -2962,11 +2844,6 @@ int drm_plane_create_zpos_immutable_property(struct drm_plane *plane, unsigned int zpos); /* Helpers */ -struct drm_mode_object *drm_mode_object_find(struct drm_device *dev, - uint32_t id, uint32_t type); -void drm_mode_object_reference(struct drm_mode_object *obj); -void drm_mode_object_unreference(struct drm_mode_object *obj); - static inline struct drm_plane *drm_plane_find(struct drm_device *dev, uint32_t id) { @@ -3035,39 +2912,6 @@ static inline uint32_t drm_color_lut_extract(uint32_t user_input, } /** - * drm_framebuffer_reference - incr the fb refcnt - * @fb: framebuffer - * - * This functions increments the fb's refcount. - */ -static inline void drm_framebuffer_reference(struct drm_framebuffer *fb) -{ - drm_mode_object_reference(&fb->base); -} - -/** - * drm_framebuffer_unreference - unref a framebuffer - * @fb: framebuffer to unref - * - * This functions decrements the fb's refcount and frees it if it drops to zero. - */ -static inline void drm_framebuffer_unreference(struct drm_framebuffer *fb) -{ - drm_mode_object_unreference(&fb->base); -} - -/** - * drm_framebuffer_read_refcount - read the framebuffer reference count. - * @fb: framebuffer - * - * This functions returns the framebuffer's reference count. - */ -static inline uint32_t drm_framebuffer_read_refcount(struct drm_framebuffer *fb) -{ - return atomic_read(&fb->base.refcount.refcount); -} - -/** * drm_connector_reference - incr the connector refcnt * @connector: connector * diff --git a/include/drm/drm_framebuffer.h b/include/drm/drm_framebuffer.h new file mode 100644 index 000000000000..46abdace8fa5 --- /dev/null +++ b/include/drm/drm_framebuffer.h @@ -0,0 +1,170 @@ +/* + * Copyright (c) 2016 Intel Corporation + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that copyright + * notice and this permission notice appear in supporting documentation, and + * that the name of the copyright holders not be used in advertising or + * publicity pertaining to distribution of the software without specific, + * written prior permission. The copyright holders make no representations + * about the suitability of this software for any purpose. It is provided "as + * is" without express or implied warranty. + * + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * OF THIS SOFTWARE. + */ + +#ifndef __DRM_FRAMEBUFFER_H__ +#define __DRM_FRAMEBUFFER_H__ + +#include <linux/list.h> +#include <linux/ctype.h> +#include <drm/drm_modeset.h> + +struct drm_framebuffer; +struct drm_file; +struct drm_device; + +/** + * struct drm_framebuffer_funcs - framebuffer hooks + */ +struct drm_framebuffer_funcs { + /** + * @destroy: + * + * Clean up framebuffer resources, specifically also unreference the + * backing storage. The core guarantees to call this function for every + * framebuffer successfully created by ->fb_create() in + * &drm_mode_config_funcs. Drivers must also call + * drm_framebuffer_cleanup() to release DRM core resources for this + * framebuffer. + */ + void (*destroy)(struct drm_framebuffer *framebuffer); + + /** + * @create_handle: + * + * Create a buffer handle in the driver-specific buffer manager (either + * GEM or TTM) valid for the passed-in struct &drm_file. This is used by + * the core to implement the GETFB IOCTL, which returns (for + * sufficiently priviledged user) also a native buffer handle. This can + * be used for seamless transitions between modesetting clients by + * copying the current screen contents to a private buffer and blending + * between that and the new contents. + * + * GEM based drivers should call drm_gem_handle_create() to create the + * handle. + * + * RETURNS: + * + * 0 on success or a negative error code on failure. + */ + int (*create_handle)(struct drm_framebuffer *fb, + struct drm_file *file_priv, + unsigned int *handle); + /** + * @dirty: + * + * Optional callback for the dirty fb IOCTL. + * + * Userspace can notify the driver via this callback that an area of the + * framebuffer has changed and should be flushed to the display + * hardware. This can also be used internally, e.g. by the fbdev + * emulation, though that's not the case currently. + * + * See documentation in drm_mode.h for the struct drm_mode_fb_dirty_cmd + * for more information as all the semantics and arguments have a one to + * one mapping on this function. + * + * RETURNS: + * + * 0 on success or a negative error code on failure. + */ + int (*dirty)(struct drm_framebuffer *framebuffer, + struct drm_file *file_priv, unsigned flags, + unsigned color, struct drm_clip_rect *clips, + unsigned num_clips); +}; + +struct drm_framebuffer { + struct drm_device *dev; + /* + * Note that the fb is refcounted for the benefit of driver internals, + * for example some hw, disabling a CRTC/plane is asynchronous, and + * scanout does not actually complete until the next vblank. So some + * cleanup (like releasing the reference(s) on the backing GEM bo(s)) + * should be deferred. In cases like this, the driver would like to + * hold a ref to the fb even though it has already been removed from + * userspace perspective. + * The refcount is stored inside the mode object. + */ + /* + * Place on the dev->mode_config.fb_list, access protected by + * dev->mode_config.fb_lock. + */ + struct list_head head; + struct drm_mode_object base; + const struct drm_framebuffer_funcs *funcs; + unsigned int pitches[4]; + unsigned int offsets[4]; + uint64_t modifier[4]; + unsigned int width; + unsigned int height; + /* depth can be 15 or 16 */ + unsigned int depth; + int bits_per_pixel; + int flags; + uint32_t pixel_format; /* fourcc format */ + int hot_x; + int hot_y; + struct list_head filp_head; +}; + +int drm_framebuffer_init(struct drm_device *dev, + struct drm_framebuffer *fb, + const struct drm_framebuffer_funcs *funcs); +struct drm_framebuffer *drm_framebuffer_lookup(struct drm_device *dev, + uint32_t id); +void drm_framebuffer_remove(struct drm_framebuffer *fb); +void drm_framebuffer_cleanup(struct drm_framebuffer *fb); +void drm_framebuffer_unregister_private(struct drm_framebuffer *fb); + +/** + * drm_framebuffer_reference - incr the fb refcnt + * @fb: framebuffer + * + * This functions increments the fb's refcount. + */ +static inline void drm_framebuffer_reference(struct drm_framebuffer *fb) +{ + drm_mode_object_reference(&fb->base); +} + +/** + * drm_framebuffer_unreference - unref a framebuffer + * @fb: framebuffer to unref + * + * This functions decrements the fb's refcount and frees it if it drops to zero. + */ +static inline void drm_framebuffer_unreference(struct drm_framebuffer *fb) +{ + drm_mode_object_unreference(&fb->base); +} + +/** + * drm_framebuffer_read_refcount - read the framebuffer reference count. + * @fb: framebuffer + * + * This functions returns the framebuffer's reference count. + */ +static inline uint32_t drm_framebuffer_read_refcount(struct drm_framebuffer *fb) +{ + return atomic_read(&fb->base.refcount.refcount); +} +#endif diff --git a/include/drm/drm_modes.h b/include/drm/drm_modes.h index ff481770d76b..f0af1edcbefe 100644 --- a/include/drm/drm_modes.h +++ b/include/drm/drm_modes.h @@ -27,6 +27,8 @@ #ifndef __DRM_MODES_H__ #define __DRM_MODES_H__ +#include <drm/drm_modeset.h> + /* * Note on terminology: here, for brevity and convenience, we refer to connector * control chips as 'CRTCs'. They can control any type of connector, VGA, LVDS, diff --git a/include/drm/drm_modeset.h b/include/drm/drm_modeset.h new file mode 100644 index 000000000000..0c2b0f3c5f34 --- /dev/null +++ b/include/drm/drm_modeset.h @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2016 Intel Corporation + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that copyright + * notice and this permission notice appear in supporting documentation, and + * that the name of the copyright holders not be used in advertising or + * publicity pertaining to distribution of the software without specific, + * written prior permission. The copyright holders make no representations + * about the suitability of this software for any purpose. It is provided "as + * is" without express or implied warranty. + * + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * OF THIS SOFTWARE. + */ + +#ifndef __DRM_MODESET_H__ +#define __DRM_MODESET_H__ + +#include <linux/kref.h> +struct drm_object_properties; + +struct drm_mode_object { + uint32_t id; + uint32_t type; + struct drm_object_properties *properties; + struct kref refcount; + void (*free_cb)(struct kref *kref); +}; + +struct drm_mode_object *drm_mode_object_find(struct drm_device *dev, + uint32_t id, uint32_t type); +void drm_mode_object_reference(struct drm_mode_object *obj); +void drm_mode_object_unreference(struct drm_mode_object *obj); + +/* FIXME: This is temporary until we have a drm_connector.h */ +enum drm_connector_force { + DRM_FORCE_UNSPECIFIED, + DRM_FORCE_OFF, + DRM_FORCE_ON, /* force on analog part normally */ + DRM_FORCE_ON_DIGITAL, /* for DVI-I use digital connector */ +}; + +#endif
Also start with drm_modeset.h with the core bits, since we need to untangle this mess somehow. That allows us to move the drm_modes.h include to the right spot, except for the temporary connector status enum. That will get fixed as soon as drm_connector.h exists. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> --- Documentation/gpu/drm-kms.rst | 9 + drivers/gpu/drm/Makefile | 3 +- drivers/gpu/drm/drm_crtc.c | 832 +----------------------------------- drivers/gpu/drm/drm_crtc_internal.h | 40 +- drivers/gpu/drm/drm_framebuffer.c | 827 +++++++++++++++++++++++++++++++++++ include/drm/drm_crtc.h | 162 +------ include/drm/drm_framebuffer.h | 170 ++++++++ include/drm/drm_modes.h | 2 + include/drm/drm_modeset.h | 50 +++ 9 files changed, 1106 insertions(+), 989 deletions(-) create mode 100644 drivers/gpu/drm/drm_framebuffer.c create mode 100644 include/drm/drm_framebuffer.h create mode 100644 include/drm/drm_modeset.h