Atomic/nuclear modeset/pageflip
Subsystems (19)
v3 cover Atomic/nuclear modeset/pageflip
Yet another installment of atomic/nuclear modeset/pageflip. Sorry it took a while since the previous iteration, other tasks came up. But I hope to not be interrupted so much, because I don't want to spend the rest of my life rebasing this patchset ;-)
Compared to previous version, I've converted the crtc lock to ww_mutex. It is not yet used for the drm_modeset_lock_all() path, due to no ww version of mutex_lock_nest_lock().. but lock_all() should not be used in any atomic code path.
Now drm_modeset_lock_crtc() depends on 'struct drm_atomic_helper_state', so either I need to decide that it is sufficient for all drivers to use or extend 'struct drm_atomic_helper_state' (and drop 'helper' from the name), or add a new driver vfunc(s) to get ww_ctx from state and manage the list of locked crtcs. So please speak up if you think you need to completely replace the atomic helpers, because otherwise I don't think it is worth the extra complexity/indirection.
There is one slight oddity.. for NONBLOCK atomic updates we would end up needing to hold locks aquired in userspace thread calling in to ioctl, and potentially release them later from drivers worker thread when rendering is complete. Which is obviously a no-go. What is done instead is to drop the locks in atomic->end() and re-aquire them (if needed) when the driver calls back drm_atomic_helper_commit(). I am thinking that we probably want to add to 'struct drm_device' bitmasks of pending crtc/planes to protect against a synchronous atomic update while there is a pending async update.
And finally, I need to go back and flesh out the error propagation, in case of EDEADLK, and do some testing with deadlock injection.
Oh, and I might either squash 'drm: convert crtc to ww_mutex' into one of the later patches, or try to figure out a better way to split out the mutex->ww_mutex change. Splitting it out from 'drm: convert crtc to properties/state' the way it currently is didn't really add much benefit.
---------------------------------------------------------------------
Description from original RFC (with updated links):
This patchset is the merging of Ville's atomic modeset ioctl, and the drm_{crtc,plane}_state stuff from my original nuclear pageflip RFC.
It is currently working on msm with an updated version of Ville's glplane test app (removing cursor properties and atomic event):
https://github.com/robclark/glplane
the libdrm bits can be found here:
https://github.com/robclark/libdrm/commits/atomic
The msm part is on top of msm-next, the complete branch can be found:
http://cgit.freedesktop.org/~robclark/linux/log/?h=global-thermonuclear-war-4
Compared to my earlier nuclear pageflip RFC, there is now a set of drm_atomic helpers which do most of the non-hw-specific work for the different drivers.
Unlike the crtc helpers, it is intended that the atomic helpers can be used piecemeal by the drivers, either using all or overriding parts as needed.
A naive driver, with no special constraints or hw support for atomic updates may simply add the following to their driver struct:
.atomic_begin = drm_atomic_helper_begin,
.atomic_set_event = drm_atomic_helper_set_event,
.atomic_check = drm_atomic_helper_check,
.atomic_commit = drm_atomic_helper_commit,
.atomic_end = drm_atomic_helper_end,
.atomic_helpers = &drm_atomic_helper_funcs,
In addition, if you're plane/crtc doesn't already have it's own custom properties, then add to your plane/crtc_funcs:
.set_property = drm_atomic_helper_{plane,crtc}_set_property,
A driver which can have (for example) conflicting modes across multiple crtcs (for example, bandwidth limitations or clock/pll configuration restrictions), can wrap drm_atomic_helper_check() with their own driver specific .atomic_check() function.
A driver which can support true atomic updates can wrap drm_atomic_helper_commit().
A driver with custom properties should override the appropriate get_state(), check_state(), and commit_state() functions in .atomic_helpers if it uses the drm-atomic-helpers. Otherwise it is free to use &drm_atomic_helper_funcs as-is.
Rob Clark (11):
drm: add atomic fxns
drm: convert crtc to ww_mutex
drm: add object property type
drm: add DRM_MODE_PROP_DYNAMIC property flag
drm: add DRM_MODE_PROP_SIGNED property flag
drm: helpers to find mode objects
drm: split propvals out and blob property support
drm: convert plane to properties/state
drm: convert crtc to properties/state drm/msm: add atomic support
HACK: drm: allow FB's in drm_mode_object_find
Ville Syrjälä (3):
drm: Allow drm_mode_object_find() to look up an object of any type
drm: Refactor object property check code
drm: Atomic modeset ioctl
drivers/gpu/drm/Makefile | 3 +- drivers/gpu/drm/ast/ast_drv.c | 6 + drivers/gpu/drm/ast/ast_drv.h | 1 + drivers/gpu/drm/ast/ast_mode.c | 1 + drivers/gpu/drm/cirrus/cirrus_drv.c | 6 + drivers/gpu/drm/cirrus/cirrus_drv.h | 1 + drivers/gpu/drm/cirrus/cirrus_mode.c | 1 + drivers/gpu/drm/drm_atomic_helper.c | 585 +++++++++++ drivers/gpu/drm/drm_crtc.c | 1401 ++++++++++++++++++--------- drivers/gpu/drm/drm_drv.c | 1 + drivers/gpu/drm/drm_fb_cma_helper.c | 9 +- drivers/gpu/drm/drm_fb_helper.c | 28 +- drivers/gpu/drm/exynos/exynos_drm_crtc.c | 13 +- drivers/gpu/drm/exynos/exynos_drm_drv.c | 7 + drivers/gpu/drm/exynos/exynos_drm_encoder.c | 6 +- drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 4 +- drivers/gpu/drm/exynos/exynos_drm_plane.c | 17 +- drivers/gpu/drm/gma500/cdv_intel_crt.c | 4 +- drivers/gpu/drm/gma500/cdv_intel_display.c | 1 + drivers/gpu/drm/gma500/cdv_intel_dp.c | 7 +- drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 7 +- drivers/gpu/drm/gma500/cdv_intel_lvds.c | 10 +- drivers/gpu/drm/gma500/mdfld_dsi_output.c | 12 +- drivers/gpu/drm/gma500/psb_drv.c | 11 +- drivers/gpu/drm/gma500/psb_drv.h | 1 + drivers/gpu/drm/gma500/psb_intel_display.c | 1 + drivers/gpu/drm/gma500/psb_intel_drv.h | 4 +- drivers/gpu/drm/gma500/psb_intel_lvds.c | 10 +- drivers/gpu/drm/gma500/psb_intel_sdvo.c | 23 +- drivers/gpu/drm/i2c/ch7006_drv.c | 4 +- drivers/gpu/drm/i915/i915_drv.c | 8 + drivers/gpu/drm/i915/intel_crt.c | 4 +- drivers/gpu/drm/i915/intel_display.c | 20 +- drivers/gpu/drm/i915/intel_dp.c | 7 +- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_fbdev.c | 6 +- drivers/gpu/drm/i915/intel_hdmi.c | 7 +- drivers/gpu/drm/i915/intel_lvds.c | 4 +- drivers/gpu/drm/i915/intel_sdvo.c | 23 +- drivers/gpu/drm/i915/intel_sprite.c | 21 +- drivers/gpu/drm/i915/intel_tv.c | 11 +- drivers/gpu/drm/mgag200/mgag200_drv.c | 7 + drivers/gpu/drm/mgag200/mgag200_drv.h | 1 + drivers/gpu/drm/mgag200/mgag200_mode.c | 1 + drivers/gpu/drm/msm/Makefile | 1 + drivers/gpu/drm/msm/mdp4/mdp4_crtc.c | 59 +- drivers/gpu/drm/msm/mdp4/mdp4_kms.c | 6 + drivers/gpu/drm/msm/mdp4/mdp4_kms.h | 1 + drivers/gpu/drm/msm/mdp4/mdp4_plane.c | 22 +- drivers/gpu/drm/msm/msm_atomic.c | 146 +++ drivers/gpu/drm/msm/msm_drv.c | 33 +- drivers/gpu/drm/msm/msm_drv.h | 9 + drivers/gpu/drm/msm/msm_gem.c | 24 +- drivers/gpu/drm/msm/msm_gem.h | 13 + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 1 + drivers/gpu/drm/nouveau/dispnv04/overlay.c | 8 +- drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 3 +- drivers/gpu/drm/nouveau/nouveau_connector.c | 7 +- drivers/gpu/drm/nouveau/nouveau_drm.c | 7 + drivers/gpu/drm/nouveau/nouveau_drm.h | 1 + drivers/gpu/drm/nouveau/nv50_display.c | 1 + drivers/gpu/drm/omapdrm/omap_crtc.c | 28 +- drivers/gpu/drm/omapdrm/omap_drv.c | 16 +- drivers/gpu/drm/omapdrm/omap_drv.h | 5 +- drivers/gpu/drm/omapdrm/omap_plane.c | 34 +- drivers/gpu/drm/qxl/qxl_display.c | 6 +- drivers/gpu/drm/qxl/qxl_drv.c | 9 + drivers/gpu/drm/radeon/radeon_connectors.c | 9 +- drivers/gpu/drm/radeon/radeon_display.c | 2 + drivers/gpu/drm/radeon/radeon_drv.c | 9 + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 2 + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 7 + drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 3 +- drivers/gpu/drm/rcar-du/rcar_du_plane.c | 9 +- drivers/gpu/drm/rcar-du/rcar_du_vgacon.c | 3 +- drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 8 +- drivers/gpu/drm/shmobile/shmob_drm_drv.c | 7 + drivers/gpu/drm/shmobile/shmob_drm_plane.c | 6 +- drivers/gpu/drm/tegra/fb.c | 7 +- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 1 + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 6 + drivers/gpu/drm/tilcdc/tilcdc_drv.h | 1 + drivers/gpu/drm/tilcdc/tilcdc_slave.c | 3 +- drivers/gpu/drm/udl/udl_connector.c | 6 +- drivers/gpu/drm/udl/udl_drv.c | 8 + drivers/gpu/drm/udl/udl_modeset.c | 2 + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 7 + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 12 +- drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 1 + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 1 + include/drm/drmP.h | 83 ++ include/drm/drm_atomic_helper.h | 176 ++++ include/drm/drm_crtc.h | 246 ++++- include/drm/drm_fb_helper.h | 3 +- include/uapi/drm/drm.h | 12 + include/uapi/drm/drm_mode.h | 35 + 98 files changed, 2727 insertions(+), 699 deletions(-) create mode 100644 drivers/gpu/drm/drm_atomic_helper.c create mode 100644 drivers/gpu/drm/msm/msm_atomic.c create mode 100644 include/drm/drm_atomic_helper.h
Signature · 6 lines
1.8.4.2 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
RFC v3 1/14 drm: add atomic fxns
The 'atomic' mechanism allows for multiple properties to be updated, checked, and commited atomically. This will be the basis of atomic- modeset and nuclear-pageflip.
The basic flow is:
state = dev->atomic_begin();
for (... one or more ...)
obj->set_property(obj, state, prop, value);
if (dev->atomic_check(state))
dev->atomic_commit(state);
dev->atomic_end(state);The split of check and commit steps is to allow for ioctls with a test-only flag (which would skip the commit step).
--- drivers/gpu/drm/Makefile | 3 +- drivers/gpu/drm/ast/ast_drv.c | 6 ++ drivers/gpu/drm/ast/ast_drv.h | 1 + drivers/gpu/drm/cirrus/cirrus_drv.c | 6 ++ drivers/gpu/drm/cirrus/cirrus_drv.h | 1 + drivers/gpu/drm/drm_atomic_helper.c | 135 ++++++++++++++++++++++++++ drivers/gpu/drm/drm_crtc.c | 141 +++++++++++++++++----------- drivers/gpu/drm/exynos/exynos_drm_crtc.c | 4 +- drivers/gpu/drm/exynos/exynos_drm_drv.c | 7 ++ drivers/gpu/drm/exynos/exynos_drm_plane.c | 4 +- drivers/gpu/drm/gma500/cdv_intel_crt.c | 4 +- drivers/gpu/drm/gma500/cdv_intel_dp.c | 4 +- drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 4 +- drivers/gpu/drm/gma500/cdv_intel_lvds.c | 4 +- drivers/gpu/drm/gma500/mdfld_dsi_output.c | 4 +- drivers/gpu/drm/gma500/psb_drv.c | 7 ++ drivers/gpu/drm/gma500/psb_drv.h | 1 + drivers/gpu/drm/gma500/psb_intel_drv.h | 4 +- drivers/gpu/drm/gma500/psb_intel_lvds.c | 4 +- drivers/gpu/drm/gma500/psb_intel_sdvo.c | 4 +- drivers/gpu/drm/i915/i915_drv.c | 8 ++ drivers/gpu/drm/i915/intel_crt.c | 4 +- drivers/gpu/drm/i915/intel_dp.c | 4 +- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_hdmi.c | 4 +- drivers/gpu/drm/i915/intel_lvds.c | 4 +- drivers/gpu/drm/i915/intel_sdvo.c | 4 +- drivers/gpu/drm/i915/intel_tv.c | 5 +- drivers/gpu/drm/mgag200/mgag200_drv.c | 7 ++ drivers/gpu/drm/mgag200/mgag200_drv.h | 1 + drivers/gpu/drm/msm/mdp4/mdp4_crtc.c | 4 +- drivers/gpu/drm/msm/mdp4/mdp4_plane.c | 4 +- drivers/gpu/drm/msm/msm_drv.c | 6 ++ drivers/gpu/drm/msm/msm_drv.h | 1 + drivers/gpu/drm/nouveau/dispnv04/overlay.c | 8 +- drivers/gpu/drm/nouveau/nouveau_connector.c | 3 +- drivers/gpu/drm/nouveau/nouveau_drm.c | 7 ++ drivers/gpu/drm/nouveau/nouveau_drm.h | 1 + drivers/gpu/drm/omapdrm/omap_crtc.c | 7 +- drivers/gpu/drm/omapdrm/omap_drv.c | 6 ++ drivers/gpu/drm/omapdrm/omap_drv.h | 5 +- drivers/gpu/drm/omapdrm/omap_plane.c | 4 +- drivers/gpu/drm/qxl/qxl_display.c | 4 +- drivers/gpu/drm/qxl/qxl_drv.c | 9 ++ drivers/gpu/drm/radeon/radeon_connectors.c | 9 +- drivers/gpu/drm/radeon/radeon_drv.c | 9 ++ drivers/gpu/drm/rcar-du/rcar_du_drv.c | 7 ++ drivers/gpu/drm/rcar-du/rcar_du_plane.c | 4 +- drivers/gpu/drm/shmobile/shmob_drm_drv.c | 7 ++ drivers/gpu/drm/tilcdc/tilcdc_drv.c | 6 ++ drivers/gpu/drm/tilcdc/tilcdc_drv.h | 1 + drivers/gpu/drm/tilcdc/tilcdc_slave.c | 3 +- drivers/gpu/drm/udl/udl_connector.c | 6 +- drivers/gpu/drm/udl/udl_drv.c | 8 ++ drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 7 ++ drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 4 +- include/drm/drmP.h | 77 +++++++++++++++ include/drm/drm_atomic_helper.h | 100 ++++++++++++++++++++ include/drm/drm_crtc.h | 14 +-- 61 files changed, 622 insertions(+), 104 deletions(-) create mode 100644 drivers/gpu/drm/drm_atomic_helper.c create mode 100644 include/drm/drm_atomic_helper.h
drivers/gpu/drm/Makefile +2 -1
@@ -13,7 +13,8 @@ drm-y := drm_auth.o drm_buffer.o drm_bufs.o drm_cache.o \ drm_crtc.o drm_modes.o drm_edid.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_rect.o drm_vma_manager.o drm_flip_work.o \ + drm_atomic_helper.o drm-$(CONFIG_COMPAT) += drm_ioc32.o drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o
drivers/gpu/drm/ast/ast_drv.c +6 -0
@@ -216,6 +216,12 @@ static struct drm_driver driver = { .dumb_map_offset = ast_dumb_mmap_offset, .dumb_destroy = drm_gem_dumb_destroy, + .atomic_begin = drm_atomic_helper_begin, + .atomic_set_event = drm_atomic_helper_set_event, + .atomic_check = drm_atomic_helper_check, + .atomic_commit = drm_atomic_helper_commit, + .atomic_end = drm_atomic_helper_end, + .atomic_helpers = &drm_atomic_helper_funcs, };static int __init ast_init (void )
drivers/gpu/drm/ast/ast_drv.h +1 -0
@@ -29,6 +29,7 @@#define __AST_DRV_H__#include <drm/drm_fb_helper.h> +#include <drm/drm_atomic_helper.h> #include <drm/ttm/ttm_bo_api.h> #include <drm/ttm/ttm_bo_driver.h>
drivers/gpu/drm/cirrus/cirrus_drv.c +6 -0
@@ -101,6 +101,12 @@ static struct drm_driver driver = { .dumb_create = cirrus_dumb_create, .dumb_map_offset = cirrus_dumb_mmap_offset, .dumb_destroy = drm_gem_dumb_destroy, + .atomic_begin = drm_atomic_helper_begin, + .atomic_set_event = drm_atomic_helper_set_event, + .atomic_check = drm_atomic_helper_check, + .atomic_commit = drm_atomic_helper_commit, + .atomic_end = drm_atomic_helper_end, + .atomic_helpers = &drm_atomic_helper_funcs, };static struct pci_driver cirrus_pci_driver = {
drivers/gpu/drm/cirrus/cirrus_drv.h +1 -0
@@ -14,6 +14,7 @@#include <video/vga.h> #include <drm/drm_fb_helper.h> +#include <drm/drm_atomic_helper.h> #include <drm/ttm/ttm_bo_api.h> #include <drm/ttm/ttm_bo_driver.h>
drivers/gpu/drm/drm_atomic_helper.c new file +135 -0
135 lines not on this page · raw message
drivers/gpu/drm/drm_crtc.c +87 -54
200 lines not on this page · raw message
drivers/gpu/drm/exynos/exynos_drm_crtc.c +3 -1
@@ -254,8 +254,10 @@ static void exynos_drm_crtc_destroy(struct drm_crtc *crtc) }static int exynos_drm_crtc_set_property (struct drm_crtc *crtc, +void *state,struct drm_property *property, -uint64_t val) +uint64_t val, +void *blob_data) {struct drm_device *dev = crtc->dev;struct exynos_drm_private *dev_priv = dev->dev_private;
drivers/gpu/drm/exynos/exynos_drm_drv.c +7 -0
@@ -13,6 +13,7 @@#include <drm/drmP.h> #include <drm/drm_crtc_helper.h> +#include <drm/drm_atomic_helper.h> #include <drm/exynos_drm.h>
@@ -269,6 +270,12 @@ static struct drm_driver exynos_drm_driver = { .dumb_create = exynos_drm_gem_dumb_create, .dumb_map_offset = exynos_drm_gem_dumb_map_offset, .dumb_destroy = drm_gem_dumb_destroy, + .atomic_begin = drm_atomic_helper_begin, + .atomic_set_event = drm_atomic_helper_set_event, + .atomic_check = drm_atomic_helper_check, + .atomic_commit = drm_atomic_helper_commit, + .atomic_end = drm_atomic_helper_end, + .atomic_helpers = &drm_atomic_helper_funcs, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_export = exynos_dmabuf_prime_export,
drivers/gpu/drm/exynos/exynos_drm_plane.c +3 -1
@@ -217,8 +217,10 @@ static void exynos_plane_destroy(struct drm_plane *plane) }static int exynos_plane_set_property (struct drm_plane *plane, +void *state,struct drm_property *property, -uint64_t val) +uint64_t val, +void *blob_data) {struct drm_device *dev = plane->dev;struct exynos_plane *exynos_plane =to_exynos_plane (plane);
drivers/gpu/drm/gma500/cdv_intel_crt.c +3 -1
@@ -212,8 +212,10 @@ static int cdv_intel_crt_get_modes(struct drm_connector *connector) }static int cdv_intel_crt_set_property (struct drm_connector *connector, +void *state,struct drm_property *property, -uint64_t value) +uint64_t value, +void *blob_data) {return 0 ; }
drivers/gpu/drm/gma500/cdv_intel_dp.c +3 -1
@@ -1644,8 +1644,10 @@ cdv_intel_dp_detect_audio(struct drm_connector *connector)static int cdv_intel_dp_set_property (struct drm_connector *connector, +void *state,struct drm_property *property, -uint64_t val) +uint64_t val, +void *blob_data) {struct drm_psb_private *dev_priv = connector->dev->dev_private;struct gma_encoder *encoder =gma_attached_encoder (connector);
drivers/gpu/drm/gma500/cdv_intel_hdmi.c +3 -1
@@ -157,8 +157,10 @@ static enum drm_connector_status cdv_hdmi_detect( }static int cdv_hdmi_set_property (struct drm_connector *connector, +void *state,struct drm_property *property, -uint64_t value) +uint64_t value, +void *blob_data) {struct drm_encoder *encoder = connector->encoder;
drivers/gpu/drm/gma500/cdv_intel_lvds.c +3 -1
@@ -452,8 +452,10 @@ static void cdv_intel_lvds_destroy(struct drm_connector *connector) }static int cdv_intel_lvds_set_property (struct drm_connector *connector, +void *state,struct drm_property *property, -uint64_t value) +uint64_t value, +void *blob_data) {struct drm_encoder *encoder = connector->encoder;
drivers/gpu/drm/gma500/mdfld_dsi_output.c +3 -1
@@ -243,8 +243,10 @@ mdfld_dsi_connector_detect(struct drm_connector *connector, bool force) }static int mdfld_dsi_connector_set_property (struct drm_connector *connector, +void *state,struct drm_property *property, -uint64_t value) +uint64_t value, +void *blob_data) {struct drm_encoder *encoder = connector->encoder;
drivers/gpu/drm/gma500/psb_drv.c +7 -0
@@ -676,6 +676,13 @@ static struct drm_driver driver = { .preclose = psb_driver_preclose, .postclose = psb_driver_close, + .atomic_begin = drm_atomic_helper_begin, + .atomic_set_event = drm_atomic_helper_set_event, + .atomic_check = drm_atomic_helper_check, + .atomic_commit = drm_atomic_helper_commit, + .atomic_end = drm_atomic_helper_end, + .atomic_helpers = &drm_atomic_helper_funcs, + .gem_free_object = psb_gem_free_object, .gem_vm_ops = &psb_gem_vm_ops, .dumb_create = psb_gem_dumb_create,
drivers/gpu/drm/gma500/psb_drv.h +1 -0
@@ -25,6 +25,7 @@#include <drm/drmP.h> #include <drm/drm_global.h> #include <drm/gma_drm.h> +#include <drm/drm_atomic_helper.h> #include "psb_reg.h" #include "psb_intel_drv.h" #include "gma_display.h"
drivers/gpu/drm/gma500/psb_intel_drv.h +3 -1
@@ -261,8 +261,10 @@ extern bool psb_intel_lvds_mode_fixup(struct drm_encoder *encoder,extern int psb_intel_lvds_mode_valid (struct drm_connector *connector,struct drm_display_mode *mode);extern int psb_intel_lvds_set_property (struct drm_connector *connector, +void *state,struct drm_property *property, -uint64_t value); +uint64_t value, +void *blob_data);extern void psb_intel_lvds_destroy (struct drm_connector *connector);extern const struct drm_encoder_funcs psb_intel_lvds_enc_funcs;
drivers/gpu/drm/gma500/psb_intel_lvds.c +3 -1
@@ -569,8 +569,10 @@ void psb_intel_lvds_destroy(struct drm_connector *connector) }int psb_intel_lvds_set_property (struct drm_connector *connector, +void *state,struct drm_property *property, -uint64_t value) +uint64_t value, +void *blob_data) {struct drm_encoder *encoder = connector->encoder;
drivers/gpu/drm/gma500/psb_intel_sdvo.c +3 -1
@@ -1705,8 +1705,10 @@ static bool psb_intel_sdvo_detect_hdmi_audio(struct drm_connector *connector)static int psb_intel_sdvo_set_property (struct drm_connector *connector, +void *state,struct drm_property *property, -uint64_t val) +uint64_t val, +void *blob_data) {struct psb_intel_sdvo *psb_intel_sdvo =intel_attached_sdvo (connector);struct psb_intel_sdvo_connector *psb_intel_sdvo_connector =to_psb_intel_sdvo_connector (connector);
drivers/gpu/drm/i915/i915_drv.c +8 -0
@@ -978,6 +978,14 @@ static struct drm_driver driver = { .dumb_create = i915_gem_dumb_create, .dumb_map_offset = i915_gem_mmap_gtt, .dumb_destroy = drm_gem_dumb_destroy, + + .atomic_begin = drm_atomic_helper_begin, + .atomic_set_event = drm_atomic_helper_set_event, + .atomic_check = drm_atomic_helper_check, + .atomic_commit = drm_atomic_helper_commit, + .atomic_end = drm_atomic_helper_end, + .atomic_helpers = &drm_atomic_helper_funcs, + .ioctls = i915_ioctls, .fops = &i915_driver_fops, .name = DRIVER_NAME,
drivers/gpu/drm/i915/intel_crt.c +3 -1
@@ -699,8 +699,10 @@ static int intel_crt_get_modes(struct drm_connector *connector) }static int intel_crt_set_property (struct drm_connector *connector, +void *state,struct drm_property *property, -uint64_t value) +uint64_t value, +void *blob_data) {return 0 ; }
drivers/gpu/drm/i915/intel_dp.c +3 -1
@@ -3160,8 +3160,10 @@ intel_dp_detect_audio(struct drm_connector *connector)static int intel_dp_set_property (struct drm_connector *connector, +void *state,struct drm_property *property, -uint64_t val) +uint64_t val, +void *blob_data) {struct drm_i915_private *dev_priv = connector->dev->dev_private;struct intel_connector *intel_connector =to_intel_connector (connector);
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -31,6 +31,7 @@#include "i915_drv.h" #include <drm/drm_crtc.h> #include <drm/drm_crtc_helper.h> +#include <drm/drm_atomic_helper.h> #include <drm/drm_fb_helper.h> #include <drm/drm_dp_helper.h>
drivers/gpu/drm/i915/intel_hdmi.c +3 -1
@@ -1004,8 +1004,10 @@ intel_hdmi_detect_audio(struct drm_connector *connector)static int intel_hdmi_set_property (struct drm_connector *connector, +void *state,struct drm_property *property, -uint64_t val) +uint64_t val, +void *blob_data) {struct intel_hdmi *intel_hdmi =intel_attached_hdmi (connector); struct intel_digital_port *intel_dig_port =
drivers/gpu/drm/i915/intel_lvds.c +3 -1
@@ -482,8 +482,10 @@ static void intel_lvds_destroy(struct drm_connector *connector) }static int intel_lvds_set_property (struct drm_connector *connector, +void *state,struct drm_property *property, -uint64_t value) +uint64_t value, +void *blob_data) {struct intel_connector *intel_connector =to_intel_connector (connector);struct drm_device *dev = connector->dev;
drivers/gpu/drm/i915/intel_sdvo.c +3 -1
@@ -2032,8 +2032,10 @@ static bool intel_sdvo_detect_hdmi_audio(struct drm_connector *connector)static int intel_sdvo_set_property (struct drm_connector *connector, +void *state,struct drm_property *property, -uint64_t val) +uint64_t val, +void *blob_data) {struct intel_sdvo *intel_sdvo =intel_attached_sdvo (connector);struct intel_sdvo_connector *intel_sdvo_connector =to_intel_sdvo_connector (connector);
drivers/gpu/drm/i915/intel_tv.c +3 -2
@@ -1439,8 +1439,9 @@ intel_tv_destroy(struct drm_connector *connector)static int -intel_tv_set_property (struct drm_connector *connector,struct drm_property *property, -uint64_t val) +intel_tv_set_property (struct drm_connector *connector,void *state, +struct drm_property *property, +uint64_t val,void *blob_data) {struct drm_device *dev = connector->dev;struct intel_tv *intel_tv =intel_attached_tv (connector);
drivers/gpu/drm/mgag200/mgag200_drv.c +7 -0
@@ -103,6 +103,13 @@ static struct drm_driver driver = { .dumb_create = mgag200_dumb_create, .dumb_map_offset = mgag200_dumb_mmap_offset, .dumb_destroy = drm_gem_dumb_destroy, + + .atomic_begin = drm_atomic_helper_begin, + .atomic_set_event = drm_atomic_helper_set_event, + .atomic_check = drm_atomic_helper_check, + .atomic_commit = drm_atomic_helper_commit, + .atomic_end = drm_atomic_helper_end, + .atomic_helpers = &drm_atomic_helper_funcs, };static struct pci_driver mgag200_pci_driver = {
drivers/gpu/drm/mgag200/mgag200_drv.h +1 -0
@@ -16,6 +16,7 @@#include <video/vga.h> #include <drm/drm_fb_helper.h> +#include <drm/drm_atomic_helper.h> #include <drm/ttm/ttm_bo_api.h> #include <drm/ttm/ttm_bo_driver.h> #include <drm/ttm/ttm_placement.h>
drivers/gpu/drm/msm/mdp4/mdp4_crtc.c +2 -2
@@ -424,8 +424,8 @@ static int mdp4_crtc_page_flip(struct drm_crtc *crtc,return msm_gem_queue_inactive_cb (obj, &mdp4_crtc->pageflip_cb); } -static int mdp4_crtc_set_property (struct drm_crtc *crtc, -struct drm_property *property,uint64_t val) +static int mdp4_crtc_set_property (struct drm_crtc *crtc,void *state, +struct drm_property *property,uint64_t val,void *blob_data) {// XXX return -EINVAL ;
drivers/gpu/drm/msm/mdp4/mdp4_plane.c +2 -2
@@ -84,8 +84,8 @@ void mdp4_plane_install_properties(struct drm_plane *plane,// XXX } -int mdp4_plane_set_property (struct drm_plane *plane, -struct drm_property *property,uint64_t val) +int mdp4_plane_set_property (struct drm_plane *plane,void *state, +struct drm_property *property,uint64_t val,void *blob_data) {// XXX return -EINVAL ;
drivers/gpu/drm/msm/msm_drv.c +6 -0
@@ -734,6 +734,12 @@ static struct drm_driver msm_driver = { .gem_prime_import_sg_table = msm_gem_prime_import_sg_table, .gem_prime_vmap = msm_gem_prime_vmap, .gem_prime_vunmap = msm_gem_prime_vunmap, + .atomic_begin = drm_atomic_helper_begin, + .atomic_set_event = drm_atomic_helper_set_event, + .atomic_check = drm_atomic_helper_check, + .atomic_commit = drm_atomic_helper_commit, + .atomic_end = drm_atomic_helper_end, + .atomic_helpers = &drm_atomic_helper_funcs, #ifdef CONFIG_DEBUG_FS .debugfs_init = msm_debugfs_init, .debugfs_cleanup = msm_debugfs_cleanup,
drivers/gpu/drm/msm/msm_drv.h +1 -0
@@ -40,6 +40,7 @@#include <drm/drmP.h> #include <drm/drm_crtc_helper.h> #include <drm/drm_fb_helper.h> +#include <drm/drm_atomic_helper.h> #include <drm/msm_drm.h> struct msm_kms ;
drivers/gpu/drm/nouveau/dispnv04/overlay.c +5 -3
@@ -208,9 +208,9 @@ nv10_set_params(struct nouveau_plane *plane) }static int -nv10_set_property (struct drm_plane *plane, +nv10_set_property (struct drm_plane *plane,void *state,struct drm_property *property, -uint64_t value) +uint64_t value,void *blob_data) {struct nouveau_plane *nv_plane = (struct nouveau_plane *)plane;
@@ -227,7 +227,9 @@ nv10_set_property(struct drm_plane *plane,else if (property == nv_plane->props.iturbt_709) nv_plane->iturbt_709 = value;else -return -EINVAL ; +return drm_plane_set_property (plane, +drm_atomic_get_plane_state (plane, state), + property, value, blob_data);nv10_set_params (nv_plane);return 0 ;
drivers/gpu/drm/nouveau/nouveau_connector.c +2 -1
@@ -447,7 +447,8 @@ nouveau_connector_force(struct drm_connector *connector)static int nouveau_connector_set_property (struct drm_connector *connector, -struct drm_property *property,uint64_t value) +void *state,struct drm_property *property, +uint64_t value,void *blob_data) {struct nouveau_display *disp =nouveau_display (connector->dev);struct nouveau_connector *nv_connector =nouveau_connector (connector);
drivers/gpu/drm/nouveau/nouveau_drm.c +7 -0
@@ -822,6 +822,13 @@ driver = { .dumb_map_offset = nouveau_display_dumb_map_offset, .dumb_destroy = drm_gem_dumb_destroy, + .atomic_begin = drm_atomic_helper_begin, + .atomic_set_event = drm_atomic_helper_set_event, + .atomic_check = drm_atomic_helper_check, + .atomic_commit = drm_atomic_helper_commit, + .atomic_end = drm_atomic_helper_end, + .atomic_helpers = &drm_atomic_helper_funcs, + .name = DRIVER_NAME, .desc =DRIVER_DESC , #ifdef GIT_REVISION
drivers/gpu/drm/nouveau/nouveau_drm.h +1 -0
@@ -29,6 +29,7 @@#include <subdev/vm.h> #include <drmP.h> +#include <drm/drm_atomic_helper.h> #include <drm/nouveau_drm.h> #include <drm/ttm/ttm_bo_api.h>
drivers/gpu/drm/omapdrm/omap_crtc.c +4 -3
@@ -362,8 +362,8 @@ static int omap_crtc_page_flip_locked(struct drm_crtc *crtc,return 0 ; } -static int omap_crtc_set_property (struct drm_crtc *crtc, -struct drm_property *property,uint64_t val) +static int omap_crtc_set_property (struct drm_crtc *crtc,void *state, +struct drm_property *property,uint64_t val,void *blob_data) {struct omap_crtc *omap_crtc =to_omap_crtc (crtc);struct omap_drm_private *priv = crtc->dev->dev_private;
@@ -373,7 +373,8 @@ static int omap_crtc_set_property(struct drm_crtc *crtc, !!(val & ((1LL <<DRM_ROTATE_90 ) | (1LL <<DRM_ROTATE_270 ))); } -return omap_plane_set_property (omap_crtc->plane, property, val); +return omap_plane_set_property (omap_crtc->plane, state, + property, val, blob_data); }static const struct drm_crtc_funcs omap_crtc_funcs = {
drivers/gpu/drm/omapdrm/omap_drv.c +6 -0
@@ -625,6 +625,12 @@ static struct drm_driver omap_drm_driver = { .dumb_create = omap_gem_dumb_create, .dumb_map_offset = omap_gem_dumb_map_offset, .dumb_destroy = drm_gem_dumb_destroy, + .atomic_begin = drm_atomic_helper_begin, + .atomic_set_event = drm_atomic_helper_set_event, + .atomic_check = drm_atomic_helper_check, + .atomic_commit = drm_atomic_helper_commit, + .atomic_end = drm_atomic_helper_end, + .atomic_helpers = &drm_atomic_helper_funcs, .ioctls = ioctls, .num_ioctls = DRM_OMAP_NUM_IOCTLS, .fops = &omapdriver_fops,
drivers/gpu/drm/omapdrm/omap_drv.h +3 -2
@@ -25,6 +25,7 @@#include <linux/types.h> #include <drm/drmP.h> #include <drm/drm_crtc_helper.h> +#include <drm/drm_atomic_helper.h> #include <drm/omap_drm.h> #include <linux/platform_data/omap_drm.h>
@@ -173,8 +174,8 @@ int omap_plane_mode_set(struct drm_plane *plane, void (*fxn)(void *), void *arg);void omap_plane_install_properties (struct drm_plane *plane,struct drm_mode_object *obj); -int omap_plane_set_property (struct drm_plane *plane, -struct drm_property *property,uint64_t val); +int omap_plane_set_property (struct drm_plane *plane,void *state, +struct drm_property *property,uint64_t val,void *blob_data);struct drm_encoder *omap_encoder_init (struct drm_device *dev,struct omap_dss_device *dssdev);
drivers/gpu/drm/omapdrm/omap_plane.c +2 -2
@@ -327,8 +327,8 @@ void omap_plane_install_properties(struct drm_plane *plane,drm_object_attach_property (obj, prop,0 ); } -int omap_plane_set_property (struct drm_plane *plane, -struct drm_property *property,uint64_t val) +int omap_plane_set_property (struct drm_plane *plane,void *state, +struct drm_property *property,uint64_t val,void *blob_data) {struct omap_plane *omap_plane =to_omap_plane (plane);struct omap_drm_private *priv = plane->dev->dev_private;
drivers/gpu/drm/qxl/qxl_display.c +3 -1
@@ -812,8 +812,10 @@ static enum drm_connector_status qxl_conn_detect( }static int qxl_conn_set_property (struct drm_connector *connector, +void *state,struct drm_property *property, -uint64_t value) +uint64_t value, +void *blob_data) {DRM_DEBUG ("\n" );return 0 ;
drivers/gpu/drm/qxl/qxl_drv.c +9 -0
@@ -34,6 +34,7 @@#include "drmP.h" #include "drm/drm.h" #include "drm_crtc_helper.h" +#include "drm_atomic_helper.h" #include "qxl_drv.h" #include "qxl_object.h"
@@ -221,6 +222,14 @@ static struct drm_driver qxl_driver = { .dumb_create = qxl_mode_dumb_create, .dumb_map_offset = qxl_mode_dumb_mmap, .dumb_destroy = drm_gem_dumb_destroy, + + .atomic_begin = drm_atomic_helper_begin, + .atomic_set_event = drm_atomic_helper_set_event, + .atomic_check = drm_atomic_helper_check, + .atomic_commit = drm_atomic_helper_commit, + .atomic_end = drm_atomic_helper_end, + .atomic_helpers = &drm_atomic_helper_funcs, +#if defined(CONFIG_DEBUG_FS ) .debugfs_init = qxl_debugfs_init, .debugfs_cleanup = qxl_debugfs_takedown,
drivers/gpu/drm/radeon/radeon_connectors.c +6 -3
@@ -368,8 +368,9 @@ static void radeon_add_common_modes(struct drm_encoder *encoder, struct drm_conn } } -static int radeon_connector_set_property (struct drm_connector *connector,struct drm_property *property, -uint64_t val) +static int radeon_connector_set_property (struct drm_connector *connector, +void *state,struct drm_property *property, +uint64_t val,void *blob_data) {struct drm_device *dev = connector->dev;struct radeon_device *rdev = dev->dev_private;
@@ -691,8 +692,10 @@ static void radeon_connector_destroy(struct drm_connector *connector) }static int radeon_lvds_set_property (struct drm_connector *connector, +void *state,struct drm_property *property, -uint64_t value) +uint64_t value, +void *blob_data) {struct drm_device *dev = connector->dev;struct radeon_encoder *radeon_encoder;
drivers/gpu/drm/radeon/radeon_drv.c +9 -0
@@ -34,6 +34,7 @@#include "radeon_drv.h" #include <drm/drm_pciids.h> +#include <drm/drm_atomic_helper.h> #include <linux/console.h> #include <linux/module.h> #include <linux/pm_runtime.h>
@@ -548,6 +549,14 @@ static struct drm_driver kms_driver = { .dumb_create = radeon_mode_dumb_create, .dumb_map_offset = radeon_mode_dumb_mmap, .dumb_destroy = drm_gem_dumb_destroy, + + .atomic_begin = drm_atomic_helper_begin, + .atomic_set_event = drm_atomic_helper_set_event, + .atomic_check = drm_atomic_helper_check, + .atomic_commit = drm_atomic_helper_commit, + .atomic_end = drm_atomic_helper_end, + .atomic_helpers = &drm_atomic_helper_funcs, + .fops = &radeon_driver_kms_fops, .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
drivers/gpu/drm/rcar-du/rcar_du_drv.c +7 -0
@@ -21,6 +21,7 @@#include <drm/drmP.h> #include <drm/drm_crtc_helper.h> +#include <drm/drm_atomic_helper.h> #include <drm/drm_fb_cma_helper.h> #include <drm/drm_gem_cma_helper.h>
@@ -175,6 +176,12 @@ static struct drm_driver rcar_du_driver = { .dumb_create = rcar_du_dumb_create, .dumb_map_offset = drm_gem_cma_dumb_map_offset, .dumb_destroy = drm_gem_dumb_destroy, + .atomic_begin = drm_atomic_helper_begin, + .atomic_set_event = drm_atomic_helper_set_event, + .atomic_check = drm_atomic_helper_check, + .atomic_commit = drm_atomic_helper_commit, + .atomic_end = drm_atomic_helper_end, + .atomic_helpers = &drm_atomic_helper_funcs, .fops = &rcar_du_fops, .name = "rcar-du", .desc = "Renesas R-Car Display Unit",
drivers/gpu/drm/rcar-du/rcar_du_plane.c +3 -1
@@ -396,8 +396,10 @@ done: }static int rcar_du_plane_set_property (struct drm_plane *plane, +void *state,struct drm_property *property, -uint64_t value) +uint64_t value, +void *blob_data) {struct rcar_du_plane *rplane =to_rcar_plane (plane);struct rcar_du_group *rgrp = rplane->group;
drivers/gpu/drm/shmobile/shmob_drm_drv.c +7 -0
@@ -21,6 +21,7 @@#include <drm/drmP.h> #include <drm/drm_crtc_helper.h> +#include <drm/drm_atomic_helper.h> #include <drm/drm_gem_cma_helper.h> #include "shmob_drm_crtc.h"
@@ -285,6 +286,12 @@ static struct drm_driver shmob_drm_driver = { .dumb_create = drm_gem_cma_dumb_create, .dumb_map_offset = drm_gem_cma_dumb_map_offset, .dumb_destroy = drm_gem_dumb_destroy, + .atomic_begin = drm_atomic_helper_begin, + .atomic_set_event = drm_atomic_helper_set_event, + .atomic_check = drm_atomic_helper_check, + .atomic_commit = drm_atomic_helper_commit, + .atomic_end = drm_atomic_helper_end, + .atomic_helpers = &drm_atomic_helper_funcs, .fops = &shmob_drm_fops, .name = "shmob-drm", .desc = "Renesas SH Mobile DRM",
drivers/gpu/drm/tilcdc/tilcdc_drv.c +6 -0
@@ -519,6 +519,12 @@ static struct drm_driver tilcdc_driver = { .dumb_create = drm_gem_cma_dumb_create, .dumb_map_offset = drm_gem_cma_dumb_map_offset, .dumb_destroy = drm_gem_dumb_destroy, + .atomic_begin = drm_atomic_helper_begin, + .atomic_set_event = drm_atomic_helper_set_event, + .atomic_check = drm_atomic_helper_check, + .atomic_commit = drm_atomic_helper_commit, + .atomic_end = drm_atomic_helper_end, + .atomic_helpers = &drm_atomic_helper_funcs, #ifdef CONFIG_DEBUG_FS .debugfs_init = tilcdc_debugfs_init, .debugfs_cleanup = tilcdc_debugfs_cleanup,
drivers/gpu/drm/tilcdc/tilcdc_drv.h +1 -0
@@ -31,6 +31,7 @@#include <drm/drmP.h> #include <drm/drm_crtc_helper.h> +#include <drm/drm_atomic_helper.h> #include <drm/drm_gem_cma_helper.h> #include <drm/drm_fb_cma_helper.h>
drivers/gpu/drm/tilcdc/tilcdc_slave.c +2 -1
@@ -206,7 +206,8 @@ static struct drm_encoder *slave_connector_best_encoder( }static int slave_connector_set_property (struct drm_connector *connector, -struct drm_property *property,uint64_t value) +void *state,struct drm_property *property, +uint64_t value,void *blob_data) {struct drm_encoder *encoder =to_slave_connector (connector)->encoder; return get_slave_funcs(encoder)->set_property(encoder,
drivers/gpu/drm/udl/udl_connector.c +3 -3
@@ -115,9 +115,9 @@ udl_best_single_encoder(struct drm_connector *connector)return encoder; } -static int udl_connector_set_property (struct drm_connector *connector, -struct drm_property *property, -uint64_t val) +static int udl_connector_set_property (struct drm_connector *connector, +void *state,struct drm_property *property, +uint64_t val,void *blob_data) {return 0 ; }
drivers/gpu/drm/udl/udl_drv.c +8 -0
@@ -9,6 +9,7 @@#include <linux/module.h> #include <drm/drm_usb.h> #include <drm/drm_crtc_helper.h> +#include <drm/drm_atomic_helper.h> #include "udl_drv.h" static struct drm_driver driver;
@@ -88,6 +89,13 @@ static struct drm_driver driver = { .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import = udl_gem_prime_import, + .atomic_begin = drm_atomic_helper_begin, + .atomic_set_event = drm_atomic_helper_set_event, + .atomic_check = drm_atomic_helper_check, + .atomic_commit = drm_atomic_helper_commit, + .atomic_end = drm_atomic_helper_end, + .atomic_helpers = &drm_atomic_helper_funcs, + .name = DRIVER_NAME, .desc = DRIVER_DESC, .date = DRIVER_DATE,
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +7 -0
@@ -1235,6 +1235,13 @@ static struct drm_driver driver = { .dumb_map_offset = vmw_dumb_map_offset, .dumb_destroy = vmw_dumb_destroy, + .atomic_begin = drm_atomic_helper_begin, + .atomic_set_event = drm_atomic_helper_set_event, + .atomic_check = drm_atomic_helper_check, + .atomic_commit = drm_atomic_helper_commit, + .atomic_end = drm_atomic_helper_end, + .atomic_helpers = &drm_atomic_helper_funcs, + .fops = &vmwgfx_driver_fops, .name = VMWGFX_DRIVER_NAME, .desc = VMWGFX_DRIVER_DESC,
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +1 -0
@@ -30,6 +30,7 @@#include "vmwgfx_reg.h" #include <drm/drmP.h> +#include <drm/drm_atomic_helper.h> #include <drm/vmwgfx_drm.h> #include <drm/drm_hashtab.h> #include <linux/suspend.h>
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +3 -1
@@ -1994,8 +1994,10 @@ int vmw_du_connector_fill_modes(struct drm_connector *connector, }int vmw_du_connector_set_property (struct drm_connector *connector, +void *state,struct drm_property *property, -uint64_t val) +uint64_t val, +void *blob_data) {return 0 ; }
drivers/gpu/drm/vmwgfx/vmwgfx_kms.h +3 -1
@@ -141,8 +141,10 @@ vmw_du_connector_detect(struct drm_connector *connector, bool force);int vmw_du_connector_fill_modes (struct drm_connector *connector,uint32_t max_width,uint32_t max_height);int vmw_du_connector_set_property (struct drm_connector *connector, +void *state,struct drm_property *property, -uint64_t val); +uint64_t val, +void *blob_data);/*
include/drm/drmP.h +77 -0
83 lines not on this page · raw message
include/drm/drm_atomic_helper.h new file +100 -0
100 lines not on this page · raw message
include/drm/drm_crtc.h +8 -6
@@ -376,8 +376,9 @@ struct drm_crtc_funcs {struct drm_pending_vblank_event *event, uint32_t flags); -int (*set_property)(struct drm_crtc *crtc, -struct drm_property *property,uint64_t val); +int (*set_property)(struct drm_crtc *crtc,void *state, +struct drm_property *property,uint64_t val, +void *blob_data); };/**
@@ -487,8 +488,8 @@ struct drm_connector_funcs {enum drm_connector_status (*detect)(struct drm_connector *connector,bool force);int (*fill_modes)(struct drm_connector *connector,uint32_t max_width,uint32_t max_height); -int (*set_property)(struct drm_connector *connector,struct drm_property *property, -uint64_t val); +int (*set_property)(struct drm_connector *connector,void *state, +struct drm_property *property,uint64_t val,void *blob_data);void (*destroy)(struct drm_connector *connector);void (*force)(struct drm_connector *connector); };
@@ -659,8 +660,9 @@ struct drm_plane_funcs {int (*disable_plane)(struct drm_plane *plane);void (*destroy)(struct drm_plane *plane); -int (*set_property)(struct drm_plane *plane, -struct drm_property *property,uint64_t val); +int (*set_property)(struct drm_plane *plane,void *state, +struct drm_property *property,uint64_t val, +void *blob_data); };/**
Signature · 1 line
1.8.4.2
RFC v3 2/14 drm: convert crtc to ww_mutex
In reply to Rob ClarkAt the moment, this doesn't do anything. But for atomic we will have an ww_acquire_ctx associated with the state, to simplify the locking and avoid potential deadlock when we cannot control the locking order.
--- drivers/gpu/drm/drm_crtc.c | 20 +++++++++++--------- drivers/gpu/drm/i915/intel_display.c | 16 ++++++++-------- drivers/gpu/drm/omapdrm/omap_crtc.c | 10 +++++----- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 12 ++++++++---- include/drm/drm_crtc.h | 3 ++- 5 files changed, 34 insertions(+), 27 deletions(-)
drivers/gpu/drm/drm_crtc.c +11 -9
@@ -52,7 +52,7 @@ void drm_modeset_lock_all(struct drm_device *dev)mutex_lock (&dev->mode_config.mutex);list_for_each_entry (crtc, &dev->mode_config.crtc_list, head) -mutex_lock_nest_lock (&crtc->mutex, &dev->mode_config.mutex); +mutex_lock_nest_lock (&crtc->mutex.base, &dev->mode_config.mutex); }EXPORT_SYMBOL (drm_modeset_lock_all);
@@ -65,7 +65,7 @@ void drm_modeset_unlock_all(struct drm_device *dev)struct drm_crtc *crtc;list_for_each_entry (crtc, &dev->mode_config.crtc_list, head) -mutex_unlock (&crtc->mutex); +ww_mutex_unlock (&crtc->mutex);mutex_unlock (&dev->mode_config.mutex); }
@@ -84,7 +84,7 @@ void drm_warn_on_modeset_not_all_locked(struct drm_device *dev)return ;list_for_each_entry (crtc, &dev->mode_config.crtc_list, head) -WARN_ON (!mutex_is_locked (&crtc->mutex)); +WARN_ON (!ww_mutex_is_locked (&crtc->mutex));WARN_ON (!mutex_is_locked (&dev->mode_config.mutex)); }
@@ -613,6 +613,8 @@ void drm_framebuffer_remove(struct drm_framebuffer *fb) }EXPORT_SYMBOL (drm_framebuffer_remove); +static DEFINE_WW_CLASS (crtc_ww_class); +/** * drm_crtc_init - Initialise a new CRTC object * @dev: DRM device
@@ -634,8 +636,8 @@ int drm_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, crtc->invert_dimensions = false;drm_modeset_lock_all (dev); -mutex_init (&crtc->mutex); -mutex_lock_nest_lock (&crtc->mutex, &dev->mode_config.mutex); +ww_mutex_init (&crtc->mutex, &crtc_ww_class); +mutex_lock_nest_lock (&crtc->mutex.base, &dev->mode_config.mutex); ret =drm_mode_object_get (dev, &crtc->base,DRM_MODE_OBJECT_CRTC );if (ret)
@@ -2284,7 +2286,7 @@ static int drm_mode_cursor_common(struct drm_device *dev, } crtc =obj_to_crtc (obj); -mutex_lock (&crtc->mutex); +ww_mutex_lock (&crtc->mutex,NULL );if (req->flags &DRM_MODE_CURSOR_BO ) {if (!crtc->funcs->cursor_set && !crtc->funcs->cursor_set2) { ret = -ENXIO ;
@@ -2308,7 +2310,7 @@ static int drm_mode_cursor_common(struct drm_device *dev, } } out: -mutex_unlock (&crtc->mutex); +ww_mutex_unlock (&crtc->mutex);return ret;
@@ -3657,7 +3659,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,return -ENOENT ; crtc =obj_to_crtc (obj); -mutex_lock (&crtc->mutex); +ww_mutex_lock (&crtc->mutex,NULL );if (crtc->fb ==NULL ) {/* The framebuffer is currently unbound, presumably * due to a hotplug event, that userspace has not
@@ -3741,7 +3743,7 @@ out:drm_framebuffer_unreference (fb);if (old_fb)drm_framebuffer_unreference (old_fb); -mutex_unlock (&crtc->mutex); +ww_mutex_unlock (&crtc->mutex);return ret; }
drivers/gpu/drm/i915/intel_display.c +8 -8
@@ -2232,11 +2232,11 @@ void intel_display_handle_reset(struct drm_device *dev)list_for_each_entry (crtc, &dev->mode_config.crtc_list, head) {struct intel_crtc *intel_crtc =to_intel_crtc (crtc); -mutex_lock (&crtc->mutex); +ww_mutex_lock (&crtc->mutex,NULL );if (intel_crtc->active) dev_priv->display.update_plane (crtc, crtc->fb, crtc->x, crtc->y); -mutex_unlock (&crtc->mutex); +ww_mutex_unlock (&crtc->mutex); } }
@@ -7550,7 +7550,7 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector,if (encoder->crtc) { crtc = encoder->crtc; -mutex_lock (&crtc->mutex); +ww_mutex_lock (&crtc->mutex,NULL ); old->dpms_mode = connector->dpms; old->load_detect_temp = false;
@@ -7581,7 +7581,7 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector,return false; } -mutex_lock (&crtc->mutex); +ww_mutex_lock (&crtc->mutex,NULL ); intel_encoder->new_crtc =to_intel_crtc (crtc);to_intel_connector (connector)->new_encoder = intel_encoder;
@@ -7609,7 +7609,7 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector,DRM_DEBUG_KMS ("reusing fbdev for load-detection framebuffer\n" );if (IS_ERR (fb)) {DRM_DEBUG_KMS ("failed to allocate framebuffer for load-detection\n" ); -mutex_unlock (&crtc->mutex); +ww_mutex_unlock (&crtc->mutex);return false; }
@@ -7617,7 +7617,7 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector,DRM_DEBUG_KMS ("failed to set mode on load-detect pipe\n" );if (old->release_fb) old->release_fb->funcs->destroy (old->release_fb); -mutex_unlock (&crtc->mutex); +ww_mutex_unlock (&crtc->mutex);return false; }
@@ -7648,7 +7648,7 @@ void intel_release_load_detect_pipe(struct drm_connector *connector,drm_framebuffer_unreference (old->release_fb); } -mutex_unlock (&crtc->mutex); +ww_mutex_unlock (&crtc->mutex);return ; }
@@ -7656,7 +7656,7 @@ void intel_release_load_detect_pipe(struct drm_connector *connector,if (old->dpms_mode !=DRM_MODE_DPMS_ON ) connector->funcs->dpms (connector, old->dpms_mode); -mutex_unlock (&crtc->mutex); +ww_mutex_unlock (&crtc->mutex); } static int i9xx_pll_refclk(struct drm_device *dev,
drivers/gpu/drm/omapdrm/omap_crtc.c +5 -5
@@ -307,13 +307,13 @@ static void page_flip_worker(struct work_struct *work)struct drm_display_mode *mode = &crtc->mode;struct drm_gem_object *bo; -mutex_lock (&crtc->mutex); +ww_mutex_lock (&crtc->mutex,NULL );omap_plane_mode_set (omap_crtc->plane, crtc, crtc->fb,0 ,0 , mode->hdisplay, mode->vdisplay, crtc->x <<16 , crtc->y <<16 , mode->hdisplay <<16 , mode->vdisplay <<16 , vblank_cb, crtc); -mutex_unlock (&crtc->mutex); +ww_mutex_unlock (&crtc->mutex); bo =omap_framebuffer_bo (crtc->fb,0 );drm_gem_object_unreference_unlocked (bo);
@@ -447,7 +447,7 @@ static void apply_worker(struct work_struct *work)* the callbacks and list modification all serialized * with respect to modesetting ioctls from userspace. */ -mutex_lock (&crtc->mutex); +ww_mutex_lock (&crtc->mutex,NULL );dispc_runtime_get ();/*
@@ -492,7 +492,7 @@ static void apply_worker(struct work_struct *work) out:dispc_runtime_put (); -mutex_unlock (&crtc->mutex); +ww_mutex_unlock (&crtc->mutex); } int omap_crtc_apply(struct drm_crtc *crtc,
@@ -500,7 +500,7 @@ int omap_crtc_apply(struct drm_crtc *crtc, {struct omap_crtc *omap_crtc =to_omap_crtc (crtc); -WARN_ON (!mutex_is_locked (&crtc->mutex)); +WARN_ON (!ww_mutex_is_locked (&crtc->mutex));/* no need to queue it again if it is already queued: */ if (apply->queued)
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +8 -4
@@ -186,7 +186,7 @@ int vmw_du_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv,* can do this since the caller in the drm core doesn't check anything * which is protected by any looks. */ -mutex_unlock (&crtc->mutex); +ww_mutex_unlock (&crtc->mutex);drm_modeset_lock_all (dev_priv->dev);/* A lot of the code assumes this */
@@ -251,7 +251,9 @@ int vmw_du_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv, ret =0 ; out:drm_modeset_unlock_all (dev_priv->dev); -mutex_lock (&crtc->mutex); +// XXX umm, we probably need the state object here to properly +// re-aquire the lock.. +ww_mutex_lock (&crtc->mutex,NULL );return ret; }
@@ -272,7 +274,7 @@ int vmw_du_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)* can do this since the caller in the drm core doesn't check anything * which is protected by any looks. */ -mutex_unlock (&crtc->mutex); +ww_mutex_unlock (&crtc->mutex);drm_modeset_lock_all (dev_priv->dev); vmw_cursor_update_position(dev_priv, shown,
@@ -280,7 +282,9 @@ int vmw_du_crtc_cursor_move(struct drm_crtc *crtc, int x, int y) du->cursor_y + du->hotspot_y);drm_modeset_unlock_all (dev_priv->dev); -mutex_lock (&crtc->mutex); +// XXX umm, we probably need the state object here to properly +// re-aquire the lock.. +ww_mutex_lock (&crtc->mutex,NULL );return 0 ; }
include/drm/drm_crtc.h +2 -1
@@ -27,6 +27,7 @@#include <linux/i2c.h> #include <linux/spinlock.h> +#include <linux/ww_mutex.h> #include <linux/types.h> #include <linux/idr.h> #include <linux/fb.h>
@@ -417,7 +418,7 @@ struct drm_crtc {* state, ...) and a write lock for everything which can be update * without a full modeset (fb, cursor data, ...) */ -struct mutex mutex; +struct ww_mutex mutex;struct drm_mode_object base;
Signature · 1 line
1.8.4.2
Re: [RFCv3 02/14] drm: convert crtc to ww_mutex
op 20-11-13 21:48, Rob Clark schreef:
Quoted 3 lines
At the moment, this doesn't do anything. But for atomic we will have an
ww_acquire_ctxassociated with the state, to simplify the locking and avoid potential deadlock when we cannot control the locking order.
Nack. :-)
Please don't split this out. ww_mutex may be backed by a mutex, but that's an implementation detail you must not rely on.
Quoted 13 lines
--- drivers/gpu/drm/drm_crtc.c | 20 +++++++++++--------- drivers/gpu/drm/i915/intel_display.c | 16 ++++++++-------- drivers/gpu/drm/omapdrm/omap_crtc.c | 10 +++++----- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 12 ++++++++---- include/drm/drm_crtc.h | 3 ++- 5 files changed, 34 insertions(+), 27 deletions(-)drivers/gpu/drm/drm_crtc.c +0
-0
drivers/gpu/drm/drm_crtc.c void drm_modeset_lock_all(struct drm_device *dev) · line 56
Quoted 6 lines
drivers/gpu/drm/drm_crtc.c +1
-1@@ -52,7 +52,7 @@ void drm_modeset_lock_all(struct drm_device *dev)mutex_lock (&dev->mode_config.mutex);list_for_each_entry (crtc, &dev->mode_config.crtc_list, head) -mutex_lock_nest_lock (&crtc->mutex, &dev->mode_config.mutex); +mutex_lock_nest_lock (&crtc->mutex.base, &dev->mode_config.mutex); }
This breaks ww_mutex semantics, for example. What if someone holding a ww_ctx acquires has one mutex, and tries to acquire a second crtc mutex? If lockdep was smart it would notice that this lock is nested in different locks, but I don't think lockdep is that smart.
Quoted 30 lines
drivers/gpu/drm/drm_crtc.c +4
-2EXPORT_SYMBOL (drm_modeset_lock_all);@@ -65,7 +65,7 @@ void drm_modeset_unlock_all(struct drm_device *dev)struct drm_crtc *crtc;list_for_each_entry (crtc, &dev->mode_config.crtc_list, head) -mutex_unlock (&crtc->mutex); +ww_mutex_unlock (&crtc->mutex);mutex_unlock (&dev->mode_config.mutex); }@@ -84,7 +84,7 @@ void drm_warn_on_modeset_not_all_locked(struct drm_device *dev)return ;list_for_each_entry (crtc, &dev->mode_config.crtc_list, head) -WARN_ON (!mutex_is_locked (&crtc->mutex)); +WARN_ON (!ww_mutex_is_locked (&crtc->mutex));WARN_ON (!mutex_is_locked (&dev->mode_config.mutex)); }@@ -613,6 +613,8 @@ void drm_framebuffer_remove(struct drm_framebuffer *fb) }EXPORT_SYMBOL (drm_framebuffer_remove); +static DEFINE_WW_CLASS (crtc_ww_class); +/** * drm_crtc_init - Initialise a new CRTC object * @dev: DRM device
drivers/gpu/drm/drm_crtc.c int drm_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, · line 640
Quoted 7 lines
drivers/gpu/drm/drm_crtc.c +2
-2@@ -634,8 +636,8 @@ int drm_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, crtc->invert_dimensions = false;drm_modeset_lock_all (dev); -mutex_init (&crtc->mutex); -mutex_lock_nest_lock (&crtc->mutex, &dev->mode_config.mutex); +ww_mutex_init (&crtc->mutex, &crtc_ww_class); +mutex_lock_nest_lock (&crtc->mutex.base, &dev->mode_config.mutex);
In a later patch you keep this snippet, please make this a trylock instead. It removes the assumption that ww_mutex has mutex as base.
~Maarten
Re: [RFCv3 02/14] drm: convert crtc to ww_mutex
Quoted 7 lines · Maarten Lankhorst
op 20-11-13 21:48, Rob Clark schreef:
Quoted 3 lines
At the moment, this doesn't do anything. But for atomic we will have an
ww_acquire_ctxassociated with the state, to simplify the locking and avoid potential deadlock when we cannot control the locking order.Nack. :-)
Please don't split this out.
ww_mutexmay be backed by a mutex, but that's an implementation detail you must not rely on.
well, everywhere (but mutex_lock_nest_lock()) is using the ww_mutex fxns, so once the mutex_lock_nest_lock() thing is sorted, that shouldn't be a problem. The reason I was thinking about either squashing this, or re-juggling a bit is because it doesn't make much sense to change everything to ww_mutex and then a couple patches later to drm_modeset_{lock,unlock}_crtc().
BR,
-R
Quoted 62 lines
Quoted 13 lines
--- drivers/gpu/drm/drm_crtc.c | 20 +++++++++++--------- drivers/gpu/drm/i915/intel_display.c | 16 ++++++++-------- drivers/gpu/drm/omapdrm/omap_crtc.c | 10 +++++----- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 12 ++++++++---- include/drm/drm_crtc.h | 3 ++- 5 files changed, 34 insertions(+), 27 deletions(-)drivers/gpu/drm/drm_crtc.c +0
-0drivers/gpu/drm/drm_crtc.c void drm_modeset_lock_all(struct drm_device *dev) · line 56
Quoted 6 lines
drivers/gpu/drm/drm_crtc.c +1
-1@@ -52,7 +52,7 @@ void drm_modeset_lock_all(struct drm_device *dev)mutex_lock (&dev->mode_config.mutex);list_for_each_entry (crtc, &dev->mode_config.crtc_list, head) -mutex_lock_nest_lock (&crtc->mutex, &dev->mode_config.mutex); +mutex_lock_nest_lock (&crtc->mutex.base, &dev->mode_config.mutex); }This breaks
ww_mutexsemantics, for example. What if someone holding aww_ctxacquires has one mutex, and tries to acquire a second crtc mutex? If lockdep was smart it would notice that this lock is nested in different locks, but I don't think lockdep is that smart.Quoted 30 lines
drivers/gpu/drm/drm_crtc.c +4
-2EXPORT_SYMBOL (drm_modeset_lock_all);@@ -65,7 +65,7 @@ void drm_modeset_unlock_all(struct drm_device *dev)struct drm_crtc *crtc;list_for_each_entry (crtc, &dev->mode_config.crtc_list, head) -mutex_unlock (&crtc->mutex); +ww_mutex_unlock (&crtc->mutex);mutex_unlock (&dev->mode_config.mutex); }@@ -84,7 +84,7 @@ void drm_warn_on_modeset_not_all_locked(struct drm_device *dev)return ;list_for_each_entry (crtc, &dev->mode_config.crtc_list, head) -WARN_ON (!mutex_is_locked (&crtc->mutex)); +WARN_ON (!ww_mutex_is_locked (&crtc->mutex));WARN_ON (!mutex_is_locked (&dev->mode_config.mutex)); }@@ -613,6 +613,8 @@ void drm_framebuffer_remove(struct drm_framebuffer *fb) }EXPORT_SYMBOL (drm_framebuffer_remove); +static DEFINE_WW_CLASS (crtc_ww_class); +/** * drm_crtc_init - Initialise a new CRTC object * @dev: DRM device drivers/gpu/drm/drm_crtc.c int drm_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, · line 640
Quoted 7 lines
drivers/gpu/drm/drm_crtc.c +2
-2@@ -634,8 +636,8 @@ int drm_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, crtc->invert_dimensions = false;drm_modeset_lock_all (dev); -mutex_init (&crtc->mutex); -mutex_lock_nest_lock (&crtc->mutex, &dev->mode_config.mutex); +ww_mutex_init (&crtc->mutex, &crtc_ww_class); +mutex_lock_nest_lock (&crtc->mutex.base, &dev->mode_config.mutex);In a later patch you keep this snippet, please make this a trylock instead. It removes the assumption that
ww_mutexhas mutex as base.~Maarten
RFC v3 3/14 drm: add object property type
In reply to Rob ClarkAn object property is an id (idr) for a drm mode object. This will allow a property to be used set/get a framebuffer, CRTC, etc.
--- drivers/gpu/drm/drm_crtc.c | 34 ++++++++++++++++++++++++++++++---- include/drm/drm_crtc.h | 10 ++++++++++ include/uapi/drm/drm_mode.h | 1 + 3 files changed, 41 insertions(+), 4 deletions(-)
drivers/gpu/drm/drm_crtc.c +30 -4
@@ -2828,6 +2828,8 @@ struct drm_property *drm_property_create(struct drm_device *dev, int flags,if (!property)return NULL ; + property->dev = dev; +if (num_values) { property->values =kzalloc (sizeof (uint64_t )*num_values,GFP_KERNEL );if (!property->values)
@@ -2931,6 +2933,23 @@ struct drm_property *drm_property_create_range(struct drm_device *dev, int flags }EXPORT_SYMBOL (drm_property_create_range); +struct drm_property *drm_property_create_object (struct drm_device *dev, +int flags,const char *name,uint32_t type) +{ +struct drm_property *property; + + flags |=DRM_MODE_PROP_OBJECT ; + + property =drm_property_create (dev, flags, name,1 ); +if (!property) +return NULL ; + + property->values[0 ] = type; + +return property; +} +EXPORT_SYMBOL (drm_property_create_object); +int drm_property_add_enum (struct drm_property *property,int index,uint64_t value,const char *name) {
@@ -3259,6 +3278,11 @@ static bool drm_property_change_is_valid(struct drm_property *property, }else if (property->flags &DRM_MODE_PROP_BLOB ) {/* Only the driver knows */ return true; + }else if (property->flags &DRM_MODE_PROP_OBJECT ) { +/* a zero value for an object property translates to null: */ +if (value ==0 ) +return true; +return drm_property_get_obj (property, value) !=NULL ; }else {int i;for (i =0 ; i < property->num_values; i++)
@@ -3335,9 +3359,9 @@ static int drm_mode_plane_set_obj_prop(struct drm_plane *plane,return ret; } -static int drm_mode_set_obj_prop (struct drm_device *dev, -struct drm_mode_object *obj,void *state, -struct drm_property *property,uint64_t value,void *blob_data) +static int drm_mode_set_obj_prop (struct drm_mode_object *obj, +void *state,struct drm_property *property, +uint64_t value,void *blob_data) {if (drm_property_change_is_valid (property, value)) {switch (obj->type) {
@@ -3351,6 +3375,8 @@ static int drm_mode_set_obj_prop(struct drm_device *dev,return drm_mode_plane_set_obj_prop (obj_to_plane (obj), state, property, value, blob_data); } + }else { +DRM_DEBUG ("invalid value: %s = %llx\n" , property->name, value); }return -EINVAL ;
@@ -3385,7 +3411,7 @@ static int drm_mode_set_obj_prop_id(struct drm_device *dev, void *state,return -ENOENT ; property =obj_to_property (prop_obj); -return drm_mode_set_obj_prop (dev, arg_obj, state, property, +return drm_mode_set_obj_prop (arg_obj, state, property, value, blob_data); }
include/drm/drm_crtc.h +10 -0
@@ -306,6 +306,7 @@ struct drm_property {char name[DRM_PROP_NAME_LEN ];uint32_t num_values;uint64_t *values; +struct drm_device *dev;struct list_head enum_blob_list; };
@@ -1041,6 +1042,8 @@ struct drm_property *drm_property_create_bitmask(struct drm_device *dev,struct drm_property *drm_property_create_range (struct drm_device *dev,int flags,const char *name,uint64_t min,uint64_t max); +struct drm_property *drm_property_create_object (struct drm_device *dev, +int flags,const char *name,uint32_t type);extern void drm_property_destroy (struct drm_device *dev,struct drm_property *property);extern int drm_property_add_enum (struct drm_property *property,int index,uint64_t value,const char *name);
@@ -1059,6 +1062,13 @@ extern int drm_mode_crtc_set_gamma_size(struct drm_crtc *crtc, int gamma_size);extern struct drm_mode_object *drm_mode_object_find (struct drm_device *dev,uint32_t id,uint32_t type); + +static inline struct drm_mode_object * +drm_property_get_obj (struct drm_property *property,uint64_t value) +{ +return drm_mode_object_find (property->dev, value, property->values[0 ]); +} +/* IOCTLs */ extern int drm_mode_getresources (struct drm_device *dev,void *data,struct drm_file *file_priv);
include/uapi/drm/drm_mode.h +1 -0
@@ -250,6 +250,7 @@ struct drm_mode_get_connector {#define DRM_MODE_PROP_ENUM (1<<3)/* enumerated type with text strings */ #define DRM_MODE_PROP_BLOB (1<<4)#define DRM_MODE_PROP_BITMASK (1<<5)/* bitmask of enumerated types */ +#define DRM_MODE_PROP_OBJECT (1<<6)/* drm mode object */ struct drm_mode_property_enum {__u64 value;
Signature · 1 line
1.8.4.2
RFC v3 4/14 drm: add DRM_MODE_PROP_DYNAMIC property flag
In reply to Rob ClarkThis indicates to userspace that the property is something that can be set dynamically without requiring a "test" step to check if the hw is capable. This allows a userspace compositor, such as weston, to avoid an extra ioctl to check whether it needs to fall-back to GPU to composite some surface prior to submission of GPU render commands.
--- include/uapi/drm/drm_mode.h | 9 +++++++++ 1 file changed, 9 insertions(+)
include/uapi/drm/drm_mode.h +9 -0
@@ -251,6 +251,15 @@ struct drm_mode_get_connector {#define DRM_MODE_PROP_BLOB (1<<4)#define DRM_MODE_PROP_BITMASK (1<<5)/* bitmask of enumerated types */ #define DRM_MODE_PROP_OBJECT (1<<6)/* drm mode object */ +/* Properties that are not dynamic cannot safely be changed without a +* atomic-modeset / atomic-pageflip test step. But if userspace is +* only changing dynamic properties, it is guaranteed that the change +* will not exceed hw limits, so no test step is required. +* +* Note that fb_id properties are a bit ambiguous.. they of course can +* be changed dynamically, assuming the pixel format does not change. +*/ +#define DRM_MODE_PROP_DYNAMIC (1<<24)struct drm_mode_property_enum {__u64 value;
Signature · 1 line
1.8.4.2
RFC v3 5/14 drm: add DRM_MODE_PROP_SIGNED property flag
In reply to Rob ClarkFlag for range property types indicating that the value is a signed integer rather than unsigned. For range properties, the signed flag will trigger use of signed integer comparisions, to handle negative values properly.
--- drivers/gpu/drm/drm_crtc.c | 15 +++++++++++---- include/drm/drm_crtc.h | 9 +++++++++ include/uapi/drm/drm_mode.h | 2 ++ 3 files changed, 22 insertions(+), 4 deletions(-)
drivers/gpu/drm/drm_crtc.c +11 -4
@@ -3263,11 +3263,18 @@ EXPORT_SYMBOL(drm_mode_connector_update_edid_property);static bool drm_property_change_is_valid (struct drm_property *property,uint64_t value) { -if (property->flags &DRM_MODE_PROP_IMMUTABLE ) +if (property->flags &DRM_MODE_PROP_IMMUTABLE ) {return false; -if (property->flags &DRM_MODE_PROP_RANGE ) { -if (value < property->values[0 ] || value > property->values[1 ]) -return false; + }else if (property->flags &DRM_MODE_PROP_RANGE ) { +if (property->flags &DRM_MODE_PROP_SIGNED ) { +int64_t svalue =U642I64 (value); +if (svalue <U642I64 (property->values[0 ]) || + svalue >U642I64 (property->values[1 ])) +return false; + }else { +if (value < property->values[0 ] || value > property->values[1 ]) +return false; + }return true; }else if (property->flags &DRM_MODE_PROP_BITMASK ) {int i;
include/drm/drm_crtc.h +9 -0
@@ -65,6 +65,15 @@ struct drm_object_properties {uint64_t values[DRM_OBJECT_MAX_PROPERTY ]; }; +static inline int64_t U642I64 (uint64_t val) +{ +return (int64_t )*((int64_t *)&val); +} +static inline uint64_t I642U64 (int64_t val) +{ +return (uint64_t )*((uint64_t *)&val); +} +/* * 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,
include/uapi/drm/drm_mode.h +2 -0
@@ -260,6 +260,8 @@ struct drm_mode_get_connector {* be changed dynamically, assuming the pixel format does not change. */ #define DRM_MODE_PROP_DYNAMIC (1<<24) +/* Indicates that numeric property values are signed rather than unsigned: */ +#define DRM_MODE_PROP_SIGNED (1<<25)struct drm_mode_property_enum {__u64 value;
Signature · 1 line
1.8.4.2
RFC v3 6/14 drm: helpers to find mode objects
In reply to Rob ClarkAdd a few more useful helpers to find mode objects.
--- include/drm/drm_crtc.h | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
include/drm/drm_crtc.h +25 -0
@@ -1170,6 +1170,15 @@ extern int drm_format_vert_chroma_subsampling(uint32_t format);extern const char *drm_get_format_name (uint32_t format);/* Helpers */ + +static inline struct drm_plane *drm_plane_find (struct drm_device *dev, +uint32_t id) +{ +struct drm_mode_object *mo; + mo =drm_mode_object_find (dev, id,DRM_MODE_OBJECT_PLANE ); +return mo ?obj_to_plane (mo) :NULL ; +} +static inline struct drm_crtc *drm_crtc_find (struct drm_device *dev,uint32_t id) {
@@ -1186,4 +1195,20 @@ static inline struct drm_encoder *drm_encoder_find(struct drm_device *dev, return mo ? obj_to_encoder(mo) : NULL; } +static inline struct drm_connector *drm_connector_find (struct drm_device *dev, +uint32_t id) +{ +struct drm_mode_object *mo; + mo =drm_mode_object_find (dev, id,DRM_MODE_OBJECT_CONNECTOR ); +return mo ?obj_to_connector (mo) :NULL ; +} + +static inline struct drm_property_blob * +drm_property_blob_find (struct drm_device *dev,uint32_t id) +{ +struct drm_mode_object *mo; + mo =drm_mode_object_find (dev, id,DRM_MODE_OBJECT_BLOB ); +return mo ?obj_to_blob (mo) :NULL ; +} +#endif /* __DRM_CRTC_H__ */
Signature · 1 line
1.8.4.2
RFC v3 7/14 drm: split propvals out and blob property support
In reply to Rob ClarkSplit property values out into a different struct, so we can later move property values into state structs. This will allow the property values to stay in sync w/ the state updates which are either discarded or atomically committed.
And since we are touching all the same code, add support for mutable blob properties, which will also be needed for atomic modeset.
--- drivers/gpu/drm/drm_crtc.c | 79 +++++++++++++++++++++-------- drivers/gpu/drm/drm_fb_helper.c | 3 +- drivers/gpu/drm/gma500/cdv_intel_dp.c | 3 +- drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 3 +- drivers/gpu/drm/gma500/cdv_intel_lvds.c | 6 ++- drivers/gpu/drm/gma500/mdfld_dsi_output.c | 8 +-- drivers/gpu/drm/gma500/psb_intel_lvds.c | 6 ++- drivers/gpu/drm/gma500/psb_intel_sdvo.c | 19 +++++-- drivers/gpu/drm/i2c/ch7006_drv.c | 4 +- drivers/gpu/drm/i915/intel_display.c | 3 +- drivers/gpu/drm/i915/intel_dp.c | 3 +- drivers/gpu/drm/i915/intel_hdmi.c | 3 +- drivers/gpu/drm/i915/intel_sdvo.c | 19 +++++-- drivers/gpu/drm/i915/intel_tv.c | 6 ++- drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 3 +- drivers/gpu/drm/nouveau/nouveau_connector.c | 4 +- drivers/gpu/drm/omapdrm/omap_drv.c | 6 ++- drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 3 +- drivers/gpu/drm/rcar-du/rcar_du_vgacon.c | 3 +- drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 4 +- include/drm/drm_crtc.h | 11 +++- 21 files changed, 142 insertions(+), 57 deletions(-)
drivers/gpu/drm/drm_crtc.c +58 -21
@@ -90,6 +90,14 @@ void drm_warn_on_modeset_not_all_locked(struct drm_device *dev) }EXPORT_SYMBOL (drm_warn_on_modeset_not_all_locked); +static int drm_mode_set_obj_prop (struct drm_mode_object *obj, +void *state,struct drm_property *property, +uint64_t value,void *blob_data); +static struct drm_property_blob *drm_property_create_blob (struct drm_device *dev, +int length,void *data); +static void drm_property_destroy_blob (struct drm_device *dev, +struct drm_property_blob *blob); +/* Avoid boilerplate. I'm tired of typing. */ #define DRM_ENUM_NAME_FN (fnname, list) \ const char *fnname(int val) \
@@ -644,6 +652,7 @@ int drm_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, goto out; crtc->base.properties = &crtc->properties; + crtc->base.propvals = &crtc->propvals;list_add_tail (&crtc->head, &dev->mode_config.crtc_list); dev->mode_config.num_crtc++;
@@ -733,6 +742,7 @@ int drm_connector_init(struct drm_device *dev, goto out; connector->base.properties = &connector->properties; + connector->base.propvals = &connector->propvals; connector->dev = dev; connector->funcs = funcs; connector->connector_type = connector_type;
@@ -906,6 +916,7 @@ int drm_plane_init(struct drm_device *dev, struct drm_plane *plane, goto out; plane->base.properties = &plane->properties; + plane->base.propvals = &plane->propvals; plane->dev = dev; plane->funcs = funcs; plane->format_types = kmalloc(sizeof(uint32_t) * format_count,
@@ -1712,7 +1723,7 @@ int drm_mode_getconnector(struct drm_device *dev, void *data, goto out; } -if (put_user (connector->properties.values[i], +if (put_user (connector->propvals.values[i], prop_values + copied)) { ret = -EFAULT ; goto out;
@@ -3021,19 +3032,33 @@ void drm_object_attach_property(struct drm_mode_object *obj, } obj->properties->ids[count] = property->base.id; - obj->properties->values[count] = init_val; + obj->propvals->values[count] = init_val; obj->properties->count++; }EXPORT_SYMBOL (drm_object_attach_property);int drm_object_property_set_value (struct drm_mode_object *obj, -struct drm_property *property,uint64_t val) +struct drm_object_property_values *propvals, +struct drm_property *property,uint64_t val, +void *blob_data) {int i;for (i =0 ; i < obj->properties->count; i++) {if (obj->properties->ids[i] == property->base.id) { - obj->properties->values[i] = val; +struct drm_device *dev = property->dev; +if (property->flags &DRM_MODE_PROP_BLOB ) { +struct drm_property_blob *blob, *old_blob =NULL ; + old_blob =drm_property_blob_find (dev, propvals->values[i]); + blob =drm_property_create_blob (dev, val, blob_data); +if (!blob) +return -ENOMEM ; + propvals->values[i] = blob->base.id; +if (old_blob) +drm_property_destroy_blob (dev, old_blob); + }else { + propvals->values[i] = val; + }return 0 ; } }
@@ -3049,7 +3074,7 @@ int drm_object_property_get_value(struct drm_mode_object *obj,for (i =0 ; i < obj->properties->count; i++) {if (obj->properties->ids[i] == property->base.id) { - *val = obj->properties->values[i]; + *val = obj->propvals->values[i];return 0 ; } }
@@ -3234,27 +3259,35 @@ int drm_mode_connector_update_edid_property(struct drm_connector *connector, struct edid *edid) {struct drm_device *dev = connector->dev; -int ret, size; +struct drm_mode_object *obj = &connector->base; +struct drm_property *edid_prop = dev->mode_config.edid_property; +int i, ret, size; -if (connector->edid_blob_ptr) -drm_property_destroy_blob (dev, connector->edid_blob_ptr); +/* property_blob will be recreated by drm_object_property_set_value(): */ + connector->edid_blob_ptr =NULL ;/* Delete edid, when there is none. */ if (!edid) { - connector->edid_blob_ptr =NULL ; - ret =drm_object_property_set_value (&connector->base, dev->mode_config.edid_property,0 ); + ret =drm_object_property_set_value (obj, + &connector->propvals, edid_prop,0 ,NULL );return ret; } size =EDID_LENGTH * (1 + edid->extensions); - connector->edid_blob_ptr =drm_property_create_blob (connector->dev, - size, edid); -if (!connector->edid_blob_ptr) -return -EINVAL ; - ret =drm_object_property_set_value (&connector->base, - dev->mode_config.edid_property, - connector->edid_blob_ptr->base.id); + ret =drm_object_property_set_value (obj, + &connector->propvals, edid_prop, size, edid); +if (ret) +return ret; + +/* find the blob object created for us by drm_object_property_set_value(): */ +for (i =0 ; i < obj->properties->count; i++) { +if (obj->properties->ids[i] == edid_prop->base.id) { + connector->edid_blob_ptr =drm_property_blob_find (dev, + connector->propvals.values[i]); +break ; + } + }return ret; }
@@ -3332,7 +3365,9 @@ static int drm_mode_connector_set_obj_prop(struct drm_connector *connector,/* store the property value if successful */ if (!ret) -drm_object_property_set_value (&connector->base, property, value); +drm_object_property_set_value (&connector->base, + &connector->propvals, property, value, blob_data); +return ret; }
@@ -3346,7 +3381,8 @@ static int drm_mode_crtc_set_obj_prop(struct drm_crtc *crtc, ret = crtc->funcs->set_property (crtc, state, property, value, blob_data);if (!ret) -drm_object_property_set_value (&crtc->base, property, value); +drm_object_property_set_value (&crtc->base, &crtc->propvals, + property, value,NULL );return ret; }
@@ -3361,7 +3397,8 @@ static int drm_mode_plane_set_obj_prop(struct drm_plane *plane, ret = plane->funcs->set_property (plane, state, property, value, blob_data);if (!ret) -drm_object_property_set_value (&plane->base, property, value); +drm_object_property_set_value (&plane->base, &plane->propvals, + property, value,NULL );return ret; }
@@ -3464,7 +3501,7 @@ int drm_mode_obj_get_properties_ioctl(struct drm_device *dev, void *data, ret = -EFAULT ; goto out; } -if (put_user (obj->properties->values[i], +if (put_user (obj->propvals->values[i], prop_values_ptr + copied)) { ret = -EFAULT ; goto out;
drivers/gpu/drm/drm_fb_helper.c +2 -1
@@ -431,7 +431,8 @@ static void drm_fb_helper_dpms(struct fb_info *info, int dpms_mode) connector = fb_helper->connector_info[j]->connector; connector->funcs->dpms (connector, dpms_mode);drm_object_property_set_value (&connector->base, - dev->mode_config.dpms_property, dpms_mode); + &connector->propvals, + dev->mode_config.dpms_property, dpms_mode,NULL ); } }drm_modeset_unlock_all (dev);
drivers/gpu/drm/gma500/cdv_intel_dp.c +2 -1
@@ -1654,7 +1654,8 @@ cdv_intel_dp_set_property(struct drm_connector *connector,struct cdv_intel_dp *intel_dp = encoder->dev_priv;int ret; - ret =drm_object_property_set_value (&connector->base, property, val); + ret =drm_object_property_set_value (&connector->base, + &connector->propvals, property, val, blob_data);if (ret)return ret;
drivers/gpu/drm/gma500/cdv_intel_hdmi.c +2 -1
@@ -191,7 +191,8 @@ static int cdv_hdmi_set_property(struct drm_connector *connector,return 0 ;if (drm_object_property_set_value (&connector->base, - property, value)) + &connector->propvals, + property, value, blob_data))return -1 ; centre = (curValue == DRM_MODE_SCALE_NO_SCALE) ||
drivers/gpu/drm/gma500/cdv_intel_lvds.c +4 -2
@@ -486,8 +486,9 @@ static int cdv_intel_lvds_set_property(struct drm_connector *connector,return 0 ;if (drm_object_property_set_value (&connector->base, + &connector->propvals, property, - value)) + value, blob_data))return -1 ; if (crtc->saved_mode.hdisplay != 0 &&
@@ -501,8 +502,9 @@ static int cdv_intel_lvds_set_property(struct drm_connector *connector, } }else if (!strcmp (property->name,"backlight" ) && encoder) {if (drm_object_property_set_value (&connector->base, + &connector->propvals, property, - value)) + value, blob_data))return -1 ;else gma_backlight_set (encoder->dev, value);
drivers/gpu/drm/gma500/mdfld_dsi_output.c +5 -3
@@ -276,7 +276,8 @@ static int mdfld_dsi_connector_set_property(struct drm_connector *connector, goto set_prop_done;if (drm_object_property_set_value (&connector->base, - property, value)) + &connector->propvals, + property, value, blob_data)) goto set_prop_error; centerechange = (val == DRM_MODE_SCALE_NO_SCALE) ||
@@ -300,8 +301,9 @@ static int mdfld_dsi_connector_set_property(struct drm_connector *connector, } } }else if (!strcmp (property->name,"backlight" ) && encoder) { -if (drm_object_property_set_value (&connector->base, property, - value)) +if (drm_object_property_set_value (&connector->base, + &connector->propvals, + property, value, blob_data)) goto set_prop_error;else gma_backlight_set (encoder->dev, value);
drivers/gpu/drm/gma500/psb_intel_lvds.c +4 -2
@@ -606,8 +606,9 @@ int psb_intel_lvds_set_property(struct drm_connector *connector, goto set_prop_done;if (drm_object_property_set_value (&connector->base, + &connector->propvals, property, - value)) + value, blob_data)) goto set_prop_error; if (crtc->saved_mode.hdisplay != 0 &&
@@ -621,8 +622,9 @@ int psb_intel_lvds_set_property(struct drm_connector *connector, } }else if (!strcmp (property->name,"backlight" )) {if (drm_object_property_set_value (&connector->base, + &connector->propvals, property, - value)) + value, blob_data)) goto set_prop_error;else gma_backlight_set (encoder->dev, value);
drivers/gpu/drm/gma500/psb_intel_sdvo.c +14 -5
@@ -1717,7 +1717,8 @@ psb_intel_sdvo_set_property(struct drm_connector *connector,uint8_t cmd;int ret; - ret =drm_object_property_set_value (&connector->base, property, val); + ret =drm_object_property_set_value (&connector->base, + &connector->propvals, property, val, blob_data);if (ret)return ret;
@@ -1773,7 +1774,9 @@ psb_intel_sdvo_set_property(struct drm_connector *connector, temp_value = val;if (psb_intel_sdvo_connector->left == property) {drm_object_property_set_value (&connector->base, - psb_intel_sdvo_connector->right, val); + &connector->propvals, + psb_intel_sdvo_connector->right, + val, blob_data);if (psb_intel_sdvo_connector->left_margin == temp_value)return 0 ;
@@ -1785,7 +1788,9 @@ psb_intel_sdvo_set_property(struct drm_connector *connector, goto set_value; }else if (psb_intel_sdvo_connector->right == property) {drm_object_property_set_value (&connector->base, - psb_intel_sdvo_connector->left, val); + &connector->propvals, + psb_intel_sdvo_connector->left, + val, blob_data);if (psb_intel_sdvo_connector->right_margin == temp_value)return 0 ;
@@ -1797,7 +1802,9 @@ psb_intel_sdvo_set_property(struct drm_connector *connector, goto set_value; }else if (psb_intel_sdvo_connector->top == property) {drm_object_property_set_value (&connector->base, - psb_intel_sdvo_connector->bottom, val); + &connector->propvals, + psb_intel_sdvo_connector->bottom, + val, blob_data);if (psb_intel_sdvo_connector->top_margin == temp_value)return 0 ;
@@ -1809,7 +1816,9 @@ psb_intel_sdvo_set_property(struct drm_connector *connector, goto set_value; }else if (psb_intel_sdvo_connector->bottom == property) {drm_object_property_set_value (&connector->base, - psb_intel_sdvo_connector->top, val); + &connector->propvals, + psb_intel_sdvo_connector->top, + val, blob_data);if (psb_intel_sdvo_connector->bottom_margin == temp_value)return 0 ;
drivers/gpu/drm/i2c/ch7006_drv.c +2 -2
@@ -214,9 +214,9 @@ static enum drm_connector_status ch7006_encoder_detect(struct drm_encoder *encodelse priv->subconnector = DRM_MODE_SUBCONNECTOR_Unknown; -drm_object_property_set_value (&connector->base, +drm_object_property_set_value (&connector->base, &connector->propvals, encoder->dev->mode_config.tv_subconnector_property, - priv->subconnector); + priv->subconnector,NULL );return priv->subconnector ? connector_status_connected : connector_status_disconnected;
drivers/gpu/drm/i915/intel_display.c +2 -1
@@ -8959,8 +8959,9 @@ intel_modeset_update_state(struct drm_device *dev, unsigned prepare_pipes) connector->dpms =DRM_MODE_DPMS_ON ;drm_object_property_set_value (&connector->base, + &connector->propvals, dpms_property, -DRM_MODE_DPMS_ON ); +DRM_MODE_DPMS_ON ,NULL ); intel_encoder =to_intel_encoder (connector->encoder); intel_encoder->connectors_active = true;
drivers/gpu/drm/i915/intel_dp.c +2 -1
@@ -3171,7 +3171,8 @@ intel_dp_set_property(struct drm_connector *connector,struct intel_dp *intel_dp =enc_to_intel_dp (&intel_encoder->base);int ret; - ret =drm_object_property_set_value (&connector->base, property, val); + ret =drm_object_property_set_value (&connector->base, + &connector->propvals, property, val, blob_data);if (ret)return ret;
drivers/gpu/drm/i915/intel_hdmi.c +2 -1
@@ -1015,7 +1015,8 @@ intel_hdmi_set_property(struct drm_connector *connector,struct drm_i915_private *dev_priv = connector->dev->dev_private;int ret; - ret =drm_object_property_set_value (&connector->base, property, val); + ret =drm_object_property_set_value (&connector->base, + &connector->propvals, property, val, blob_data);if (ret)return ret;
drivers/gpu/drm/i915/intel_sdvo.c +14 -5
@@ -2044,7 +2044,8 @@ intel_sdvo_set_property(struct drm_connector *connector,uint8_t cmd;int ret; - ret =drm_object_property_set_value (&connector->base, property, val); + ret =drm_object_property_set_value (&connector->base, + &connector->propvals, property, val, blob_data);if (ret)return ret;
@@ -2121,7 +2122,9 @@ intel_sdvo_set_property(struct drm_connector *connector, temp_value = val;if (intel_sdvo_connector->left == property) {drm_object_property_set_value (&connector->base, - intel_sdvo_connector->right, val); + &connector->propvals, + intel_sdvo_connector->right, + val, blob_data);if (intel_sdvo_connector->left_margin == temp_value)return 0 ;
@@ -2133,7 +2136,9 @@ intel_sdvo_set_property(struct drm_connector *connector, goto set_value; }else if (intel_sdvo_connector->right == property) {drm_object_property_set_value (&connector->base, - intel_sdvo_connector->left, val); + &connector->propvals, + intel_sdvo_connector->left, + val, blob_data);if (intel_sdvo_connector->right_margin == temp_value)return 0 ;
@@ -2145,7 +2150,9 @@ intel_sdvo_set_property(struct drm_connector *connector, goto set_value; }else if (intel_sdvo_connector->top == property) {drm_object_property_set_value (&connector->base, - intel_sdvo_connector->bottom, val); + &connector->propvals, + intel_sdvo_connector->bottom, + val, blob_data);if (intel_sdvo_connector->top_margin == temp_value)return 0 ;
@@ -2157,7 +2164,9 @@ intel_sdvo_set_property(struct drm_connector *connector, goto set_value; }else if (intel_sdvo_connector->bottom == property) {drm_object_property_set_value (&connector->base, - intel_sdvo_connector->top, val); + &connector->propvals, + intel_sdvo_connector->top, + val, blob_data);if (intel_sdvo_connector->bottom_margin == temp_value)return 0 ;
drivers/gpu/drm/i915/intel_tv.c +4 -2
@@ -1292,7 +1292,8 @@ static void intel_tv_find_better_format(struct drm_connector *connector) intel_tv->tv_format = tv_mode->name;drm_object_property_set_value (&connector->base, - connector->dev->mode_config.tv_mode_property, i); + &connector->propvals, + connector->dev->mode_config.tv_mode_property, i,NULL ); }/**
@@ -1449,7 +1450,8 @@ intel_tv_set_property(struct drm_connector *connector, void *state,int ret =0 ;bool changed = false; - ret =drm_object_property_set_value (&connector->base, property, val); + ret =drm_object_property_set_value (&connector->base, + &connector->propvals, property, val, blob_data);if (ret <0 ) goto out;
drivers/gpu/drm/nouveau/dispnv04/tvnv17.c +2 -1
@@ -196,8 +196,9 @@ nv17_tv_detect(struct drm_encoder *encoder, struct drm_connector *connector) }drm_object_property_set_value (&connector->base, + &connector->propvals, conf->tv_subconnector_property, - tv_enc->subconnector); + tv_enc->subconnector,NULL );if (!reliable) {return connector_status_unknown;
drivers/gpu/drm/nouveau/nouveau_connector.c +3 -1
@@ -227,10 +227,12 @@ nouveau_connector_set_encoder(struct drm_connector *connector,if (nv_connector->type ==DCB_CONNECTOR_DVI_I ) {drm_object_property_set_value (&connector->base, + &connector->propvals, dev->mode_config.dvi_i_subconnector_property, nv_encoder->dcb->type ==DCB_OUTPUT_TMDS ?DRM_MODE_SUBCONNECTOR_DVID : -DRM_MODE_SUBCONNECTOR_DVIA ); +DRM_MODE_SUBCONNECTOR_DVIA , +NULL ); } }
drivers/gpu/drm/omapdrm/omap_drv.c +4 -2
@@ -553,12 +553,14 @@ static void dev_lastclose(struct drm_device *dev)*/ for (i =0 ; i < priv->num_crtcs; i++) {drm_object_property_set_value (&priv->crtcs[i]->base, - priv->rotation_prop,0 ); + &priv->crtcs[i]->propvals, + priv->rotation_prop,0 ,NULL ); }for (i =0 ; i < priv->num_planes; i++) {drm_object_property_set_value (&priv->planes[i]->base, - priv->rotation_prop,0 ); + &priv->planes[i]->propvals, + priv->rotation_prop,0 ,NULL ); } }
drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c +2 -1
@@ -118,7 +118,8 @@ int rcar_du_lvds_connector_init(struct rcar_du_device *rcdu,drm_helper_connector_dpms (connector,DRM_MODE_DPMS_OFF );drm_object_property_set_value (&connector->base, - rcdu->ddev->mode_config.dpms_property,DRM_MODE_DPMS_OFF ); + &connector->propvals, + rcdu->ddev->mode_config.dpms_property,DRM_MODE_DPMS_OFF ,NULL ); ret =drm_mode_connector_attach_encoder (connector, &renc->encoder);if (ret <0 )
drivers/gpu/drm/rcar-du/rcar_du_vgacon.c +2 -1
@@ -83,7 +83,8 @@ int rcar_du_vga_connector_init(struct rcar_du_device *rcdu,drm_helper_connector_dpms (connector,DRM_MODE_DPMS_OFF );drm_object_property_set_value (&connector->base, - rcdu->ddev->mode_config.dpms_property,DRM_MODE_DPMS_OFF ); + &connector->propvals, + rcdu->ddev->mode_config.dpms_property,DRM_MODE_DPMS_OFF ,NULL ); ret =drm_mode_connector_attach_encoder (connector, &renc->encoder);if (ret <0 )
drivers/gpu/drm/shmobile/shmob_drm_crtc.c +2 -2
@@ -738,8 +738,8 @@ int shmob_drm_connector_create(struct shmob_drm_device *sdev, connector->encoder = encoder;drm_helper_connector_dpms (connector,DRM_MODE_DPMS_OFF ); -drm_object_property_set_value (&connector->base, - sdev->ddev->mode_config.dpms_property,DRM_MODE_DPMS_OFF ); +drm_object_property_set_value (&connector->base, &connector->propvals, + sdev->ddev->mode_config.dpms_property,DRM_MODE_DPMS_OFF ,NULL );return 0 ;
include/drm/drm_crtc.h +10 -1
@@ -41,6 +41,7 @@ struct drm_framebuffer;struct drm_object_properties ;struct drm_file ;struct drm_clip_rect ; +struct drm_object_property_values ;#define DRM_MODE_OBJECT_CRTC 0xcccccccc#define DRM_MODE_OBJECT_CONNECTOR 0xc0c0c0c0
@@ -56,12 +57,16 @@ struct drm_mode_object {uint32_t id;uint32_t type;struct drm_object_properties *properties; +struct drm_object_property_values *propvals; };#define DRM_OBJECT_MAX_PROPERTY 24struct drm_object_properties {int count;uint32_t ids[DRM_OBJECT_MAX_PROPERTY ]; +}; + +struct drm_object_property_values {uint64_t values[DRM_OBJECT_MAX_PROPERTY ]; };
@@ -465,6 +470,7 @@ struct drm_crtc {void *helper_private;struct drm_object_properties properties; +struct drm_object_property_values propvals; };
@@ -630,6 +636,7 @@ struct drm_connector {struct drm_property_blob *edid_blob_ptr;struct drm_object_properties properties; +struct drm_object_property_values propvals;uint8_t polled;/* DRM_CONNECTOR_POLL_* */
@@ -705,6 +712,7 @@ struct drm_plane {const struct drm_plane_funcs *funcs;struct drm_object_properties properties; +struct drm_object_property_values propvals; };/**
@@ -1019,8 +1027,9 @@ extern void drm_mode_connector_list_update(struct drm_connector *connector);extern int drm_mode_connector_update_edid_property (struct drm_connector *connector,struct edid *edid);extern int drm_object_property_set_value (struct drm_mode_object *obj, +struct drm_object_property_values *propvals,struct drm_property *property, -uint64_t val); +uint64_t val,void *blob_data);extern int drm_object_property_get_value (struct drm_mode_object *obj,struct drm_property *property,uint64_t *value);
Signature · 1 line
1.8.4.2
RFC v3 8/14 drm: Allow drm_mode_object_find() to look up an object of any type
In reply to Rob ClarkFrom: Ville Syrjälä <[email protected]>
To avoid having to pass object types from userspace for atomic mode setting ioctl, allow drm_mode_object_find() to look up an object of any type. This will only work as long as the all object types share the ID space.
--- drivers/gpu/drm/drm_crtc.c | 3 ++- include/drm/drm_crtc.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_crtc.c +2 -1
@@ -362,7 +362,8 @@ struct drm_mode_object *drm_mode_object_find(struct drm_device *dev,mutex_lock (&dev->mode_config.idr_mutex); obj =idr_find (&dev->mode_config.crtc_idr, id); -if (!obj || (obj->type != type) || (obj->id != id)) +if (!obj || (type !=DRM_MODE_OBJECT_ANY && obj->type != type) || + (obj->id != id)) obj =NULL ;mutex_unlock (&dev->mode_config.idr_mutex);
include/drm/drm_crtc.h +1 -0
@@ -52,6 +52,7 @@ struct drm_object_property_values;#define DRM_MODE_OBJECT_BLOB 0xbbbbbbbb#define DRM_MODE_OBJECT_PLANE 0xeeeeeeee#define DRM_MODE_OBJECT_BRIDGE 0xbdbdbdbd +#define DRM_MODE_OBJECT_ANY 0struct drm_mode_object {uint32_t id;
Signature · 6 lines
1.8.4.2 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
RFC v3 9/14 drm: Refactor object property check code
In reply to Rob ClarkFrom: Ville Syrjälä <[email protected]>
Refactor the code to check whether an object has a specific property to a new function.
v1: original
v2: rebase on atomic -- Rob Clark
v3: EINVAL->ENOENT
--- drivers/gpu/drm/drm_crtc.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-)
drivers/gpu/drm/drm_crtc.c +14 -11
@@ -3427,6 +3427,19 @@ static int drm_mode_set_obj_prop(struct drm_mode_object *obj,return -EINVAL ; } +static bool object_has_prop (const struct drm_mode_object *obj,u32 prop_id) +{ +int i; + +if (!obj->properties) +return false; + +for (i =0 ; i < obj->properties->count; i++) +if (obj->properties->ids[i] == prop_id) +return true; +return false; +} +/* call with mode_config mutex held */ static int drm_mode_set_obj_prop_id(struct drm_device *dev, void *state, uint32_t obj_id, uint32_t obj_type,
@@ -3435,20 +3448,10 @@ static int drm_mode_set_obj_prop_id(struct drm_device *dev, void *state,struct drm_mode_object *arg_obj;struct drm_mode_object *prop_obj;struct drm_property *property; -int i; arg_obj =drm_mode_object_find (dev, obj_id, obj_type); -if (!arg_obj) +if (!(arg_obj &&object_has_prop (arg_obj, prop_id)))return -ENOENT ; -if (!arg_obj->properties) -return -EINVAL ; - -for (i =0 ; i < arg_obj->properties->count; i++) -if (arg_obj->properties->ids[i] == prop_id) -break ; - -if (i == arg_obj->properties->count) -return -EINVAL ; prop_obj =drm_mode_object_find (dev, prop_id,DRM_MODE_OBJECT_PROPERTY );
Signature · 6 lines
1.8.4.2 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
RFC v3 10/14 drm: convert plane to properties/state
In reply to Rob ClarkBreak the mutable state of a plane out into a separate structure and use atomic properties mechanism to set plane attributes. This makes it easier to have some helpers for plane->set_property() and for checking for invalid params. The idea is that individual drivers can wrap the state struct in their own struct which adds driver specific parameters, for easy build-up of state across multiple set_property() calls and for easy atomic commit or roll- back.
The same should be done for CRTC, encoder, and connector, but this patch only includes the first part (plane).
--- drivers/gpu/drm/drm_atomic_helper.c | 137 +++++++++- drivers/gpu/drm/drm_crtc.c | 399 +++++++++++++++++++--------- drivers/gpu/drm/drm_fb_helper.c | 17 +- drivers/gpu/drm/exynos/exynos_drm_crtc.c | 4 +- drivers/gpu/drm/exynos/exynos_drm_encoder.c | 6 +- drivers/gpu/drm/exynos/exynos_drm_plane.c | 13 +- drivers/gpu/drm/i915/intel_sprite.c | 21 +- drivers/gpu/drm/msm/mdp4/mdp4_crtc.c | 2 +- drivers/gpu/drm/msm/mdp4/mdp4_plane.c | 18 +- drivers/gpu/drm/omapdrm/omap_crtc.c | 4 +- drivers/gpu/drm/omapdrm/omap_drv.c | 2 +- drivers/gpu/drm/omapdrm/omap_plane.c | 30 ++- drivers/gpu/drm/rcar-du/rcar_du_plane.c | 5 +- drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 2 +- drivers/gpu/drm/shmobile/shmob_drm_plane.c | 6 +- include/drm/drm_atomic_helper.h | 37 ++- include/drm/drm_crtc.h | 88 +++++- 17 files changed, 607 insertions(+), 184 deletions(-)
drivers/gpu/drm/drm_atomic_helper.c +135 -2
@@ -39,10 +39,12 @@void *drm_atomic_helper_begin (struct drm_device *dev,uint32_t flags) {struct drm_atomic_helper_state *state; +int nplanes = dev->mode_config.num_plane;int sz;void *ptr; sz =sizeof (*state); + sz += (sizeof (state->planes) +sizeof (state->pstates)) * nplanes; ptr =kzalloc (sz,GFP_KERNEL );
@@ -52,6 +54,13 @@ void *drm_atomic_helper_begin(struct drm_device *dev, uint32_t flags)kref_init (&state->refcount); state->dev = dev; state->flags = flags; + + state->planes = ptr; + ptr = &state->planes[nplanes]; + + state->pstates = ptr; + ptr = &state->pstates[nplanes]; +return state; }EXPORT_SYMBOL (drm_atomic_helper_begin);
@@ -87,7 +96,19 @@ EXPORT_SYMBOL(drm_atomic_helper_set_event);*/ int drm_atomic_helper_check (struct drm_device *dev,void *state) { -return 0 ;/* for now */ +struct drm_atomic_helper_state *a = state; +int nplanes = dev->mode_config.num_plane; +int i, ret =0 ; + +for (i =0 ; i < nplanes; i++) { +if (a->planes[i]) { + ret =drm_atomic_check_plane_state (a->planes[i], a->pstates[i]); +if (ret) +break ; + } + } + +return ret; }EXPORT_SYMBOL (drm_atomic_helper_check);
@@ -104,7 +125,19 @@ EXPORT_SYMBOL(drm_atomic_helper_check);*/ int drm_atomic_helper_commit (struct drm_device *dev,void *state) { -return 0 ;/* for now */ +struct drm_atomic_helper_state *a = state; +int nplanes = dev->mode_config.num_plane; +int i, ret =0 ; + +for (i =0 ; i < nplanes; i++) { +if (a->planes[i]) { + ret =drm_atomic_commit_plane_state (a->planes[i], a->pstates[i]); +if (ret) +break ; + } + } + +return ret; }EXPORT_SYMBOL (drm_atomic_helper_commit);
@@ -125,11 +158,111 @@ void _drm_atomic_helper_state_free(struct kref *kref) {struct drm_atomic_helper_state *state = container_of(kref, struct drm_atomic_helper_state, refcount); +struct drm_device *dev = state->dev; +int nplanes = dev->mode_config.num_plane; +int i; + +for (i =0 ; i < nplanes; i++) { +if (state->pstates[i]) { + state->planes[i]->state->state =NULL ; +kfree (state->pstates[i]); + } + } +kfree (state); }EXPORT_SYMBOL (_drm_atomic_helper_state_free); +int drm_atomic_helper_plane_set_property (struct drm_plane *plane,void *state, +struct drm_property *property,uint64_t val,void *blob_data) +{ +return drm_plane_set_property (plane, +drm_atomic_get_plane_state (plane, state), + property, val, blob_data); +} +EXPORT_SYMBOL (drm_atomic_helper_plane_set_property); + +void drm_atomic_helper_init_plane_state (struct drm_plane *plane, +struct drm_plane_state *pstate,void *state) +{ +/* snapshot current state: */ + *pstate = *plane->state; + pstate->state = state; +} +EXPORT_SYMBOL (drm_atomic_helper_init_plane_state); + +static struct drm_plane_state * +drm_atomic_helper_get_plane_state (struct drm_plane *plane,void *state) +{ +struct drm_atomic_helper_state *a = state; +struct drm_plane_state *pstate = a->pstates[plane->id]; +if (!pstate) { + pstate =kzalloc (sizeof (*pstate),GFP_KERNEL ); +drm_atomic_helper_init_plane_state (plane, pstate, state); + a->planes[plane->id] = plane; + a->pstates[plane->id] = pstate; + } +return pstate; +} + +static void +swap_plane_state (struct drm_plane *plane,struct drm_atomic_helper_state *a) +{ +swap (plane->state, a->pstates[plane->id]); + plane->base.propvals = &plane->state->propvals; +} + +static int +drm_atomic_helper_commit_plane_state (struct drm_plane *plane, +struct drm_plane_state *pstate) +{ +struct drm_device *dev = plane->dev; +struct drm_framebuffer *old_fb =NULL , *fb =NULL ; +int ret =0 ; + +/* probably more fine grain locking would be ok of old crtc +* and new crtc were same.. +*/ +drm_modeset_lock_all (dev); + + fb = pstate->fb; + +if (pstate->crtc && fb) { + ret = plane->funcs->update_plane (plane, pstate->crtc, pstate->fb, + pstate->crtc_x, pstate->crtc_y, pstate->crtc_w, pstate->crtc_h, + pstate->src_x, pstate->src_y, pstate->src_w, pstate->src_h); +if (!ret) { +/* on success, update state and fb refcnting: */ +/* NOTE: if we ensure no driver sets plane->state->fb = NULL +* on disable, we can move this up a level and not duplicate +* nearly the same thing for both update_plane and disable_plane +* cases.. I leave it like this for now to be paranoid due to +* the slightly different ordering in the two cases in the +* original code. +*/ + old_fb = plane->state->fb; +swap_plane_state (plane, pstate->state); + fb =NULL ; + } + }else { + old_fb = plane->state->fb; + plane->funcs->disable_plane (plane); +swap_plane_state (plane, pstate->state); + } + +drm_modeset_unlock_all (dev); + +if (fb) +drm_framebuffer_unreference (fb); +if (old_fb) +drm_framebuffer_unreference (old_fb); + +return ret; +}const struct drm_atomic_helper_funcs drm_atomic_helper_funcs = { + .get_plane_state = drm_atomic_helper_get_plane_state, + .check_plane_state = drm_plane_check_state, + .commit_plane_state = drm_atomic_helper_commit_plane_state, };EXPORT_SYMBOL (drm_atomic_helper_funcs);
drivers/gpu/drm/drm_crtc.c +268 -131
528 lines not on this page · raw message
drivers/gpu/drm/drm_fb_helper.c +16 -1
@@ -286,12 +286,27 @@ bool drm_fb_helper_restore_fbdev_mode(struct drm_fb_helper *fb_helper)struct drm_device *dev = fb_helper->dev;struct drm_plane *plane;bool error = false; +void *state;int i;drm_warn_on_modeset_not_all_locked (dev); + state = dev->driver->atomic_begin (dev,0 ); +if (IS_ERR (state)) { +DRM_ERROR ("failed to restore fbdev mode\n" ); +return true; + } +list_for_each_entry (plane, &dev->mode_config.plane_list, head) -drm_plane_force_disable (plane); +drm_plane_force_disable (plane, state); + +/* just disabling stuff shouldn't fail, hopefully: */ +if (dev->driver->atomic_check (dev, state)) +DRM_ERROR ("failed to restore fbdev mode\n" ); +else + dev->driver->atomic_commit (dev, state); + + dev->driver->atomic_end (dev, state);for (i =0 ; i < fb_helper->crtc_count; i++) {struct drm_mode_set *mode_set = &fb_helper->crtc_info[i].mode_set;
drivers/gpu/drm/exynos/exynos_drm_crtc.c +2 -2
@@ -124,8 +124,8 @@ exynos_drm_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *mode,if (ret)return ret; - plane->crtc = crtc; - plane->fb = crtc->fb; + plane->state->crtc = crtc; + plane->state->fb = crtc->fb;exynos_drm_fn_encoder (crtc, &pipe, exynos_drm_encoder_crtc_pipe);
drivers/gpu/drm/exynos/exynos_drm_encoder.c +3 -3
@@ -127,7 +127,7 @@ static void disable_plane_to_crtc(struct drm_device *dev,* (encoder->crtc) */ list_for_each_entry (plane, &dev->mode_config.plane_list, head) { -if (plane->crtc == old_crtc) { +if (plane->state->crtc == old_crtc) {/* * do not change below call order. *
@@ -138,7 +138,7 @@ static void disable_plane_to_crtc(struct drm_device *dev,* have new_crtc because new_crtc was set to * encoder->crtc in advance. */ - plane->crtc = new_crtc; + plane->state->crtc = new_crtc; plane->funcs->disable_plane (plane); } }
@@ -247,7 +247,7 @@ static void exynos_drm_encoder_disable(struct drm_encoder *encoder)/* all planes connected to this encoder should be also disabled. */ list_for_each_entry (plane, &dev->mode_config.plane_list, head) { -if (plane->crtc == encoder->crtc) +if (plane->state->crtc == encoder->crtc) plane->funcs->disable_plane (plane); } }
drivers/gpu/drm/exynos/exynos_drm_plane.c +9 -4
@@ -10,6 +10,7 @@*/ #include <drm/drmP.h> +#include <drm/drm_atomic_helper.h> #include <drm/exynos_drm.h> #include "exynos_drm_drv.h"
@@ -149,7 +150,7 @@ void exynos_plane_commit(struct drm_plane *plane)struct exynos_plane *exynos_plane =to_exynos_plane (plane);struct exynos_drm_overlay *overlay = &exynos_plane->overlay; -exynos_drm_fn_encoder (plane->crtc, &overlay->zpos, +exynos_drm_fn_encoder (plane->state->crtc, &overlay->zpos, exynos_drm_encoder_plane_commit); }
@@ -162,7 +163,7 @@ void exynos_plane_dpms(struct drm_plane *plane, int mode)if (exynos_plane->enabled)return ; -exynos_drm_fn_encoder (plane->crtc, &overlay->zpos, +exynos_drm_fn_encoder (plane->state->crtc, &overlay->zpos, exynos_drm_encoder_plane_enable); exynos_plane->enabled = true;
@@ -170,7 +171,7 @@ void exynos_plane_dpms(struct drm_plane *plane, int mode)if (!exynos_plane->enabled)return ; -exynos_drm_fn_encoder (plane->crtc, &overlay->zpos, +exynos_drm_fn_encoder (plane->state->crtc, &overlay->zpos, exynos_drm_encoder_plane_disable); exynos_plane->enabled = false;
@@ -192,7 +193,7 @@ exynos_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,if (ret <0 )return ret; - plane->crtc = crtc; + plane->state->crtc = crtc;exynos_plane_commit (plane);exynos_plane_dpms (plane,DRM_MODE_DPMS_ON );
@@ -229,6 +230,10 @@ static int exynos_plane_set_property(struct drm_plane *plane,if (property == dev_priv->plane_zpos_property) { exynos_plane->overlay.zpos = val;return 0 ; + }else { +return drm_plane_set_property (plane, +drm_atomic_get_plane_state (plane, state), + property, val, blob_data); }return -EINVAL ;
drivers/gpu/drm/i915/intel_sprite.c +13 -8
@@ -897,20 +897,21 @@ static int intel_disable_plane(struct drm_plane *plane) {struct drm_device *dev = plane->dev; +struct drm_plane_state *state = plane->state;struct intel_plane *intel_plane =to_intel_plane (plane);struct intel_crtc *intel_crtc; -if (!plane->fb) +if (!state->fb)return 0 ; -if (WARN_ON (!plane->crtc)) +if (WARN_ON (!state->crtc))return -EINVAL ; - intel_crtc =to_intel_crtc (plane->crtc); + intel_crtc =to_intel_crtc (state->crtc);if (intel_crtc->active) { -intel_enable_primary (plane->crtc); - intel_plane->disable_plane (plane, plane->crtc); +intel_enable_primary (state->crtc); + intel_plane->disable_plane (plane, state->crtc); }if (intel_plane->obj) {
@@ -1000,11 +1001,12 @@ out_unlock:void intel_plane_restore (struct drm_plane *plane) {struct intel_plane *intel_plane =to_intel_plane (plane); +struct drm_plane_state *state = plane->state; -if (!plane->crtc || !plane->fb) +if (!state->crtc || !state->fb)return ; - intel_update_plane(plane, plane->crtc, plane->fb, + intel_update_plane(plane, state->crtc, state->fb, intel_plane->crtc_x, intel_plane->crtc_y, intel_plane->crtc_w, intel_plane->crtc_h, intel_plane->src_x, intel_plane->src_y,
@@ -1013,7 +1015,9 @@ void intel_plane_restore(struct drm_plane *plane)void intel_plane_disable (struct drm_plane *plane) { -if (!plane->crtc || !plane->fb) +struct drm_plane_state *state = plane->state; + +if (!state->crtc || !state->fb)return ;intel_disable_plane (plane);
@@ -1023,6 +1027,7 @@ static const struct drm_plane_funcs intel_plane_funcs = { .update_plane = intel_update_plane, .disable_plane = intel_disable_plane, .destroy = intel_destroy_plane, + .set_property = drm_atomic_helper_plane_set_property, };static uint32_t ilk_plane_formats[] = {
drivers/gpu/drm/msm/mdp4/mdp4_crtc.c +1 -1
@@ -263,7 +263,7 @@ static void blend_setup(struct drm_crtc *crtc)int idx = idxs[pipe_id];if (idx >0 ) {const struct mdp4_format *format = -to_mdp4_format (msm_framebuffer_format (plane->fb)); +to_mdp4_format (msm_framebuffer_format (plane->state->fb)); alpha[idx-1 ] = format->alpha_enable; } mixer_cfg |=mixercfg (mdp4_crtc->mixer, pipe_id, stages[idx]);
drivers/gpu/drm/msm/mdp4/mdp4_plane.c +11 -7
@@ -45,11 +45,14 @@ static int mdp4_plane_update(struct drm_plane *plane, uint32_t src_w, uint32_t src_h) {struct mdp4_plane *mdp4_plane =to_mdp4_plane (plane); +struct drm_plane_state *state = plane->state; mdp4_plane->enabled = true; -if (plane->fb) -drm_framebuffer_unreference (plane->fb); +if (state->fb) { +drm_framebuffer_unreference (state->fb); + state->fb =NULL ; + }drm_framebuffer_reference (fb);
@@ -62,8 +65,8 @@ static int mdp4_plane_disable(struct drm_plane *plane) {struct mdp4_plane *mdp4_plane =to_mdp4_plane (plane);DBG ("%s: disable" , mdp4_plane->name); -if (plane->crtc) -mdp4_crtc_detach (plane->crtc, plane); +if (plane->state->crtc) +mdp4_crtc_detach (plane->state->crtc, plane);return 0 ; }
@@ -87,8 +90,9 @@ void mdp4_plane_install_properties(struct drm_plane *plane,int mdp4_plane_set_property (struct drm_plane *plane,void *state,struct drm_property *property,uint64_t val,void *blob_data) { -// XXX -return -EINVAL ; +return drm_plane_set_property (plane, +drm_atomic_get_plane_state (plane, state), + property, val, blob_data); }static const struct drm_plane_funcs mdp4_plane_funcs = {
@@ -117,7 +121,7 @@ void mdp4_plane_set_scanout(struct drm_plane *plane,msm_gem_get_iova (msm_framebuffer_bo (fb,0 ), mdp4_kms->id, &iova);mdp4_write (mdp4_kms,REG_MDP4_PIPE_SRCP0_BASE (pipe), iova); - plane->fb = fb; + plane->state->fb = fb; }#define MDP4_VG_PHASE_STEP_DEFAULT 0x20000000
drivers/gpu/drm/omapdrm/omap_crtc.c +2 -2
@@ -210,7 +210,7 @@ static void omap_crtc_dpms(struct drm_crtc *crtc, int mode)/* and any attached overlay planes: */ for (i =0 ; i < priv->num_planes; i++) {struct drm_plane *plane = priv->planes[i]; -if (plane->crtc == crtc) +if (plane->state->crtc == crtc)WARN_ON (omap_plane_dpms (plane, mode)); } }
@@ -651,7 +651,7 @@ struct drm_crtc *omap_crtc_init(struct drm_device *dev, omap_crtc->channel = channel; omap_crtc->plane = plane; - omap_crtc->plane->crtc = crtc; + omap_crtc->plane->state->crtc = crtc; omap_crtc->name = channel_names[channel]; omap_crtc->pipe = id;
drivers/gpu/drm/omapdrm/omap_drv.c +1 -1
@@ -559,7 +559,7 @@ static void dev_lastclose(struct drm_device *dev)for (i =0 ; i < priv->num_planes; i++) {drm_object_property_set_value (&priv->planes[i]->base, - &priv->planes[i]->propvals, + &priv->planes[i]->state->propvals, priv->rotation_prop,0 ,NULL ); } }
drivers/gpu/drm/omapdrm/omap_plane.c +20 -10
@@ -116,9 +116,10 @@ static void omap_plane_pre_apply(struct omap_drm_apply *apply) container_of(apply, struct omap_plane, apply);struct omap_drm_window *win = &omap_plane->win;struct drm_plane *plane = &omap_plane->base; +struct drm_plane_state *state = plane->state;struct drm_device *dev = plane->dev;struct omap_overlay_info *info = &omap_plane->info; -struct drm_crtc *crtc = plane->crtc; +struct drm_crtc *crtc = state->crtc;enum omap_channel channel;bool enabled = omap_plane->enabled && crtc;bool ilace, replication;
@@ -127,7 +128,7 @@ static void omap_plane_pre_apply(struct omap_drm_apply *apply)DBG ("%s, enabled=%d" , omap_plane->name, enabled);/* if fb has changed, pin new fb: */ -update_pin (plane, enabled ? plane->fb :NULL ); +update_pin (plane, enabled ? state->fb :NULL );if (!enabled) {dispc_ovl_enable (omap_plane->id, false);
@@ -137,7 +138,7 @@ static void omap_plane_pre_apply(struct omap_drm_apply *apply) channel =omap_crtc_channel (crtc);/* update scanout: */ -omap_framebuffer_update_scanout (plane->fb, win, info); +omap_framebuffer_update_scanout (state->fb, win, info); DBG("%dx%d -> %dx%d (%d)", info->width, info->height, info->out_width, info->out_height,
@@ -179,16 +180,18 @@ static void omap_plane_post_apply(struct omap_drm_apply *apply) cb.fxn (cb.arg);if (omap_plane->enabled) { -omap_framebuffer_flush (plane->fb, info->pos_x, info->pos_y, +omap_framebuffer_flush (plane->state->fb, + info->pos_x, info->pos_y, info->out_width, info->out_height); } }static int apply (struct drm_plane *plane) { -if (plane->crtc) { +struct drm_plane_state *state = plane->state; +if (state->crtc) {struct omap_plane *omap_plane =to_omap_plane (plane); -return omap_crtc_apply (plane->crtc, &omap_plane->apply); +return omap_crtc_apply (state->crtc, &omap_plane->apply); }return 0 ; }
@@ -203,6 +206,7 @@ int omap_plane_mode_set(struct drm_plane *plane, {struct omap_plane *omap_plane =to_omap_plane (plane);struct omap_drm_window *win = &omap_plane->win; +struct drm_plane_state *state = plane->state; win->crtc_x = crtc_x; win->crtc_y = crtc_y;
@@ -225,8 +229,8 @@ int omap_plane_mode_set(struct drm_plane *plane, omap_plane->apply_done_cb.arg = arg; } - plane->fb = fb; - plane->crtc = crtc; + state->fb = fb; + state->crtc = crtc;return apply (plane); }
@@ -239,10 +243,12 @@ static int omap_plane_update(struct drm_plane *plane, uint32_t src_w, uint32_t src_h) {struct omap_plane *omap_plane =to_omap_plane (plane); +struct drm_plane_state *state = plane->state; + omap_plane->enabled = true; -if (plane->fb) -drm_framebuffer_unreference (plane->fb); +if (state->fb) +drm_framebuffer_unreference (state->fb);drm_framebuffer_reference (fb);
@@ -342,6 +348,10 @@ int omap_plane_set_property(struct drm_plane *plane, void *state,DBG ("%s: zorder: %02x" , omap_plane->name, (uint32_t )val); omap_plane->info.zorder = val; ret =apply (plane); + }else { + ret =drm_plane_set_property (plane, +drm_atomic_get_plane_state (plane, state), + property, val, blob_data); }return ret;
drivers/gpu/drm/rcar-du/rcar_du_plane.c +4 -1
@@ -14,6 +14,7 @@#include <drm/drmP.h> #include <drm/drm_crtc.h> #include <drm/drm_crtc_helper.h> +#include <drm/drm_atomic_helper.h> #include <drm/drm_fb_cma_helper.h> #include <drm/drm_gem_cma_helper.h>
@@ -411,7 +412,9 @@ static int rcar_du_plane_set_property(struct drm_plane *plane,else if (property == rgrp->planes.zpos)rcar_du_plane_set_zpos (rplane, value);else -return -EINVAL ; +return drm_plane_set_property (plane, +drm_atomic_get_plane_state (plane, state), + property, value, blob_data);return 0 ; }
drivers/gpu/drm/shmobile/shmob_drm_crtc.c +1 -1
@@ -238,7 +238,7 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc)/* Setup planes. */ list_for_each_entry (plane, &dev->mode_config.plane_list, head) { -if (plane->crtc == crtc) +if (plane->state->crtc == crtc)shmob_drm_plane_setup (plane); }
drivers/gpu/drm/shmobile/shmob_drm_plane.c +4 -2
@@ -14,6 +14,7 @@#include <drm/drmP.h> #include <drm/drm_crtc.h> #include <drm/drm_crtc_helper.h> +#include <drm/drm_atomic_helper.h> #include <drm/drm_fb_cma_helper.h> #include <drm/drm_gem_cma_helper.h>
@@ -166,10 +167,10 @@ void shmob_drm_plane_setup(struct drm_plane *plane) {struct shmob_drm_plane *splane =to_shmob_plane (plane); -if (plane->fb ==NULL ) +if (plane->state->fb ==NULL )return ; -__shmob_drm_plane_setup (splane, plane->fb); +__shmob_drm_plane_setup (splane, plane->state->fb); } static int
@@ -228,6 +229,7 @@ static void shmob_drm_plane_destroy(struct drm_plane *plane)static const struct drm_plane_funcs shmob_drm_plane_funcs = { .update_plane = shmob_drm_plane_update, .disable_plane = shmob_drm_plane_disable, + .set_property = drm_atomic_helper_plane_set_property, .destroy = shmob_drm_plane_destroy, };
include/drm/drm_atomic_helper.h +36 -1
@@ -62,7 +62,9 @@* struct drm_atomic_helper_funcs - helper funcs used by the atomic helpers */ struct drm_atomic_helper_funcs { -int dummy;/* for now */ +struct drm_plane_state *(*get_plane_state)(struct drm_plane *plane,void *state); +int (*check_plane_state)(struct drm_plane *plane,struct drm_plane_state *pstate); +int (*commit_plane_state)(struct drm_plane *plane,struct drm_plane_state *pstate); };const extern struct drm_atomic_helper_funcs drm_atomic_helper_funcs;
@@ -75,6 +77,37 @@ int drm_atomic_helper_check(struct drm_device *dev, void *state);int drm_atomic_helper_commit (struct drm_device *dev,void *state);void drm_atomic_helper_end (struct drm_device *dev,void *state); +int drm_atomic_helper_plane_set_property (struct drm_plane *plane,void *state, +struct drm_property *property,uint64_t val,void *blob_data); +void drm_atomic_helper_init_plane_state (struct drm_plane *plane, +struct drm_plane_state *pstate,void *state); + +static inline struct drm_plane_state * +drm_atomic_get_plane_state (struct drm_plane *plane,void *state) +{ +const struct drm_atomic_helper_funcs *funcs = + plane->dev->driver->atomic_helpers; +return funcs->get_plane_state (plane, state); +} + +static inline int +drm_atomic_check_plane_state (struct drm_plane *plane, +struct drm_plane_state *pstate) +{ +const struct drm_atomic_helper_funcs *funcs = + plane->dev->driver->atomic_helpers; +return funcs->check_plane_state (plane, pstate); +} + +static inline int +drm_atomic_commit_plane_state (struct drm_plane *plane, +struct drm_plane_state *pstate) +{ +const struct drm_atomic_helper_funcs *funcs = + plane->dev->driver->atomic_helpers; +return funcs->commit_plane_state (plane, pstate); +} +/** * struct drm_atomic_helper_state - the state object used by atomic helpers */
@@ -82,6 +115,8 @@ struct drm_atomic_helper_state {struct kref refcount;struct drm_device *dev;uint32_t flags; +struct drm_plane **planes; +struct drm_plane_state **pstates; }; static inline void
include/drm/drm_crtc.h +81 -7
129 lines not on this page · raw message
Signature · 1 line
1.8.4.2
RFC v3 11/14 drm: convert crtc to properties/state
In reply to Rob ClarkBreak the mutable state of a crtc out into a separate structure and use atomic properties mechanism to set crtc attributes. This makes it easier to have some helpers for crtc->set_property() and for checking for invalid params. The idea is that individual drivers can wrap the state struct in their own struct which adds driver specific parameters, for easy build-up of state across multiple set_property() calls and for easy atomic commit or roll- back.
This also re-works the locking a bit.. maybe some of these changes should be rejuggled into different patch. But now atomic plane updates grab current (and if necessary, incoming) crtc locks for their synchronization.
--- drivers/gpu/drm/ast/ast_mode.c | 1 + drivers/gpu/drm/cirrus/cirrus_mode.c | 1 + drivers/gpu/drm/drm_atomic_helper.c | 347 ++++++++++++++++- drivers/gpu/drm/drm_crtc.c | 580 +++++++++++++++++------------ drivers/gpu/drm/drm_fb_cma_helper.c | 9 +- drivers/gpu/drm/drm_fb_helper.c | 12 +- drivers/gpu/drm/exynos/exynos_drm_crtc.c | 5 +- drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 4 +- drivers/gpu/drm/gma500/cdv_intel_display.c | 1 + drivers/gpu/drm/gma500/psb_drv.c | 4 +- drivers/gpu/drm/gma500/psb_intel_display.c | 1 + drivers/gpu/drm/i915/intel_display.c | 17 +- drivers/gpu/drm/i915/intel_fbdev.c | 6 +- drivers/gpu/drm/mgag200/mgag200_mode.c | 1 + drivers/gpu/drm/msm/mdp4/mdp4_crtc.c | 5 +- drivers/gpu/drm/msm/msm_drv.c | 7 +- drivers/gpu/drm/nouveau/dispnv04/crtc.c | 1 + drivers/gpu/drm/nouveau/nv50_display.c | 1 + drivers/gpu/drm/omapdrm/omap_crtc.c | 17 +- drivers/gpu/drm/omapdrm/omap_drv.c | 6 +- drivers/gpu/drm/qxl/qxl_display.c | 2 + drivers/gpu/drm/radeon/radeon_display.c | 2 + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 2 + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 2 + drivers/gpu/drm/tegra/fb.c | 7 +- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 1 + drivers/gpu/drm/udl/udl_modeset.c | 2 + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 12 +- drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 1 + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 1 + include/drm/drm_atomic_helper.h | 41 ++ include/drm/drm_crtc.h | 87 ++++- include/drm/drm_fb_helper.h | 3 +- include/uapi/drm/drm_mode.h | 2 + 34 files changed, 864 insertions(+), 327 deletions(-)
drivers/gpu/drm/ast/ast_mode.c +1 -0
@@ -619,6 +619,7 @@ static const struct drm_crtc_funcs ast_crtc_funcs = { .cursor_move = ast_cursor_move, .reset = ast_crtc_reset, .set_config = drm_crtc_helper_set_config, + .set_property = drm_atomic_helper_crtc_set_property, .gamma_set = ast_crtc_gamma_set, .destroy = ast_crtc_destroy, };
drivers/gpu/drm/cirrus/cirrus_mode.c +1 -0
@@ -363,6 +363,7 @@ static void cirrus_crtc_destroy(struct drm_crtc *crtc)static const struct drm_crtc_funcs cirrus_crtc_funcs = { .gamma_set = cirrus_crtc_gamma_set, .set_config = drm_crtc_helper_set_config, + .set_property = drm_atomic_helper_crtc_set_property, .destroy = cirrus_crtc_destroy, };
drivers/gpu/drm/drm_atomic_helper.c +332 -15
459 lines not on this page · raw message
drivers/gpu/drm/drm_crtc.c +346 -234
778 lines not on this page · raw message
drivers/gpu/drm/drm_fb_cma_helper.c +2 -7
@@ -429,13 +429,8 @@ EXPORT_SYMBOL_GPL(drm_fbdev_cma_fini);*/ void drm_fbdev_cma_restore_mode (struct drm_fbdev_cma *fbdev_cma) { -if (fbdev_cma) { -struct drm_device *dev = fbdev_cma->fb_helper.dev; - -drm_modeset_lock_all (dev); -drm_fb_helper_restore_fbdev_mode (&fbdev_cma->fb_helper); -drm_modeset_unlock_all (dev); - } +if (fbdev_cma) +drm_fb_helper_restore_fbdev_mode (&fbdev_cma->fb_helper, false); }EXPORT_SYMBOL_GPL (drm_fbdev_cma_restore_mode);
drivers/gpu/drm/drm_fb_helper.c +7 -5
@@ -276,12 +276,15 @@ EXPORT_SYMBOL(drm_fb_helper_debug_leave);/** * drm_fb_helper_restore_fbdev_mode - restore fbdev configuration * @fb_helper: fbcon to restore +* @lockless: true in drm_fb_helper_force_kernel_mode() path, to avoid +* blocking in panic case, everywhere else should use false * * This should be called from driver's drm ->lastclose callback * when implementing an fbcon on top of kms using this helper. This ensures that * the user isn't greeted with a black screen when e.g. X dies. */ -bool drm_fb_helper_restore_fbdev_mode (struct drm_fb_helper *fb_helper) +bool drm_fb_helper_restore_fbdev_mode (struct drm_fb_helper *fb_helper, +bool lockless) {struct drm_device *dev = fb_helper->dev;struct drm_plane *plane;
@@ -289,9 +292,8 @@ bool drm_fb_helper_restore_fbdev_mode(struct drm_fb_helper *fb_helper)void *state;int i; -drm_warn_on_modeset_not_all_locked (dev); - - state = dev->driver->atomic_begin (dev,0 ); + state = dev->driver->atomic_begin (dev, lockless ? +DRM_MODE_ATOMIC_NOLOCK :0 );if (IS_ERR (state)) {DRM_ERROR ("failed to restore fbdev mode\n" );return true;
@@ -343,7 +345,7 @@ static bool drm_fb_helper_force_kernel_mode(void)if (helper->dev->switch_power_state ==DRM_SWITCH_POWER_OFF )continue ; - ret =drm_fb_helper_restore_fbdev_mode (helper); + ret =drm_fb_helper_restore_fbdev_mode (helper, true);if (ret) error = true; }
drivers/gpu/drm/exynos/exynos_drm_crtc.c +4 -1
@@ -14,6 +14,7 @@#include <drm/drmP.h> #include <drm/drm_crtc_helper.h> +#include <drm/drm_atomic_helper.h> #include "exynos_drm_crtc.h" #include "exynos_drm_drv.h"
@@ -286,7 +287,9 @@ static int exynos_drm_crtc_set_property(struct drm_crtc *crtc,return 0 ; } -return -EINVAL ; +return drm_crtc_set_property (crtc, +drm_atomic_get_crtc_state (crtc, state), + property, val, blob_data); }static struct drm_crtc_funcs exynos_crtc_funcs = {
drivers/gpu/drm/exynos/exynos_drm_fbdev.c +1 -3
@@ -354,7 +354,5 @@ void exynos_drm_fbdev_restore_mode(struct drm_device *dev)if (!private || !private->fb_helper)return ; -drm_modeset_lock_all (dev); -drm_fb_helper_restore_fbdev_mode (private->fb_helper); -drm_modeset_unlock_all (dev); +drm_fb_helper_restore_fbdev_mode (private->fb_helper, false); }
drivers/gpu/drm/gma500/cdv_intel_display.c +1 -0
@@ -1022,6 +1022,7 @@ const struct drm_crtc_funcs cdv_intel_crtc_funcs = { .cursor_move = gma_crtc_cursor_move, .gamma_set = gma_crtc_gamma_set, .set_config = gma_crtc_set_config, + .set_property = drm_atomic_helper_crtc_set_property, .destroy = gma_crtc_destroy, };
drivers/gpu/drm/gma500/psb_drv.c +1 -3
@@ -153,11 +153,9 @@ static void psb_lastclose(struct drm_device *dev)struct drm_psb_private *dev_priv = dev->dev_private;struct psb_fbdev *fbdev = dev_priv->fbdev; -drm_modeset_lock_all (dev); - ret =drm_fb_helper_restore_fbdev_mode (&fbdev->psb_fb_helper); + ret =drm_fb_helper_restore_fbdev_mode (&fbdev->psb_fb_helper, false);if (ret)DRM_DEBUG ("failed to restore crtc mode\n" ); -drm_modeset_unlock_all (dev);return ; }
drivers/gpu/drm/gma500/psb_intel_display.c +1 -0
@@ -444,6 +444,7 @@ const struct drm_crtc_funcs psb_intel_crtc_funcs = { .cursor_move = gma_crtc_cursor_move, .gamma_set = gma_crtc_gamma_set, .set_config = gma_crtc_set_config, + .set_property = drm_atomic_helper_crtc_set_property, .destroy = gma_crtc_destroy, };
drivers/gpu/drm/i915/intel_display.c +9 -8
@@ -2232,11 +2232,11 @@ void intel_display_handle_reset(struct drm_device *dev)list_for_each_entry (crtc, &dev->mode_config.crtc_list, head) {struct intel_crtc *intel_crtc =to_intel_crtc (crtc); -ww_mutex_lock (&crtc->mutex,NULL ); +drm_modeset_lock_crtc (crtc,NULL );if (intel_crtc->active) dev_priv->display.update_plane (crtc, crtc->fb, crtc->x, crtc->y); -ww_mutex_unlock (&crtc->mutex); +drm_modeset_unlock_crtc (crtc); } }
@@ -7550,7 +7550,7 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector,if (encoder->crtc) { crtc = encoder->crtc; -ww_mutex_lock (&crtc->mutex,NULL ); +drm_modeset_lock_crtc (crtc,NULL ); old->dpms_mode = connector->dpms; old->load_detect_temp = false;
@@ -7581,7 +7581,7 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector,return false; } -ww_mutex_lock (&crtc->mutex,NULL ); +drm_modeset_lock_crtc (crtc,NULL ); intel_encoder->new_crtc =to_intel_crtc (crtc);to_intel_connector (connector)->new_encoder = intel_encoder;
@@ -7609,7 +7609,7 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector,DRM_DEBUG_KMS ("reusing fbdev for load-detection framebuffer\n" );if (IS_ERR (fb)) {DRM_DEBUG_KMS ("failed to allocate framebuffer for load-detection\n" ); -ww_mutex_unlock (&crtc->mutex); +drm_modeset_unlock_crtc (crtc);return false; }
@@ -7617,7 +7617,7 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector,DRM_DEBUG_KMS ("failed to set mode on load-detect pipe\n" );if (old->release_fb) old->release_fb->funcs->destroy (old->release_fb); -ww_mutex_unlock (&crtc->mutex); +drm_modeset_unlock_crtc (crtc);return false; }
@@ -7648,7 +7648,7 @@ void intel_release_load_detect_pipe(struct drm_connector *connector,drm_framebuffer_unreference (old->release_fb); } -ww_mutex_unlock (&crtc->mutex); +drm_modeset_unlock_crtc (crtc);return ; }
@@ -7656,7 +7656,7 @@ void intel_release_load_detect_pipe(struct drm_connector *connector,if (old->dpms_mode !=DRM_MODE_DPMS_ON ) connector->funcs->dpms (connector, old->dpms_mode); -ww_mutex_unlock (&crtc->mutex); +drm_modeset_unlock_crtc (crtc); } static int i9xx_pll_refclk(struct drm_device *dev,
@@ -9778,6 +9778,7 @@ static const struct drm_crtc_funcs intel_crtc_funcs = { .cursor_move = intel_crtc_cursor_move, .gamma_set = intel_crtc_gamma_set, .set_config = intel_crtc_set_config, + .set_property = drm_atomic_helper_crtc_set_property, .destroy = intel_crtc_destroy, .page_flip = intel_crtc_page_flip, };
drivers/gpu/drm/i915/intel_fbdev.c +1 -5
@@ -313,11 +313,7 @@ void intel_fbdev_restore_mode(struct drm_device *dev)if (INTEL_INFO (dev)->num_pipes ==0 )return ; -drm_modeset_lock_all (dev); - - ret =drm_fb_helper_restore_fbdev_mode (&dev_priv->fbdev->helper); + ret =drm_fb_helper_restore_fbdev_mode (&dev_priv->fbdev->helper, false);if (ret)DRM_DEBUG ("failed to restore crtc mode\n" ); - -drm_modeset_unlock_all (dev); }
drivers/gpu/drm/mgag200/mgag200_mode.c +1 -0
@@ -1296,6 +1296,7 @@ static const struct drm_crtc_funcs mga_crtc_funcs = { .cursor_move = mga_crtc_cursor_move, .gamma_set = mga_crtc_gamma_set, .set_config = drm_crtc_helper_set_config, + .set_property = drm_atomic_helper_crtc_set_property, .destroy = mga_crtc_destroy, };
drivers/gpu/drm/msm/mdp4/mdp4_crtc.c +3 -2
@@ -427,8 +427,9 @@ static int mdp4_crtc_page_flip(struct drm_crtc *crtc,static int mdp4_crtc_set_property (struct drm_crtc *crtc,void *state,struct drm_property *property,uint64_t val,void *blob_data) { -// XXX -return -EINVAL ; +return drm_crtc_set_property (crtc, +drm_atomic_get_crtc_state (crtc, state), + property, val, blob_data); }#define CURSOR_WIDTH 64
drivers/gpu/drm/msm/msm_drv.c +2 -5
@@ -319,11 +319,8 @@ static void msm_preclose(struct drm_device *dev, struct drm_file *file)static void msm_lastclose (struct drm_device *dev) {struct msm_drm_private *priv = dev->dev_private; -if (priv->fbdev) { -drm_modeset_lock_all (dev); -drm_fb_helper_restore_fbdev_mode (priv->fbdev); -drm_modeset_unlock_all (dev); - } +if (priv->fbdev) +drm_fb_helper_restore_fbdev_mode (priv->fbdev, false); }static irqreturn_t msm_irq (DRM_IRQ_ARGS )
drivers/gpu/drm/nouveau/dispnv04/crtc.c +1 -0
@@ -1086,6 +1086,7 @@ static const struct drm_crtc_funcs nv04_crtc_funcs = { .cursor_move = nv04_crtc_cursor_move, .gamma_set = nv_crtc_gamma_set, .set_config = nouveau_crtc_set_config, + .set_property = drm_atomic_helper_crtc_set_property, .page_flip = nouveau_crtc_page_flip, .destroy = nv_crtc_destroy, };
drivers/gpu/drm/nouveau/nv50_display.c +1 -0
@@ -1327,6 +1327,7 @@ static const struct drm_crtc_funcs nv50_crtc_func = { .cursor_move = nv50_crtc_cursor_move, .gamma_set = nv50_crtc_gamma_set, .set_config = nouveau_crtc_set_config, + .set_property = drm_atomic_helper_crtc_set_property, .destroy = nv50_crtc_destroy, .page_flip = nouveau_crtc_page_flip, };
drivers/gpu/drm/omapdrm/omap_crtc.c +11 -6
@@ -307,13 +307,13 @@ static void page_flip_worker(struct work_struct *work)struct drm_display_mode *mode = &crtc->mode;struct drm_gem_object *bo; -ww_mutex_lock (&crtc->mutex,NULL ); +drm_modeset_lock_crtc (crtc,NULL );omap_plane_mode_set (omap_crtc->plane, crtc, crtc->fb,0 ,0 , mode->hdisplay, mode->vdisplay, crtc->x <<16 , crtc->y <<16 , mode->hdisplay <<16 , mode->vdisplay <<16 , vblank_cb, crtc); -ww_mutex_unlock (&crtc->mutex); +drm_modeset_unlock_crtc (crtc); bo =omap_framebuffer_bo (crtc->fb,0 );drm_gem_object_unreference_unlocked (bo);
@@ -367,14 +367,19 @@ static int omap_crtc_set_property(struct drm_crtc *crtc, void *state, {struct omap_crtc *omap_crtc =to_omap_crtc (crtc);struct omap_drm_private *priv = crtc->dev->dev_private; +struct drm_crtc_state *cstate =drm_atomic_get_crtc_state (crtc, state); +int ret;if (property == priv->rotation_prop) { - crtc->invert_dimensions = + cstate->invert_dimensions = !!(val & ((1LL <<DRM_ROTATE_90 ) | (1LL <<DRM_ROTATE_270 ))); } -return omap_plane_set_property (omap_crtc->plane, state, + ret =omap_plane_set_property (omap_crtc->plane, state, property, val, blob_data); +if (ret) + ret =drm_crtc_set_property (crtc, cstate, property, val, blob_data); +return ret; }static const struct drm_crtc_funcs omap_crtc_funcs = {
@@ -447,7 +452,7 @@ static void apply_worker(struct work_struct *work)* the callbacks and list modification all serialized * with respect to modesetting ioctls from userspace. */ -ww_mutex_lock (&crtc->mutex,NULL ); +drm_modeset_lock_crtc (crtc,NULL );dispc_runtime_get ();/*
@@ -492,7 +497,7 @@ static void apply_worker(struct work_struct *work) out:dispc_runtime_put (); -ww_mutex_unlock (&crtc->mutex); +drm_modeset_unlock_crtc (crtc); } int omap_crtc_apply(struct drm_crtc *crtc,
drivers/gpu/drm/omapdrm/omap_drv.c +2 -4
@@ -553,7 +553,7 @@ static void dev_lastclose(struct drm_device *dev)*/ for (i =0 ; i < priv->num_crtcs; i++) {drm_object_property_set_value (&priv->crtcs[i]->base, - &priv->crtcs[i]->propvals, + &priv->crtcs[i]->state->propvals, priv->rotation_prop,0 ,NULL ); }
@@ -564,9 +564,7 @@ static void dev_lastclose(struct drm_device *dev) } } -drm_modeset_lock_all (dev); - ret =drm_fb_helper_restore_fbdev_mode (priv->fbdev); -drm_modeset_unlock_all (dev); + ret =drm_fb_helper_restore_fbdev_mode (priv->fbdev, false);if (ret)DBG ("failed to restore crtc mode" ); }
drivers/gpu/drm/qxl/qxl_display.c +2 -0
@@ -29,6 +29,7 @@#include "qxl_drv.h" #include "qxl_object.h" #include "drm_crtc_helper.h" +#include "drm_atomic_helper.h" static bool qxl_head_enabled (struct qxl_head *head) {
@@ -373,6 +374,7 @@ static const struct drm_crtc_funcs qxl_crtc_funcs = { .cursor_set2 = qxl_crtc_cursor_set2, .cursor_move = qxl_crtc_cursor_move, .set_config = drm_crtc_helper_set_config, + .set_property = drm_atomic_helper_crtc_set_property, .destroy = qxl_crtc_destroy, };
drivers/gpu/drm/radeon/radeon_display.c +2 -0
@@ -32,6 +32,7 @@#include <linux/pm_runtime.h> #include <drm/drm_crtc_helper.h> +#include <drm/drm_atomic_helper.h> #include <drm/drm_edid.h> static void avivo_crtc_load_lut (struct drm_crtc *crtc)
@@ -544,6 +545,7 @@ static const struct drm_crtc_funcs radeon_crtc_funcs = { .cursor_move = radeon_crtc_cursor_move, .gamma_set = radeon_crtc_gamma_set, .set_config = radeon_crtc_set_config, + .set_property = drm_atomic_helper_crtc_set_property, .destroy = radeon_crtc_destroy, .page_flip = radeon_crtc_page_flip, };
drivers/gpu/drm/rcar-du/rcar_du_crtc.c +2 -0
@@ -17,6 +17,7 @@#include <drm/drmP.h> #include <drm/drm_crtc.h> #include <drm/drm_crtc_helper.h> +#include <drm/drm_atomic_helper.h> #include <drm/drm_fb_cma_helper.h> #include <drm/drm_gem_cma_helper.h>
@@ -528,6 +529,7 @@ static int rcar_du_crtc_page_flip(struct drm_crtc *crtc,static const struct drm_crtc_funcs crtc_funcs = { .destroy = drm_crtc_cleanup, .set_config = drm_crtc_helper_set_config, + .set_property = drm_atomic_helper_crtc_set_property, .page_flip = rcar_du_crtc_page_flip, };
drivers/gpu/drm/shmobile/shmob_drm_crtc.c +2 -0
@@ -17,6 +17,7 @@#include <drm/drmP.h> #include <drm/drm_crtc.h> #include <drm/drm_crtc_helper.h> +#include <drm/drm_atomic_helper.h> #include <drm/drm_fb_cma_helper.h> #include <drm/drm_gem_cma_helper.h>
@@ -496,6 +497,7 @@ static int shmob_drm_crtc_page_flip(struct drm_crtc *crtc,static const struct drm_crtc_funcs crtc_funcs = { .destroy = drm_crtc_cleanup, .set_config = drm_crtc_helper_set_config, + .set_property = drm_atomic_helper_crtc_set_property, .page_flip = shmob_drm_crtc_page_flip, };
drivers/gpu/drm/tegra/fb.c +2 -5
@@ -384,9 +384,6 @@ void tegra_drm_fb_exit(struct drm_device *drm)void tegra_fbdev_restore_mode (struct tegra_fbdev *fbdev) { -if (fbdev) { -drm_modeset_lock_all (fbdev->base.dev); -drm_fb_helper_restore_fbdev_mode (&fbdev->base); -drm_modeset_unlock_all (fbdev->base.dev); - } +if (fbdev) +drm_fb_helper_restore_fbdev_mode (&fbdev->base, false); }
drivers/gpu/drm/tilcdc/tilcdc_crtc.c +1 -0
@@ -411,6 +411,7 @@ static int tilcdc_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,static const struct drm_crtc_funcs tilcdc_crtc_funcs = { .destroy = tilcdc_crtc_destroy, .set_config = drm_crtc_helper_set_config, + .set_property = drm_atomic_helper_crtc_set_property, .page_flip = tilcdc_crtc_page_flip, };
drivers/gpu/drm/udl/udl_modeset.c +2 -0
@@ -14,6 +14,7 @@#include <drm/drmP.h> #include <drm/drm_crtc.h> #include <drm/drm_crtc_helper.h> +#include <drm/drm_atomic_helper.h> #include "udl_drv.h" /*
@@ -383,6 +384,7 @@ static struct drm_crtc_helper_funcs udl_helper_funcs = {static const struct drm_crtc_funcs udl_crtc_funcs = { .set_config = drm_crtc_helper_set_config, + .set_property = drm_atomic_helper_crtc_set_property, .destroy = udl_crtc_destroy, };
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +4 -8
@@ -186,7 +186,7 @@ int vmw_du_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv,* can do this since the caller in the drm core doesn't check anything * which is protected by any looks. */ -ww_mutex_unlock (&crtc->mutex); +drm_modeset_unlock_crtc (crtc);drm_modeset_lock_all (dev_priv->dev);/* A lot of the code assumes this */
@@ -251,9 +251,7 @@ int vmw_du_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv, ret =0 ; out:drm_modeset_unlock_all (dev_priv->dev); -// XXX umm, we probably need the state object here to properly -// re-aquire the lock.. -ww_mutex_lock (&crtc->mutex,NULL ); +drm_modeset_lock_crtc (crtc,NULL );return ret; }
@@ -274,7 +272,7 @@ int vmw_du_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)* can do this since the caller in the drm core doesn't check anything * which is protected by any looks. */ -ww_mutex_unlock (&crtc->mutex); +drm_modeset_unlock_crtc (crtc);drm_modeset_lock_all (dev_priv->dev); vmw_cursor_update_position(dev_priv, shown,
@@ -282,9 +280,7 @@ int vmw_du_crtc_cursor_move(struct drm_crtc *crtc, int x, int y) du->cursor_y + du->hotspot_y);drm_modeset_unlock_all (dev_priv->dev); -// XXX umm, we probably need the state object here to properly -// re-aquire the lock.. -ww_mutex_lock (&crtc->mutex,NULL ); +drm_modeset_lock_crtc (crtc,NULL );return 0 ; }
drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c +1 -0
@@ -298,6 +298,7 @@ static struct drm_crtc_funcs vmw_legacy_crtc_funcs = { .cursor_move = vmw_du_crtc_cursor_move, .gamma_set = vmw_du_crtc_gamma_set, .destroy = vmw_ldu_crtc_destroy, + .set_property = drm_atomic_helper_crtc_set_property, .set_config = vmw_ldu_crtc_set_config, };
drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c +1 -0
@@ -394,6 +394,7 @@ static struct drm_crtc_funcs vmw_screen_object_crtc_funcs = { .gamma_set = vmw_du_crtc_gamma_set, .destroy = vmw_sou_crtc_destroy, .set_config = vmw_sou_crtc_set_config, + .set_property = drm_atomic_helper_crtc_set_property, .page_flip = vmw_du_page_flip, };
include/drm/drm_atomic_helper.h +41 -0
59 lines not on this page · raw message
include/drm/drm_crtc.h +72 -15
160 lines not on this page · raw message
include/drm/drm_fb_helper.h +2 -1
@@ -108,7 +108,8 @@ int drm_fb_helper_set_par(struct fb_info *info);int drm_fb_helper_check_var (struct fb_var_screeninfo *var,struct fb_info *info); -bool drm_fb_helper_restore_fbdev_mode (struct drm_fb_helper *fb_helper); +bool drm_fb_helper_restore_fbdev_mode (struct drm_fb_helper *fb_helper, +bool lockless);void drm_fb_helper_fill_var (struct fb_info *info,struct drm_fb_helper *fb_helper,uint32_t fb_width,uint32_t fb_height); void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch,
include/uapi/drm/drm_mode.h +2 -0
@@ -508,4 +508,6 @@ struct drm_mode_destroy_dumb { uint32_t handle; }; +#define DRM_MODE_ATOMIC_NOLOCK 0x8000/* only used internally */ +#endif
Signature · 1 line
1.8.4.2
Re: [RFCv3 11/14] drm: convert crtc to properties/state
op 20-11-13 21:48, Rob Clark schreef:
Quoted 14 lines
drivers/gpu/drm/drm_crtc.c +14
-0+int drm_modeset_lock_crtc (struct drm_crtc *crtc,void *state) +{ +// ugg, this makes atomic_helper mandatory.. not really +// sure yet whether I should care, or just simplify things +// and require that drivers use or extend atomic_helper: +struct drm_atomic_helper_state *a = state; +struct ww_acquire_ctx *ww_ctx =NULL ; +int ret; + +if (a) { +if (a->flags &DRM_MODE_ATOMIC_NOLOCK ) +return 0 ; + ww_ctx = &a->ww_ctx; + }
drivers/gpu/drm/drm_crtc.c line 75
Quoted 10 lines
drivers/gpu/drm/drm_crtc.c +10
-0+ + ret =ww_mutex_lock (&crtc->mutex, ww_ctx); +if (a && !ret) { +WARN_ON (!list_empty (&crtc->lock_head)); +list_add (&crtc->lock_head, &a->locked_crtcs); + } + +return ret; +} +EXPORT_SYMBOL (drm_modeset_lock_crtc);
ww_mutex_lock cannot fail if ww_ctx == NULL, so please make this inline?
static inline drm_modeset_lock_crtc(...) { if (!ctx) return ww_mutex_lock(lock, NULL); else return __drm_modeset_lock_crtc_state(...); } or inline the latter too.
RFC v3 12/14 drm: Atomic modeset ioctl
In reply to Rob ClarkFrom: Ville Syrjälä <[email protected]>
The atomic modeset ioctl cna be used to push any number of new values for object properties. The driver can then check the full device configuration as single unit, and try to apply the changes atomically.
The ioctl simply takes a list of object IDs and property IDs and their values. For setting values to blob properties, the property value indicates the length of the data, and the actual data is passed via another blob pointer.
The caller can demand non-blocking operation from the ioctl, and if the driver can't satisfy that requirement an error will be returned.
The caller can also request to receive asynchronous completion events after the operation has reached the hardware. An event is sent for each object specified by the caller, whether or not the actual state of that object changed. Each event also carries a framebuffer ID, which indicates to user space that the specified object is no longer accessing that framebuffer.
TODO: detailed error reporting?
v1: original
v2: rebase on uapi changes, and drm state structs.. -- Rob Clark
v3: rebase, missing padding in drm_event_atomic.. -- Rob Clark
v4: drop atomic event, align flags w/ pageflip (atomic flags should be
a strick superset of pageflip flags to keep things easier for the drivers)
--- drivers/gpu/drm/drm_crtc.c | 157 +++++++++++++++++++++++++++++++++++++++++++- drivers/gpu/drm/drm_drv.c | 1 + include/drm/drmP.h | 6 ++ include/drm/drm_crtc.h | 2 + include/uapi/drm/drm.h | 12 ++++ include/uapi/drm/drm_mode.h | 21 ++++++ 6 files changed, 198 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_crtc.c +156 -1
@@ -4037,7 +4037,8 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,return -ENOENT ; crtc =obj_to_crtc (obj); - state = dev->driver->atomic_begin (dev, page_flip->flags); + state = dev->driver->atomic_begin (dev, + page_flip->flags |DRM_MODE_ATOMIC_NONBLOCK );if (IS_ERR (state))return PTR_ERR (state);
@@ -4451,3 +4452,157 @@ void drm_mode_config_cleanup(struct drm_device *dev)idr_destroy (&dev->mode_config.crtc_idr); }EXPORT_SYMBOL (drm_mode_config_cleanup); + +int drm_mode_atomic_ioctl (struct drm_device *dev, +void *data,struct drm_file *file_priv) +{ +struct drm_mode_atomic *arg = data; +uint32_t __user *objs_ptr = (uint32_t __user *)(unsigned long )(arg->objs_ptr); +uint32_t __user *count_props_ptr = (uint32_t __user *)(unsigned long )(arg->count_props_ptr); +uint32_t __user *props_ptr = (uint32_t __user *)(unsigned long )(arg->props_ptr); +uint64_t __user *prop_values_ptr = (uint64_t __user *)(unsigned long )(arg->prop_values_ptr); +uint64_t __user *blob_values_ptr = (uint64_t __user *)(unsigned long )(arg->blob_values_ptr); +unsigned int copied_objs =0 ; +unsigned int copied_props =0 ; +unsigned int copied_blobs =0 ; +void *state; +int ret =0 ; +unsigned int i, j; + +if (arg->flags & ~DRM_MODE_ATOMIC_FLAGS ) +return -EINVAL ; + +/* can't test and expect an event at the same time. */ +if ((arg->flags &DRM_MODE_ATOMIC_TEST_ONLY ) && + (arg->flags &DRM_MODE_PAGE_FLIP_EVENT )) +return -EINVAL ; + + state = dev->driver->atomic_begin (dev, arg->flags); +if (IS_ERR (state)) { + ret =PTR_ERR (state); + goto out; + } + +for (i =0 ; i < arg->count_objs; i++) { +uint32_t obj_id, count_props; +struct drm_mode_object *obj; + +if (get_user (obj_id, objs_ptr + copied_objs)) { + ret = -EFAULT ; + goto out; + } + + obj =drm_mode_object_find (dev, obj_id,DRM_MODE_OBJECT_ANY ); +if (!obj || !obj->properties) { + ret = -ENOENT ; + goto out; + } + +if ((obj->type ==DRM_MODE_OBJECT_CRTC ) && + (arg->flags &DRM_MODE_PAGE_FLIP_EVENT )) { +struct drm_pending_vblank_event *e = +create_vblank_event (dev, file_priv, arg->user_data); +if (!e) { + ret = -ENOMEM ; + goto out; + } + ret = dev->driver->atomic_set_event (dev, state, obj, e); +if (ret) { +destroy_vblank_event (dev, file_priv, e); + goto out; + } + } + +if (get_user (count_props, count_props_ptr + copied_objs)) { + ret = -EFAULT ; + goto out; + } + + copied_objs++; + +for (j =0 ; j < count_props; j++) { +uint32_t prop_id; +uint64_t prop_value; +struct drm_mode_object *prop_obj; +struct drm_property *prop; +void *blob_data =NULL ; + +if (get_user (prop_id, props_ptr + copied_props)) { + ret = -EFAULT ; + goto out; + } + +if (!object_has_prop (obj, prop_id)) { + ret = -EINVAL ; + goto out; + } + + prop_obj =drm_mode_object_find (dev, prop_id, +DRM_MODE_OBJECT_PROPERTY ); +if (!prop_obj) { + ret = -ENOENT ; + goto out; + } + prop =obj_to_property (prop_obj); + +if (get_user (prop_value, prop_values_ptr + copied_props)) { + ret = -EFAULT ; + goto out; + } + +if (!drm_property_change_is_valid (prop, prop_value)) { + ret = -EINVAL ; + goto out; + } + +if ((prop->flags &DRM_MODE_PROP_BLOB ) && prop_value) { +uint64_t blob_ptr; + +if (get_user (blob_ptr, blob_values_ptr + copied_blobs)) { + ret = -EFAULT ; + goto out; + } + + blob_data =kmalloc (prop_value,GFP_KERNEL ); +if (!blob_data) { + ret = -ENOMEM ; + goto out; + } + +if (copy_from_user (blob_data, (void __user *)(unsigned long )blob_ptr, prop_value)) { +kfree (blob_data); + ret = -EFAULT ; + goto out; + } + } + +/* User space sends the blob pointer even if we +* don't use it (length==0). +*/ +if (prop->flags &DRM_MODE_PROP_BLOB ) + copied_blobs++; + +/* The driver will be in charge of blob_data from now on. */ + ret =drm_mode_set_obj_prop (obj, state, prop, + prop_value, blob_data); +if (ret) + goto out; + + copied_props++; + } + } + + ret = dev->driver->atomic_check (dev, state); +if (ret) + goto out; + +if (arg->flags &DRM_MODE_ATOMIC_TEST_ONLY ) + goto out; + + ret = dev->driver->atomic_commit (dev, state); + + out: + dev->driver->atomic_end (dev, state); + +return ret; +}
drivers/gpu/drm/drm_drv.c +1 -0
@@ -167,6 +167,7 @@ static const struct drm_ioctl_desc drm_ioctls[] = {DRM_IOCTL_DEF (DRM_IOCTL_MODE_OBJ_GETPROPERTIES , drm_mode_obj_get_properties_ioctl,DRM_CONTROL_ALLOW |DRM_UNLOCKED ),DRM_IOCTL_DEF (DRM_IOCTL_MODE_OBJ_SETPROPERTY , drm_mode_obj_set_property_ioctl,DRM_MASTER |DRM_CONTROL_ALLOW |DRM_UNLOCKED ),DRM_IOCTL_DEF (DRM_IOCTL_MODE_CURSOR2 , drm_mode_cursor2_ioctl,DRM_MASTER |DRM_CONTROL_ALLOW |DRM_UNLOCKED ), + DRM_IOCTL_DEF(DRM_IOCTL_MODE_ATOMIC, drm_mode_atomic_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED), };#define DRM_CORE_IOCTL_COUNT ARRAY_SIZE( drm_ioctls )
include/drm/drmP.h +6 -0
@@ -1157,6 +1157,12 @@ struct drm_vblank_crtc {once per disable */ }; +struct drm_pending_atomic_event { +struct drm_pending_event base; +int pipe; +struct drm_event_atomic event; +}; +/** * DRM device structure. This structure represent a complete card that * may contain multiple heads.
include/drm/drm_crtc.h +2 -0
@@ -1301,6 +1301,8 @@ extern int drm_mode_obj_get_properties_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv);extern int drm_mode_obj_set_property_ioctl (struct drm_device *dev,void *data,struct drm_file *file_priv); +extern int drm_mode_atomic_ioctl (struct drm_device *dev, +void *data,struct drm_file *file_priv);extern void drm_fb_get_bpp_depth (uint32_t format,unsigned int *depth,int *bpp);
include/uapi/drm/drm.h +12 -0
@@ -759,6 +759,7 @@ struct drm_prime_handle {#define DRM_IOCTL_MODE_OBJ_GETPROPERTIES DRM_IOWR(0xB9, struct drm_mode_obj_get_properties)#define DRM_IOCTL_MODE_OBJ_SETPROPERTY DRM_IOWR(0xBA, struct drm_mode_obj_set_property)#define DRM_IOCTL_MODE_CURSOR2 DRM_IOWR(0xBB, struct drm_mode_cursor2) +#define DRM_IOCTL_MODE_ATOMIC DRM_IOWR(0xBC, struct drm_mode_atomic)/** * Device specific ioctls should only be in their respective headers
@@ -800,6 +801,17 @@ struct drm_event_vblank {__u32 reserved; }; +struct drm_event_atomic { +struct drm_event base; +__u64 user_data; +__u32 tv_sec; +__u32 tv_usec; +__u32 sequence; +__u32 obj_id; +__u32 old_fb_id; +__u32 reserved; +}; +/* typedef area */ #ifndef __KERNEL__typedef struct drm_clip_rect drm_clip_rect_t ;
include/uapi/drm/drm_mode.h +21 -0
@@ -508,6 +508,27 @@ struct drm_mode_destroy_dumb { uint32_t handle; }; +/* page-flip flags are valid, plus: */ +#define DRM_MODE_ATOMIC_TEST_ONLY 0x0100 +#define DRM_MODE_ATOMIC_NONBLOCK 0x0200#define DRM_MODE_ATOMIC_NOLOCK 0x8000/* only used internally */ +#define DRM_MODE_ATOMIC_FLAGS (\ + DRM_MODE_PAGE_FLIP_EVENT |\ + DRM_MODE_PAGE_FLIP_ASYNC |\ + DRM_MODE_ATOMIC_TEST_ONLY |\ + DRM_MODE_ATOMIC_NONBLOCK) + +/* FIXME come up with some sane error reporting mechanism? */ +struct drm_mode_atomic { +__u32 flags; +__u32 count_objs; +__u64 objs_ptr; +__u64 count_props_ptr; +__u64 props_ptr; +__u64 prop_values_ptr; +__u64 blob_values_ptr; +__u64 user_data; +}; +#endif
Signature · 6 lines
1.8.4.2 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Inki Dae
maintainerRe: [RFCv3 12/14] drm: Atomic modeset ioctl
Hi Rob and Ville,
2013/11/21 Rob Clark <[email protected]>:
Quoted 55 lines
From: Ville Syrjälä <[email protected]>
The atomic modeset ioctl cna be used to push any number of new values for object properties. The driver can then check the full device configuration as single unit, and try to apply the changes atomically.
The ioctl simply takes a list of object IDs and property IDs and their values. For setting values to blob properties, the property value indicates the length of the data, and the actual data is passed via another blob pointer.
The caller can demand non-blocking operation from the ioctl, and if the driver can't satisfy that requirement an error will be returned.
The caller can also request to receive asynchronous completion events after the operation has reached the hardware. An event is sent for each object specified by the caller, whether or not the actual state of that object changed. Each event also carries a framebuffer ID, which indicates to user space that the specified object is no longer accessing that framebuffer.
TODO: detailed error reporting?
v1: original
v2: rebase on uapi changes, and drm state structs.. -- Rob Clark
v3: rebase, missing padding indrm_event_atomic.. -- Rob Clark
v4: drop atomic event, align flags w/ pageflip (atomic flags should be
a strick superset of pageflip flags to keep things easier for the drivers)Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/drm_crtc.c | 157 +++++++++++++++++++++++++++++++++++++++++++- drivers/gpu/drm/drm_drv.c | 1 + include/drm/drmP.h | 6 ++ include/drm/drm_crtc.h | 2 + include/uapi/drm/drm.h | 12 ++++ include/uapi/drm/drm_mode.h | 21 ++++++ 6 files changed, 198 insertions(+), 1 deletion(-)drivers/gpu/drm/drm_crtc.c +2
-1@@ -4037,7 +4037,8 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,return -ENOENT ; crtc =obj_to_crtc (obj); - state = dev->driver->atomic_begin (dev, page_flip->flags); + state = dev->driver->atomic_begin (dev, + page_flip->flags |DRM_MODE_ATOMIC_NONBLOCK );if (IS_ERR (state))return PTR_ERR (state);
drivers/gpu/drm/drm_crtc.c void drm_mode_config_cleanup(struct drm_device *dev) · line 4458
Quoted 7 lines
drivers/gpu/drm/drm_crtc.c +4
-0@@ -4451,3 +4452,157 @@ void drm_mode_config_cleanup(struct drm_device *dev)idr_destroy (&dev->mode_config.crtc_idr); }EXPORT_SYMBOL (drm_mode_config_cleanup); + +int drm_mode_atomic_ioctl (struct drm_device *dev, +void *data,struct drm_file *file_priv) +{
Build error at this function like below,
drivers/built-in.o: In function `drm_mode_atomic_ioctl':
of_iommu.c:(.text+0x6d854): undefined reference to `__get_user_bad'
of_iommu.c:(.text+0x6d940): undefined reference to `__get_user_bad'And built correctly with the below change,
diff --git a/arch/arm/lib/getuser.S b/arch/arm/lib/getuser.S
index 9b06bb4..0f4f469 100644
--- a/arch/arm/lib/getuser.S
+++ b/arch/arm/lib/getuser.S
@@ -66,7 +66,7 @@ ENTRY(__get_user_4)
mov pc, lr
ENDPROC(__get_user_4)
-__get_user_bad:
+ENTRY(__get_user_bad)
mov r2, #0
mov r0, #-EFAULT
mov pc, lrI guess __get_user_bad is not global but drm_mode_atomic_ioctl function tries to refer this function as extern.
Is it build error only I can see?
Thanks,
Inki Dae
Re: [RFCv3 12/14] drm: Atomic modeset ioctl
Quoted 89 lines · Inki Dae
Hi Rob and Ville,
2013/11/21 Rob Clark <[email protected]>:
Quoted 55 lines
From: Ville Syrjälä <[email protected]>
The atomic modeset ioctl cna be used to push any number of new values for object properties. The driver can then check the full device configuration as single unit, and try to apply the changes atomically.
The ioctl simply takes a list of object IDs and property IDs and their values. For setting values to blob properties, the property value indicates the length of the data, and the actual data is passed via another blob pointer.
The caller can demand non-blocking operation from the ioctl, and if the driver can't satisfy that requirement an error will be returned.
The caller can also request to receive asynchronous completion events after the operation has reached the hardware. An event is sent for each object specified by the caller, whether or not the actual state of that object changed. Each event also carries a framebuffer ID, which indicates to user space that the specified object is no longer accessing that framebuffer.
TODO: detailed error reporting?
v1: original
v2: rebase on uapi changes, and drm state structs.. -- Rob Clark
v3: rebase, missing padding indrm_event_atomic.. -- Rob Clark
v4: drop atomic event, align flags w/ pageflip (atomic flags should be
a strick superset of pageflip flags to keep things easier for the drivers)Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/drm_crtc.c | 157 +++++++++++++++++++++++++++++++++++++++++++- drivers/gpu/drm/drm_drv.c | 1 + include/drm/drmP.h | 6 ++ include/drm/drm_crtc.h | 2 + include/uapi/drm/drm.h | 12 ++++ include/uapi/drm/drm_mode.h | 21 ++++++ 6 files changed, 198 insertions(+), 1 deletion(-)drivers/gpu/drm/drm_crtc.c +2
-1@@ -4037,7 +4037,8 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,return -ENOENT ; crtc =obj_to_crtc (obj); - state = dev->driver->atomic_begin (dev, page_flip->flags); + state = dev->driver->atomic_begin (dev, + page_flip->flags |DRM_MODE_ATOMIC_NONBLOCK );if (IS_ERR (state))return PTR_ERR (state);drivers/gpu/drm/drm_crtc.c void drm_mode_config_cleanup(struct drm_device *dev) · line 4458
Quoted 7 lines
drivers/gpu/drm/drm_crtc.c +4
-0@@ -4451,3 +4452,157 @@ void drm_mode_config_cleanup(struct drm_device *dev)idr_destroy (&dev->mode_config.crtc_idr); }EXPORT_SYMBOL (drm_mode_config_cleanup); + +int drm_mode_atomic_ioctl (struct drm_device *dev, +void *data,struct drm_file *file_priv) +{Build error at this function like below,
drivers/built-in.o: In function `drm_mode_atomic_ioctl': of_iommu.c:(.text+0x6d854): undefined reference to `__get_user_bad' of_iommu.c:(.text+0x6d940): undefined reference to `__get_user_bad'And built correctly with the below change,
diff --git a/arch/arm/lib/getuser.S b/arch/arm/lib/getuser.S index 9b06bb4..0f4f469 100644 --- a/arch/arm/lib/getuser.S +++ b/arch/arm/lib/getuser.S @@ -66,7 +66,7 @@ ENTRY(__get_user_4) mov pc, lr ENDPROC(__get_user_4) -__get_user_bad: +ENTRY(__get_user_bad) mov r2, #0 mov r0, #-EFAULT mov pc, lr
Quoted 2 lines
I guess
__get_user_badis not global butdrm_mode_atomic_ioctlfunction tries to refer this function as extern.
no, actually __get_user_bad is (I think) supposed to be a build error.
You need this patch:
(Or I think Russell King had a slightly updated version of that.. I need to work out with him about getting some version of that patch merged.)
BR,
-R
Quoted 4 lines
Is it build error only I can see?
Thanks,
Inki Dae
RFC v3 13/14 drm/msm: add atomic support
In reply to Rob ClarkTODO: probably can split this up into prep patch which splits the msm_queue_fence_cb out of gem..
--- drivers/gpu/drm/msm/Makefile | 1 + drivers/gpu/drm/msm/mdp4/mdp4_crtc.c | 48 +++++------- drivers/gpu/drm/msm/mdp4/mdp4_kms.c | 6 ++ drivers/gpu/drm/msm/mdp4/mdp4_kms.h | 1 + drivers/gpu/drm/msm/msm_atomic.c | 146 +++++++++++++++++++++++++++++++++++ drivers/gpu/drm/msm/msm_drv.c | 22 +++++- drivers/gpu/drm/msm/msm_drv.h | 8 ++ drivers/gpu/drm/msm/msm_gem.c | 24 +----- drivers/gpu/drm/msm/msm_gem.h | 13 ++++ 9 files changed, 218 insertions(+), 51 deletions(-) create mode 100644 drivers/gpu/drm/msm/msm_atomic.c
drivers/gpu/drm/msm/Makefile +1 -0
@@ -18,6 +18,7 @@ msm-y := \ mdp4/mdp4_irq.o \ mdp4/mdp4_kms.o \ mdp4/mdp4_plane.o \ + msm_atomic.o \ msm_drv.o \ msm_fb.o \ msm_gem.o \
drivers/gpu/drm/msm/mdp4/mdp4_crtc.c +18 -30
113 lines not on this page · raw message
drivers/gpu/drm/msm/mdp4/mdp4_kms.c +6 -0
@@ -128,6 +128,11 @@ static long mdp4_round_pixclk(struct msm_kms *kms, unsigned long rate,return mdp4_dtv_round_pixclk (encoder, rate); } +static void mdp4_flush (struct msm_kms *kms,struct drm_crtc *crtc) +{ +mdp4_crtc_flush (crtc); +} +static void mdp4_preclose (struct msm_kms *kms,struct drm_file *file) {struct mdp4_kms *mdp4_kms =to_mdp4_kms (kms);
@@ -154,6 +159,7 @@ static const struct msm_kms_funcs kms_funcs = { .disable_vblank = mdp4_disable_vblank, .get_format = mdp4_get_format, .round_pixclk = mdp4_round_pixclk, + .flush = mdp4_flush, .preclose = mdp4_preclose, .destroy = mdp4_destroy, };
drivers/gpu/drm/msm/mdp4/mdp4_kms.h +1 -0
@@ -206,6 +206,7 @@ enum mdp4_pipe mdp4_plane_pipe(struct drm_plane *plane);struct drm_plane *mdp4_plane_init (struct drm_device *dev,enum mdp4_pipe pipe_id,bool private_plane); +void mdp4_crtc_flush (struct drm_crtc *crtc);uint32_t mdp4_crtc_vblank (struct drm_crtc *crtc);void mdp4_crtc_cancel_pending_flip (struct drm_crtc *crtc,struct drm_file *file);void mdp4_crtc_set_config (struct drm_crtc *crtc,uint32_t config);
drivers/gpu/drm/msm/msm_atomic.c new file +146 -0
146 lines not on this page · raw message
drivers/gpu/drm/msm/msm_drv.c +21 -1
@@ -537,6 +537,26 @@ int msm_wait_fence_interruptable(struct drm_device *dev, uint32_t fence,return ret; } +int msm_queue_fence_cb (struct drm_device *dev, +struct msm_fence_cb *cb,uint32_t fence) +{ +struct msm_drm_private *priv = dev->dev_private; +int ret =0 ; + +mutex_lock (&dev->struct_mutex); +if (!list_empty (&cb->work.entry)) { + ret = -EINVAL ; + }else if (fence > priv->completed_fence) { + cb->fence = fence; +list_add_tail (&cb->work.entry, &priv->fence_cbs); + }else { +queue_work (priv->wq, &cb->work); + } +mutex_unlock (&dev->struct_mutex); + +return ret; +} +/* called from workqueue */ void msm_update_fence (struct drm_device *dev,uint32_t fence) {
@@ -734,7 +754,7 @@ static struct drm_driver msm_driver = { .atomic_begin = drm_atomic_helper_begin, .atomic_set_event = drm_atomic_helper_set_event, .atomic_check = drm_atomic_helper_check, - .atomic_commit = drm_atomic_helper_commit, + .atomic_commit = msm_atomic_commit, .atomic_end = drm_atomic_helper_end, .atomic_helpers = &drm_atomic_helper_funcs, #ifdef CONFIG_DEBUG_FS
drivers/gpu/drm/msm/msm_drv.h +8 -0
@@ -95,6 +95,9 @@ struct msm_drm_private {unsigned int num_connectors;struct drm_connector *connectors[8 ]; + +/* crtc's pending atomic update: */ +uint32_t pending_crtcs; };struct msm_format {
@@ -134,6 +137,7 @@ struct msm_kms_funcs {const struct msm_format *(*get_format)(struct msm_kms *kms,uint32_t format);long (*round_pixclk)(struct msm_kms *kms,unsigned long rate,struct drm_encoder *encoder); +void (*flush)(struct msm_kms *kms,struct drm_crtc *crtc);/* cleanup: */ void (*preclose)(struct msm_kms *kms,struct drm_file *file);void (*destroy)(struct msm_kms *kms);
@@ -151,11 +155,15 @@ int msm_iommu_attach(struct drm_device *dev, struct iommu_domain *iommu,int msm_wait_fence_interruptable (struct drm_device *dev,uint32_t fence,struct timespec *timeout); +int msm_queue_fence_cb (struct drm_device *dev, +struct msm_fence_cb *cb,uint32_t fence);void msm_update_fence (struct drm_device *dev,uint32_t fence);int msm_ioctl_gem_submit (struct drm_device *dev,void *data,struct drm_file *file); +int msm_atomic_commit (struct drm_device *dev,void *state); +int msm_gem_mmap (struct file *filp,struct vm_area_struct *vma);int msm_gem_fault (struct vm_area_struct *vma,struct vm_fault *vmf);uint64_t msm_gem_mmap_offset (struct drm_gem_object *obj);
drivers/gpu/drm/msm/msm_gem.c +4 -20
@@ -400,23 +400,11 @@ void *msm_gem_vaddr(struct drm_gem_object *obj)int msm_gem_queue_inactive_cb (struct drm_gem_object *obj,struct msm_fence_cb *cb) { -struct drm_device *dev = obj->dev; -struct msm_drm_private *priv = dev->dev_private;struct msm_gem_object *msm_obj =to_msm_bo (obj); -int ret =0 ; +uint32_t fence =msm_gem_fence (msm_obj, +MSM_PREP_READ |MSM_PREP_WRITE ); -mutex_lock (&dev->struct_mutex); -if (!list_empty (&cb->work.entry)) { - ret = -EINVAL ; - }else if (is_active (msm_obj)) { - cb->fence =max (msm_obj->read_fence, msm_obj->write_fence); -list_add_tail (&cb->work.entry, &priv->fence_cbs); - }else { -queue_work (priv->wq, &cb->work); - } -mutex_unlock (&dev->struct_mutex); - -return ret; +return msm_queue_fence_cb (obj->dev, cb, fence); } void msm_gem_move_to_active(struct drm_gem_object *obj,
@@ -455,12 +443,8 @@ int msm_gem_cpu_prep(struct drm_gem_object *obj, uint32_t op,int ret =0 ;if (is_active (msm_obj)) { -uint32_t fence =0 ; +uint32_t fence =msm_gem_fence (msm_obj, op); -if (op &MSM_PREP_READ ) - fence = msm_obj->write_fence; -if (op &MSM_PREP_WRITE ) - fence =max (fence, msm_obj->read_fence);if (op &MSM_PREP_NOSYNC ) timeout =NULL ;
drivers/gpu/drm/msm/msm_gem.h +13 -0
@@ -65,6 +65,19 @@ static inline bool is_active(struct msm_gem_object *msm_obj)return msm_obj->gpu !=NULL ; } +static inline uint32_t msm_gem_fence (struct msm_gem_object *msm_obj, +uint32_t op) +{ +uint32_t fence =0 ; + +if (op &MSM_PREP_READ ) + fence = msm_obj->write_fence; +if (op &MSM_PREP_WRITE ) + fence =max (fence, msm_obj->read_fence); + +return fence; +} +#define MAX_CMDS 4/* Created per submit-ioctl, to track bo's and cmdstream bufs, etc,
Signature · 1 line
1.8.4.2
RFC v3 14/14 HACK: drm: allow FB's in drm_mode_object_find
In reply to Rob ClarkUgg.. we do actually want to permit FB's in atomic case, since FB will be looked up like any other object property value.
Currently we do the FB refcnt'ing dance in atomic->commit(), and would rather not have to special case FB's or collect an FB ref when we look up the property. Not sure if it is better to rework the atomic FB refcnt'ing or loosen this restriction?
--- drivers/gpu/drm/drm_crtc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_crtc.c +1 -1
@@ -405,7 +405,7 @@ struct drm_mode_object *drm_mode_object_find(struct drm_device *dev,/* Framebuffers are reference counted and need their own lookup * function.*/ -WARN_ON (type ==DRM_MODE_OBJECT_FB ); +// WARN_ON(type == DRM_MODE_OBJECT_FB); mutex_lock (&dev->mode_config.idr_mutex); obj =idr_find (&dev->mode_config.crtc_idr, id);
Signature · 1 line
1.8.4.2