Atomic/nuclear modeset/pageflip
Subsystems (21)
cover Atomic/nuclear modeset/pageflip
Global thermonuclear modeflip?
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 in a fairly "rough draft" state, with a few areas that I need to revisit. But I think it is far enough along to give folks a peak at what I have in mind.
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.
TODO:
* revisit fb refcnting
* fix drivers with custom plane or crtc properties
Rob Clark (9):
drm: add atomic fxns
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 (BEFORE drm: split property values
out)
drm: split propvals out and blob property support
drm: convert plane to properties/state
drm: convert crtc to properties/state
ARM: add get_user() support for 8 byte types
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
arch/arm/include/asm/uaccess.h | 18 +- arch/arm/lib/getuser.S | 17 +- 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 | 456 ++++++++++ drivers/gpu/drm/drm_crtc.c | 1219 ++++++++++++++++++--------- drivers/gpu/drm/drm_drv.c | 1 + drivers/gpu/drm/drm_fb_helper.c | 20 +- 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_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 | 11 +- drivers/gpu/drm/gma500/psb_drv.c | 7 + 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 | 4 +- drivers/gpu/drm/i915/intel_dp.c | 7 +- drivers/gpu/drm/i915/intel_drv.h | 1 + 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 | 19 +- 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/mdp4/mdp4_crtc.c | 11 +- drivers/gpu/drm/msm/mdp4/mdp4_plane.c | 20 +- drivers/gpu/drm/msm/msm_drv.c | 6 + drivers/gpu/drm/msm/msm_drv.h | 1 + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 1 + 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 | 18 +- drivers/gpu/drm/omapdrm/omap_drv.c | 12 +- 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/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 | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 1 + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 1 + drivers/gpu/host1x/drm/dc.c | 17 +- drivers/gpu/host1x/drm/drm.c | 7 + drivers/gpu/host1x/drm/drm.h | 1 + drivers/staging/imx-drm/imx-drm-core.c | 8 + drivers/staging/imx-drm/ipuv3-crtc.c | 1 + include/drm/drmP.h | 83 ++ include/drm/drm_atomic_helper.h | 152 ++++ include/drm/drm_crtc.h | 243 +++++- include/uapi/drm/drm.h | 12 + include/uapi/drm/drm_mode.h | 28 + 93 files changed, 2242 insertions(+), 542 deletions(-) create mode 100644 drivers/gpu/drm/drm_atomic_helper.c create mode 100644 include/drm/drm_atomic_helper.h
Signature · 6 lines
1.8.3.1 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
RFC 1/12 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 | 129 ++++++++++++++++++++++++++ drivers/gpu/drm/drm_crtc.c | 139 ++++++++++++++++++---------- 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 | 3 +- 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/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 +- drivers/gpu/host1x/drm/drm.c | 7 ++ drivers/gpu/host1x/drm/drm.h | 1 + drivers/staging/imx-drm/imx-drm-core.c | 8 ++ include/drm/drmP.h | 77 +++++++++++++++ include/drm/drm_atomic_helper.h | 84 +++++++++++++++++ include/drm/drm_crtc.h | 14 +-- 63 files changed, 611 insertions(+), 98 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
@@ -217,6 +217,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
@@ -102,6 +102,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 +129 -0
129 lines not on this page · raw message
drivers/gpu/drm/drm_crtc.c +88 -51
197 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>
@@ -270,6 +271,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 +2 -1
@@ -244,7 +244,8 @@ mdfld_dsi_connector_detect(struct drm_connector *connector, bool force)static int mdfld_dsi_connector_set_property (struct drm_connector *connector,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
@@ -646,6 +646,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_init_object = psb_gem_init_object, .gem_free_object = psb_gem_free_object, .gem_vm_ops = &psb_gem_vm_ops,
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
@@ -1688,8 +1688,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
@@ -958,6 +958,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
@@ -676,8 +676,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
@@ -2931,8 +2931,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
@@ -993,8 +993,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
@@ -472,8 +472,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
@@ -2022,8 +2022,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
@@ -1440,8 +1440,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
@@ -104,6 +104,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
@@ -392,8 +392,8 @@ static int mdp4_crtc_page_flip(struct drm_crtc *crtc, &mdp4_crtc->pageflip_work); } -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
@@ -82,8 +82,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
@@ -698,6 +698,12 @@ static struct drm_driver msm_driver = { .dumb_create = msm_gem_dumb_create, .dumb_map_offset = msm_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, #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/nouveau_connector.c +2 -1
@@ -445,7 +445,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
@@ -843,6 +843,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
@@ -626,6 +626,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
@@ -799,8 +799,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
@@ -366,8 +366,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;
@@ -667,8 +668,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>
@@ -415,6 +416,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;
@@ -89,6 +90,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
@@ -1138,6 +1138,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);/*
drivers/gpu/host1x/drm/drm.c +7 -0
@@ -634,6 +634,13 @@ struct drm_driver tegra_drm_driver = { .dumb_map_offset = tegra_bo_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 = tegra_drm_ioctls, .num_ioctls = ARRAY_SIZE(tegra_drm_ioctls), .fops = &tegra_drm_fops,
drivers/gpu/host1x/drm/drm.h +1 -0
@@ -12,6 +12,7 @@#include <drm/drmP.h> #include <drm/drm_crtc_helper.h> +#include <drm/drm_atomic_helper.h> #include <drm/drm_edid.h> #include <drm/drm_fb_helper.h> #include <drm/drm_fixed.h>
drivers/staging/imx-drm/imx-drm-core.c +8 -0
@@ -19,6 +19,7 @@#include <drm/drmP.h> #include <drm/drm_fb_helper.h> #include <drm/drm_crtc_helper.h> +#include <drm/drm_atomic_helper.h> #include <linux/fb.h> #include <linux/module.h> #include <drm/drm_gem_cma_helper.h>
@@ -784,6 +785,13 @@ static struct drm_driver imx_drm_driver = { .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, + .get_vblank_counter = drm_vblank_count, .enable_vblank = imx_drm_enable_vblank, .disable_vblank = imx_drm_disable_vblank,
include/drm/drmP.h +77 -0
83 lines not on this page · raw message
include/drm/drm_atomic_helper.h new file +84 -0
84 lines not on this page · raw message
include/drm/drm_crtc.h +8 -6
@@ -368,8 +368,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); };/**
@@ -479,8 +480,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); };
@@ -650,8 +651,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.3.1
RFC 2/12 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
@@ -2776,6 +2776,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)
@@ -2879,6 +2881,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) {
@@ -3207,6 +3226,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++)
@@ -3283,9 +3307,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) {
@@ -3299,6 +3323,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 ;
@@ -3333,7 +3359,7 @@ static int drm_mode_set_obj_prop_id(struct drm_device *dev, void *state,return -EINVAL ; 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
@@ -297,6 +297,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; };
@@ -1030,6 +1031,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);
@@ -1048,6 +1051,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
@@ -231,6 +231,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.3.1
Re: [RFCv1 02/12] drm: add object property type
include/uapi/drm/drm_mode.h struct drm_mode_get_connector { · line 234
Quoted 9 lines · Rob Clark
include/uapi/drm/drm_mode.h +1
-0@@ -231,6 +231,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 */
This way to using up one bit for each type sucks big time. IIRC we discussed this at Fosdem and one idea was to leave the current bits as sort of base types, and reserve a bunch of the other bits to indicate a sub-type. For instance the new signed range and object ID prop types could be sub-types of the current range type.
Maybe we should reserve a few more bits for new base types in case we need them in the future, or just add sometime king DRM_MODE_PROP_MISC, which is where we'd stick every sub-type that doesn't fit the current base types.
Signature · 2 lines
Ville Syrjälä Intel OTC
Re: [RFCv1 02/12] drm: add object property type
Quoted 16 lines · Ville Syrjälä
include/uapi/drm/drm_mode.h struct drm_mode_get_connector { · line 234
Quoted 9 lines · Rob Clark
include/uapi/drm/drm_mode.h +1
-0@@ -231,6 +231,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 */ This way to using up one bit for each type sucks big time. IIRC we discussed this at Fosdem and one idea was to leave the current bits as sort of base types, and reserve a bunch of the other bits to indicate a sub-type. For instance the new signed range and object ID prop types could be sub-types of the current range type.
oh, right.. current object-prop is just a straight rebase of the original patch, so I didn't change this yet.
We probably don't want to use sub-type in cases where old userspace could misinterpret things, so not sure about signed-range to be a sub-type of range (if that is what you meant)... but maybe a good idea for PROP_MISC + PROP_SUBTYPE_OBJECT. Otoh, at the moment, the only other prop type I have in mind is ARRAY (although not sure if we can do single PROP_ARRAY or if we end up needing PROP_ARRAY_foo, for everything we might want an array of..)
BR,
-R
Quoted 8 lines
Maybe we should reserve a few more bits for new base types in case we need them in the future, or just add sometime king
DRM_MODE_PROP_MISC, which is where we'd stick every sub-type that doesn't fit the current base types.--
Ville Syrjälä
Intel OTC
RFC 3/12 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
@@ -232,6 +232,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.3.1
Re: [RFCv1 03/12] drm: add DRM_MODE_PROP_DYNAMIC property flag
Quoted 17 lines · Rob Clark
This 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 +0
-0@@ -232,6 +232,15 @@ struct drm_mode_get_connector {#define DRM_MODE_PROP_BLOB (1<<4)#define DRM_MODE_PROP_BITMASK (1<<5)/* bitmask of enumerated types */
include/uapi/drm/drm_mode.h struct drm_mode_get_connector { · line 243
Quoted 10 lines
include/uapi/drm/drm_mode.h +9
-0#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)
I'm still not convinced that this is useful. We can't even flag the FB ID with this flag since the FB encompasses stride/bpp/etc. parameters that for sure can't just be changed w/o first checking the new configuration.
Signature · 2 lines
Ville Syrjälä Intel OTC
Re: [RFCv1 03/12] drm: add DRM_MODE_PROP_DYNAMIC property flag
Quoted 25 lines · Ville Syrjälä
Quoted 24 lines · Rob Clark
This 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 +6
-0@@ -232,6 +232,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
Quoted 8 lines
include/uapi/drm/drm_mode.h struct drm_mode_get_connector { · line 243
Quoted 3 lines
include/uapi/drm/drm_mode.h +3
-0+* be changed dynamically, assuming the pixel format does not change. +*/ +#define DRM_MODE_PROP_DYNAMIC (1<<24)I'm still not convinced that this is useful. We can't even flag the FB ID with this flag since the FB encompasses stride/bpp/etc. parameters that for sure can't just be changed w/o first checking the new configuration.
well, I know of at least some hw that can change plane src/crtc coords without requiring a check step. So I think it is useful as an optimization. But it is also something that could be easily/safely added later so maybe I should drop it from the initial atomic patchset.
BR,
-R
Quoted 3 lines
--
Ville Syrjälä
Intel OTC
RFC 4/12 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 | 10 ++++++++-- include/drm/drm_crtc.h | 9 +++++++++ include/uapi/drm/drm_mode.h | 2 ++ 3 files changed, 19 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_crtc.c +8 -2
@@ -3211,9 +3211,15 @@ 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 ) { + }else if (property->flags & (DRM_MODE_PROP_RANGE |DRM_MODE_PROP_SIGNED )) { +int64_t svalue =U642I64 (value); +if (svalue <U642I64 (property->values[0 ]) || + svalue >U642I64 (property->values[1 ])) +return false; +return true; + }else if (property->flags &DRM_MODE_PROP_RANGE ) {if (value < property->values[0 ] || value > property->values[1 ])return false;return true;
include/drm/drm_crtc.h +9 -0
@@ -64,6 +64,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
@@ -241,6 +241,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.3.1
RE: [RFCv1 04/12] drm: add DRM_MODE_PROP_SIGNED property flag
Quoted 15 lines
static bool drm_property_change_is_valid(struct
drm_property*property,drivers/gpu/drm/drm_crtc.c +8
-2uint64_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 ) { + }else if (property->flags & (DRM_MODE_PROP_RANGE |DRM_MODE_PROP_SIGNED )) { +int64_t svalue =U642I64 (value); +if (svalue <U642I64 (property->values[0 ]) || + svalue >U642I64 (property->values[1 ])) +return false; +return true; + }else if (property->flags &DRM_MODE_PROP_RANGE ) {if (value < property->values[0] || value > property->values[1])
Review
Quoted 2 lines
(quoted diff) +0
-0return false; return true;
I don't think this is doing what you think it should. If the flags include DRM_MODE_PROP_RANGE, the first "else if" will be executed regardless of whether DRM_MODE_PROP_SIGNED is set or not. This means that the second "else if" will never be executed.
You'd need to add "== (DRM_MODE_PROP_RANGE|DRM_MODE_PROP_SIGNED)" or similar.
Matt
RFC 5/12 drm: helpers to find mode objects (BEFORE drm: split property values out)
In reply to Rob Clark--- include/drm/drm_crtc.h | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+)
include/drm/drm_crtc.h +40 -0
@@ -1067,6 +1067,46 @@ drm_property_get_obj(struct drm_property *property, uint64_t value)return drm_mode_object_find (property->dev, value, property->values[0 ]); } +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) +{ +struct drm_mode_object *mo; + mo =drm_mode_object_find (dev, id,DRM_MODE_OBJECT_CRTC ); +return mo ?obj_to_crtc (mo) :NULL ; +} + +static inline struct drm_encoder *drm_encoder_find (struct drm_device *dev, +uint32_t id) +{ +struct drm_mode_object *mo; + mo =drm_mode_object_find (dev, id,DRM_MODE_OBJECT_ENCODER ); +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 ; +} +/* IOCTLs */ extern int drm_mode_getresources (struct drm_device *dev,void *data,struct drm_file *file_priv);
Signature · 1 line
1.8.3.1
Re: [RFCv1 05/12] drm: helpers to find mode objects (BEFORE drm: split property values out)
Oh, and this one was half stolen from rmk's Armada driver with a couple extra helper's that I needed added
BR,
-R
Quoted 58 lines · Rob Clark
--- include/drm/drm_crtc.h | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+)include/drm/drm_crtc.h +40
-1@@ -1067,6 +1067,46 @@ drm_property_get_obj(struct drm_property *property, uint64_t value)return drm_mode_object_find (property->dev, value, property->values[0 ]); } +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) +{ +struct drm_mode_object *mo; + mo =drm_mode_object_find (dev, id,DRM_MODE_OBJECT_CRTC ); +return mo ?obj_to_crtc (mo) :NULL ; +} + +static inline struct drm_encoder *drm_encoder_find (struct drm_device *dev, +uint32_t id) +{ +struct drm_mode_object *mo; + mo =drm_mode_object_find (dev, id,DRM_MODE_OBJECT_ENCODER ); +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 ; +} +/* IOCTLs */ extern int drm_mode_getresources (struct drm_device *dev,void *data,struct drm_file *file_priv); --1.8.3.1
RFC 6/12 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) \
@@ -640,6 +648,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++;
@@ -729,6 +738,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;
@@ -902,6 +912,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,
@@ -1688,7 +1699,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;
@@ -2969,19 +2980,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 ; } }
@@ -2997,7 +3022,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 ; } }
@@ -3182,27 +3207,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; }
@@ -3279,7 +3312,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; }
@@ -3293,7 +3328,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; }
@@ -3308,7 +3344,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; }
@@ -3411,7 +3448,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
@@ -443,7 +443,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
@@ -275,7 +275,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) ||
@@ -299,8 +300,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)) 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
@@ -1700,7 +1700,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;
@@ -1756,7 +1757,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 ;
@@ -1768,7 +1771,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 ;
@@ -1780,7 +1785,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 ;
@@ -1792,7 +1799,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
@@ -8481,8 +8481,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
@@ -2942,7 +2942,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
@@ -1004,7 +1004,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
@@ -2034,7 +2034,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;
@@ -2111,7 +2112,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 ;
@@ -2123,7 +2126,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 ;
@@ -2135,7 +2140,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 ;
@@ -2147,7 +2154,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 ); }/**
@@ -1450,7 +1451,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
@@ -225,10 +225,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
@@ -40,6 +40,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
@@ -55,12 +56,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 ]; };
@@ -456,6 +461,7 @@ struct drm_crtc {void *helper_private;struct drm_object_properties properties; +struct drm_object_property_values propvals; };
@@ -620,6 +626,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_* */
@@ -695,6 +702,7 @@ struct drm_plane {const struct drm_plane_funcs *funcs;struct drm_object_properties properties; +struct drm_object_property_values propvals; };/**
@@ -1008,8 +1016,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.3.1
RFC 7/12 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
@@ -360,7 +360,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
@@ -51,6 +51,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.3.1 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
RFC 8/12 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
--- drivers/gpu/drm/drm_crtc.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-)
drivers/gpu/drm/drm_crtc.c +14 -11
@@ -3374,6 +3374,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,
@@ -3382,19 +3395,9 @@ 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) -return -EINVAL ; -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) +if (!(arg_obj &&object_has_prop (arg_obj, prop_id)))return -EINVAL ; prop_obj = drm_mode_object_find(dev, prop_id,
Signature · 6 lines
1.8.3.1 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [RFCv1 08/12] drm: Refactor object property check code
Quoted 46 lines · Rob Clark
From: 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 ClarkSigned-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/drm_crtc.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-)drivers/gpu/drm/drm_crtc.c +13
-3@@ -3374,6 +3374,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,@@ -3382,19 +3395,9 @@ 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) -return -EINVAL ;
drivers/gpu/drm/drm_crtc.c static int drm_mode_set_obj_prop_id(struct drm_device *dev, void *state, · line 3401
Quoted 10 lines
drivers/gpu/drm/drm_crtc.c +1
-8-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) +if (!(arg_obj &&object_has_prop (arg_obj, prop_id)))return -EINVAL ;
-ENOENT would actually seem more appropriate here.
Quoted 4 lines
drivers/gpu/drm/drm_crtc.c +0
-0prop_obj = drm_mode_object_find(dev, prop_id,Signature · 1 line
1.8.3.1
Signature · 2 lines
Ville Syrjälä Intel OTC
RFC 9/12 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 | 139 +++++++++- drivers/gpu/drm/drm_crtc.c | 400 +++++++++++++++++++--------- 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 | 19 +- drivers/gpu/drm/msm/mdp4/mdp4_crtc.c | 2 +- drivers/gpu/drm/msm/mdp4/mdp4_plane.c | 16 +- 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 +- drivers/gpu/host1x/drm/dc.c | 16 +- include/drm/drm_atomic_helper.h | 35 ++- include/drm/drm_crtc.h | 86 +++++- 18 files changed, 614 insertions(+), 188 deletions(-)
drivers/gpu/drm/drm_atomic_helper.c +137 -2
@@ -21,6 +21,8 @@struct drm_atomic_helper_state {uint32_t flags; +struct drm_plane **planes; +struct drm_plane_state **pstates; };/**
@@ -43,10 +45,12 @@ struct drm_atomic_helper_state {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 );
@@ -54,6 +58,13 @@ void *drm_atomic_helper_begin(struct drm_device *dev, uint32_t flags) ptr = &state[1 ]; 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);
@@ -89,7 +100,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);
@@ -106,7 +129,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);
@@ -119,11 +154,111 @@ EXPORT_SYMBOL(drm_atomic_helper_commit);*/ void drm_atomic_helper_end (struct drm_device *dev,void *state) { +struct drm_atomic_helper_state *a = state; +int nplanes = dev->mode_config.num_plane; +int i; + +for (i =0 ; i < nplanes; i++) { +if (a->pstates[i]) { + a->planes[i]->state->state =NULL ; +kfree (a->pstates[i]); + } + } +kfree (state); }EXPORT_SYMBOL (drm_atomic_helper_end); +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 && pstate->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 +270 -130
530 lines not on this page · raw message
drivers/gpu/drm/drm_fb_helper.c +16 -1
@@ -290,12 +290,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 +12 -7
@@ -868,16 +868,17 @@ intel_disable_plane(struct drm_plane *plane) {struct drm_device *dev = plane->dev;struct intel_plane *intel_plane =to_intel_plane (plane); +struct drm_plane_state *state = plane->state;int ret =0 ; -if (!plane->fb) +if (!state->fb)return 0 ; -if (WARN_ON (!plane->crtc)) +if (WARN_ON (!state->crtc))return -EINVAL ; -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) goto out;
@@ -966,11 +967,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,
@@ -979,7 +981,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);
@@ -989,6 +993,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
@@ -644,7 +644,7 @@ struct drm_crtc *mdp4_crtc_init(struct drm_device *dev, crtc = &mdp4_crtc->base; mdp4_crtc->plane = plane; - mdp4_crtc->plane->crtc = crtc; + mdp4_crtc->plane->state->crtc = crtc; mdp4_crtc->ovlp = ovlp_id; mdp4_crtc->dma = dma_id;
drivers/gpu/drm/msm/mdp4/mdp4_plane.c +10 -6
@@ -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);
@@ -85,8 +88,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 = {
@@ -115,7 +119,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
@@ -191,7 +195,7 @@ int mdp4_plane_mode_set(struct drm_plane *plane,mdp4_write (mdp4_kms,REG_MDP4_PIPE_PHASEX_STEP (pipe), phasex_step);mdp4_write (mdp4_kms,REG_MDP4_PIPE_PHASEY_STEP (pipe), phasey_step); - plane->crtc = crtc; + plane->state->crtc = crtc;return 0 ; }
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, };
drivers/gpu/host1x/drm/dc.c +9 -7
@@ -75,11 +75,11 @@ static int tegra_plane_update(struct drm_plane *plane, struct drm_crtc *crtc,static int tegra_plane_disable (struct drm_plane *plane) { -struct tegra_dc *dc =to_tegra_dc (plane->crtc); +struct tegra_dc *dc =to_tegra_dc (plane->state->crtc);struct tegra_plane *p =to_tegra_plane (plane);unsigned long value; -if (!plane->crtc) +if (!plane->state->crtc)return 0 ; value =WINDOW_A_SELECT << p->index;
@@ -104,6 +104,7 @@ static void tegra_plane_destroy(struct drm_plane *plane)static const struct drm_plane_funcs tegra_plane_funcs = { .update_plane = tegra_plane_update, .disable_plane = tegra_plane_disable, + .set_property = drm_atomic_helper_plane_set_property, .destroy = tegra_plane_destroy, };
@@ -267,13 +268,14 @@ static void tegra_crtc_disable(struct drm_crtc *crtc)struct drm_plane *plane;list_for_each_entry (plane, &drm->mode_config.plane_list, head) { -if (plane->crtc == crtc) { +struct drm_plane_state *state = plane->state; +if (state->crtc == crtc) {tegra_plane_disable (plane); - plane->crtc =NULL ; + state->crtc =NULL ; -if (plane->fb) { -drm_framebuffer_unreference (plane->fb); - plane->fb =NULL ; +if (state->fb) { +drm_framebuffer_unreference (state->fb); + state->fb =NULL ; } } }
include/drm/drm_atomic_helper.h +34 -1
@@ -68,7 +68,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;
@@ -81,4 +83,35 @@ 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); +} +#endif /* DRM_ATOMIC_HELPER_H_ */
include/drm/drm_crtc.h +79 -7
127 lines not on this page · raw message
Signature · 1 line
1.8.3.1
RFC 10/12 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.
--- drivers/gpu/drm/ast/ast_mode.c | 1 + drivers/gpu/drm/cirrus/cirrus_mode.c | 1 + drivers/gpu/drm/drm_atomic_helper.c | 194 ++++++++++++- drivers/gpu/drm/drm_crtc.c | 422 ++++++++++++++++------------- drivers/gpu/drm/exynos/exynos_drm_crtc.c | 5 +- drivers/gpu/drm/gma500/cdv_intel_display.c | 1 + drivers/gpu/drm/gma500/psb_intel_display.c | 1 + drivers/gpu/drm/i915/intel_display.c | 1 + drivers/gpu/drm/mgag200/mgag200_mode.c | 1 + drivers/gpu/drm/msm/mdp4/mdp4_crtc.c | 5 +- drivers/gpu/drm/nouveau/dispnv04/crtc.c | 1 + drivers/gpu/drm/nouveau/nv50_display.c | 1 + drivers/gpu/drm/omapdrm/omap_crtc.c | 9 +- drivers/gpu/drm/omapdrm/omap_drv.c | 2 +- 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/tilcdc/tilcdc_crtc.c | 1 + drivers/gpu/drm/udl/udl_modeset.c | 2 + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 1 + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 1 + drivers/gpu/host1x/drm/dc.c | 1 + drivers/staging/imx-drm/ipuv3-crtc.c | 1 + include/drm/drm_atomic_helper.h | 35 +++ include/drm/drm_crtc.h | 74 ++++- 26 files changed, 555 insertions(+), 214 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 +193 -1
256 lines not on this page · raw message
drivers/gpu/drm/drm_crtc.c +230 -192
576 lines not on this page · raw message
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/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_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 +1 -0
@@ -9277,6 +9277,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/mgag200/mgag200_mode.c +1 -0
@@ -1298,6 +1298,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
@@ -395,8 +395,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/nouveau/dispnv04/crtc.c +1 -0
@@ -1088,6 +1088,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 +7 -2
@@ -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 = {
drivers/gpu/drm/omapdrm/omap_drv.c +1 -1
@@ -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 ); }
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) {
@@ -365,6 +366,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
@@ -31,6 +31,7 @@#include <asm/div64.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)
@@ -499,6 +500,7 @@ static const struct drm_crtc_funcs radeon_crtc_funcs = { .cursor_move = radeon_crtc_cursor_move, .gamma_set = radeon_crtc_gamma_set, .set_config = drm_crtc_helper_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/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_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, };
drivers/gpu/host1x/drm/dc.c +1 -0
@@ -259,6 +259,7 @@ static int tegra_dc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb,static const struct drm_crtc_funcs tegra_crtc_funcs = { .page_flip = tegra_dc_page_flip, .set_config = drm_crtc_helper_set_config, + .set_property = drm_atomic_helper_crtc_set_property, .destroy = drm_crtc_cleanup, };
drivers/staging/imx-drm/ipuv3-crtc.c +1 -0
@@ -155,6 +155,7 @@ static int ipu_page_flip(struct drm_crtc *crtc,static const struct drm_crtc_funcs ipu_crtc_funcs = { .set_config = drm_crtc_helper_set_config, + .set_property = drm_atomic_helper_crtc_set_property, .destroy = drm_crtc_cleanup, .page_flip = ipu_page_flip, };
include/drm/drm_atomic_helper.h +35 -0
@@ -71,6 +71,10 @@ struct drm_atomic_helper_funcs {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); + +struct drm_crtc_state *(*get_crtc_state)(struct drm_crtc *crtc,void *state); +int (*check_crtc_state)(struct drm_crtc *crtc,struct drm_crtc_state *cstate); +int (*commit_crtc_state)(struct drm_crtc *crtc,struct drm_crtc_state *cstate); };const extern struct drm_atomic_helper_funcs drm_atomic_helper_funcs;
@@ -114,4 +118,35 @@ drm_atomic_commit_plane_state(struct drm_plane *plane,return funcs->commit_plane_state (plane, pstate); } +int drm_atomic_helper_crtc_set_property (struct drm_crtc *crtc,void *state, +struct drm_property *property,uint64_t val,void *blob_data); +void drm_atomic_helper_init_crtc_state (struct drm_crtc *crtc, +struct drm_crtc_state *cstate,void *state); + +static inline struct drm_crtc_state * +drm_atomic_get_crtc_state (struct drm_crtc *crtc,void *state) +{ +const struct drm_atomic_helper_funcs *funcs = + crtc->dev->driver->atomic_helpers; +return funcs->get_crtc_state (crtc, state); +} + +static inline int +drm_atomic_check_crtc_state (struct drm_crtc *crtc, +struct drm_crtc_state *cstate) +{ +const struct drm_atomic_helper_funcs *funcs = + crtc->dev->driver->atomic_helpers; +return funcs->check_crtc_state (crtc, cstate); +} + +static inline int +drm_atomic_commit_crtc_state (struct drm_crtc *crtc, +struct drm_crtc_state *cstate) +{ +const struct drm_atomic_helper_funcs *funcs = + crtc->dev->driver->atomic_helpers; +return funcs->commit_crtc_state (crtc, cstate); +} +#endif /* DRM_ATOMIC_HELPER_H_ */
include/drm/drm_crtc.h +59 -15
127 lines not on this page · raw message
Signature · 1 line
1.8.3.1
Re: [RFCv1 10/12] drm: convert crtc to properties/state
Quoted 8 lines · Rob Clark
Break 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 multipleset_property()calls and for easy atomic commit or roll- back.
I'm not sure how we're going to handle the mismatch in the behaviour of the atomic modeset vs. the current setcrtc.
The problem is that setcrtc ignore all kinds of conflicting crtc->connector assignments, and just overwrites whatever was there with the latest configuration. For the atomic case we want to return an error if there's a conflict. And another thing is the DPMS handling. The current API forces DPMS on when you do a modeset, but for the atomic case I want to keep things nice and clean and avoid doing such silly things.
So I don't think we can simply convert the current modeset codepaths to call into the atomic code. We basically need another version of the check function, or another step that happens before .check only in the setcrtc case which eliminates the conflicts in a way that matches the current setcrtc behaviour.
Signature · 2 lines
Ville Syrjälä Intel OTC
Re: [RFCv1 10/12] drm: convert crtc to properties/state
Quoted 10 lines · Ville Syrjälä
Quoted 8 lines · Rob Clark
Break 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 multipleset_property()calls and for easy atomic commit or roll- back.
Quoted 7 lines
I'm not sure how we're going to handle the mismatch in the behaviour of the atomic modeset vs. the current setcrtc.
The problem is that setcrtc ignore all kinds of conflicting
crtc->connectorassignments, and just overwrites whatever was there with the latest configuration. For the atomic case we want to return an error if there's a conflict.
Hmm, well currently we preserve the setcrtc behavior because it ends up going through crtc helpers (or whatever the driver uses). So should be fine for setcrtc, but probably not what we want for atomic ioctl.
I suppose we could solve some of this via internal flags, ie .atomic_begin(dev, LEGACY_SETCRTC_CHECK_MODE)
it is a bit ugly, but it keeps the ugly in core and drivers don't have to care as much about it (which is my main concern)
Quoted 4 lines
And another thing is the DPMS handling. The
current API forces DPMS on when you do a modeset, but for the atomic case I want to keep things nice and clean and avoid doing such silly things.
I guess the easy thing is to set DPMS property in setcrtc too ;-)
BR,
-R
Quoted 9 lines
So I don't think we can simply convert the current modeset codepaths to call into the atomic code. We basically need another version of the check function, or another step that happens before .check only in the setcrtc case which eliminates the conflicts in a way that matches the current setcrtc behaviour.
--
Ville Syrjälä
Intel OTC
Re: [RFCv1 10/12] drm: convert crtc to properties/state
Quoted 25 lines · Rob Clark
Quoted 10 lines · Ville Syrjälä
Quoted 8 lines · Rob Clark
Break 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 multipleset_property()calls and for easy atomic commit or roll- back.Quoted 7 lines
I'm not sure how we're going to handle the mismatch in the behaviour of the atomic modeset vs. the current setcrtc.
The problem is that setcrtc ignore all kinds of conflicting
crtc->connectorassignments, and just overwrites whatever was there with the latest configuration. For the atomic case we want to return an error if there's a conflict.Hmm, well currently we preserve the setcrtc behavior because it ends up going through crtc helpers (or whatever the driver uses). So should be fine for setcrtc, but probably not what we want for atomic ioctl.
Quoted 5 lines
I suppose we could solve some of this via internal flags, ie .atomic_begin(dev,
LEGACY_SETCRTC_CHECK_MODE)it is a bit ugly, but it keeps the ugly in core and drivers don't have to care as much about it (which is my main concern)
Well, it could be an entirely separate .legacy_crap() hook or something that happens just before .check().
Quoted 7 lines
Quoted 5 lines
And another thing is the DPMS handling. The
current API forces DPMS on when you do a modeset, but for the atomic case I want to keep things nice and clean and avoid doing such silly things.I guess the easy thing is to set DPMS property in setcrtc too ;-)
That's what we do, but I don't want it for atomic.
Quoted 13 lines
BR,
-RQuoted 9 lines
So I don't think we can simply convert the current modeset codepaths to call into the atomic code. We basically need another version of the check function, or another step that happens before .check only in the setcrtc case which eliminates the conflicts in a way that matches the current setcrtc behaviour.
--
Ville Syrjälä
Intel OTC
Signature · 2 lines
Ville Syrjälä Intel OTC
Re: [RFCv1 10/12] drm: convert crtc to properties/state
Quoted 26 lines · Ville Syrjälä
Quoted 25 lines · Rob Clark
Quoted 10 lines · Ville Syrjälä
Quoted 8 lines · Rob Clark
Break 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 multipleset_property()calls and for easy atomic commit or roll- back.Quoted 7 lines
I'm not sure how we're going to handle the mismatch in the behaviour of the atomic modeset vs. the current setcrtc.
The problem is that setcrtc ignore all kinds of conflicting
crtc->connectorassignments, and just overwrites whatever was there with the latest configuration. For the atomic case we want to return an error if there's a conflict.Hmm, well currently we preserve the setcrtc behavior because it ends up going through crtc helpers (or whatever the driver uses). So should be fine for setcrtc, but probably not what we want for atomic ioctl.
Quoted 8 lines
Quoted 5 lines
I suppose we could solve some of this via internal flags, ie .atomic_begin(dev,
LEGACY_SETCRTC_CHECK_MODE)it is a bit ugly, but it keeps the ugly in core and drivers don't have to care as much about it (which is my main concern)
Well, it could be an entirely separate .legacy_crap() hook or something that happens just before .check().
yeah, that could work too.. I'll think about it a bit and see what I can come up with
Quoted 9 lines
Quoted 7 lines
Quoted 5 lines
And another thing is the DPMS handling. The
current API forces DPMS on when you do a modeset, but for the atomic case I want to keep things nice and clean and avoid doing such silly things.I guess the easy thing is to set DPMS property in setcrtc too ;-)
That's what we do, but I don't want it for atomic.
yeah, I need think about how that could work if we are still using .set_config() from the commit, but I guess I should be able to sort out something..
BR,
-R
Quoted 17 lines
Quoted 13 lines
BR,
-RQuoted 9 lines
So I don't think we can simply convert the current modeset codepaths to call into the atomic code. We basically need another version of the check function, or another step that happens before .check only in the setcrtc case which eliminates the conflicts in a way that matches the current setcrtc behaviour.
--
Ville Syrjälä
Intel OTC--
Ville Syrjälä
Intel OTC
Re: [RFCv1 10/12] drm: convert crtc to properties/state
Quoted 31 lines · Rob Clark
Quoted 29 lines · Ville Syrjälä
Quoted 28 lines · Rob Clark
Quoted 10 lines · Ville Syrjälä
Quoted 8 lines · Rob Clark
Break 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 multipleset_property()calls and for easy atomic commit or roll- back.Quoted 7 lines
I'm not sure how we're going to handle the mismatch in the behaviour of the atomic modeset vs. the current setcrtc.
The problem is that setcrtc ignore all kinds of conflicting
crtc->connectorassignments, and just overwrites whatever was there with the latest configuration. For the atomic case we want to return an error if there's a conflict.Hmm, well currently we preserve the setcrtc behavior because it ends up going through crtc helpers (or whatever the driver uses). So should be fine for setcrtc, but probably not what we want for atomic ioctl.
I suppose we could solve some of this via internal flags, ie .atomic_begin(dev,
LEGACY_SETCRTC_CHECK_MODE)
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
it is a bit ugly, but it keeps the ugly in core and drivers don't have to care as much about it (which is my main concern)
Well, it could be an entirely separate .legacy_crap() hook or something that happens just before .check().
yeah, that could work too.. I'll think about it a bit and see what I can come up with
Why can't the legacy setcrtc ioctl implemenation just fiddle the current state out of the connector/encoder pointers and then make a relevant atomic call? So if it notices that some connectors would be disabled it just adds an explicit clearing of the connector->crtc link to the atomic request.
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 4 lines
And another thing is the DPMS handling. The
current API forces DPMS on when you do a modeset, but for the atomic case I want to keep things nice and clean and avoid doing such silly things.
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
I guess the easy thing is to set DPMS property in setcrtc too ;-)
That's what we do, but I don't want it for atomic.
yeah, I need think about how that could work if we are still using .set_config() from the commit, but I guess I should be able to sort out something..
Similarly here the legacy setcrtc simply needs to supply a dpms=ON request for all connectors that are in the setcrtc request.
With those changes drivers can get rid of these hacks and legacy ioctl quirks internally and we consolidate them into one single place ...
The real crux here is getting legacy pageflip semantics out of the new interface. In any case I think if we're left with some non-helper set_cursor, set_plane, setfoo/bar from yonder the new atomic interface is probably not good enough. After all anything that current userspace does with these ioctls it probably wants to keep on doing in the new world. So imo making sure that all the old ioctls work in terms of the new driver interface is a nice real-world test of their suitability.
Cheers, Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
RFC 11/12 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
--- drivers/gpu/drm/drm_crtc.c | 159 ++++++++++++++++++++++++++++++++++++++++++++ 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 | 16 +++++ 6 files changed, 196 insertions(+)
drivers/gpu/drm/drm_crtc.c +159 -0
@@ -4338,3 +4338,162 @@ 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_TEST_ONLY | +DRM_MODE_ATOMIC_EVENT |DRM_MODE_ATOMIC_NONBLOCK )) +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_ATOMIC_EVENT )) +return -EINVAL ; + +mutex_lock (&dev->mode_config.mutex); + + state = dev->driver->atomic_begin (dev, arg->flags); +if (IS_ERR (state)) { + ret =PTR_ERR (state); + goto unlock; + } + +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 (arg->flags &DRM_MODE_ATOMIC_EVENT ) { +// XXX create atomic event instead.. +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); + unlock: +mutex_unlock (&dev->mode_config.mutex); + +return ret; +}
drivers/gpu/drm/drm_drv.c +1 -0
@@ -166,6 +166,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
@@ -1158,6 +1158,12 @@ struct drm_pending_vblank_event {struct drm_event_vblank event; }; +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
@@ -1313,6 +1313,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
@@ -733,6 +733,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
@@ -774,6 +775,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; +}; +#define DRM_CAP_DUMB_BUFFER 0x1#define DRM_CAP_VBLANK_HIGH_CRTC 0x2#define DRM_CAP_DUMB_PREFERRED_DEPTH 0x3
include/uapi/drm/drm_mode.h +16 -0
@@ -489,4 +489,20 @@ struct drm_mode_destroy_dumb { uint32_t handle; }; +#define DRM_MODE_ATOMIC_TEST_ONLY (1<<0) +#define DRM_MODE_ATOMIC_EVENT (1<<1) +#define DRM_MODE_ATOMIC_NONBLOCK (1<<2) + +/* 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.3.1 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [RFCv1 11/12] drm: Atomic modeset ioctl
Quoted 62 lines · Rob Clark
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 ClarkSigned-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/drm_crtc.c | 159 ++++++++++++++++++++++++++++++++++++++++++++ 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 | 16 +++++ 6 files changed, 196 insertions(+)drivers/gpu/drm/drm_crtc.c +17
-0@@ -4338,3 +4338,162 @@ 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; +
drivers/gpu/drm/drm_crtc.c void drm_mode_config_cleanup(struct drm_device *dev) · line 4367
Quoted 10 lines
drivers/gpu/drm/drm_crtc.c +10
-0+if (arg->flags & ~(DRM_MODE_ATOMIC_TEST_ONLY | +DRM_MODE_ATOMIC_EVENT |DRM_MODE_ATOMIC_NONBLOCK )) +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_ATOMIC_EVENT )) +return -EINVAL ; + +mutex_lock (&dev->mode_config.mutex);
I'm pretty sure I had a version w/ fixed locking...
git://gitorious.org/vsyrjala/linux.git rebased_drm_atomic_24
Quoted 14 lines
drivers/gpu/drm/drm_crtc.c +14
-0+ + state = dev->driver->atomic_begin (dev, arg->flags); +if (IS_ERR (state)) { + ret =PTR_ERR (state); + goto unlock; + } + +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;
drivers/gpu/drm/drm_crtc.c void drm_mode_config_cleanup(struct drm_device *dev) · line 4391
Quoted 10 lines
drivers/gpu/drm/drm_crtc.c +10
-0+ } + + obj =drm_mode_object_find (dev, obj_id,DRM_MODE_OBJECT_ANY ); +if (!obj || !obj->properties) { + ret = -ENOENT ; + goto out; + } + +if (arg->flags &DRM_MODE_ATOMIC_EVENT ) { +// XXX create atomic event instead..
Some people are apparently more comfortable with a per-crtc event rather than the per-obj events I added. So I think we might want both in the end.
Quoted 207 lines
drivers/gpu/drm/drm_crtc.c +108
-0+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); + unlock: +mutex_unlock (&dev->mode_config.mutex); + +return ret; +}drivers/gpu/drm/drm_drv.c +1
-0@@ -166,6 +166,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@@ -1158,6 +1158,12 @@ struct drm_pending_vblank_event {struct drm_event_vblank event; }; +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@@ -1313,6 +1313,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@@ -733,6 +733,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 @@ -774,6 +775,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; +}; +#define DRM_CAP_DUMB_BUFFER 0x1#define DRM_CAP_VBLANK_HIGH_CRTC 0x2#define DRM_CAP_DUMB_PREFERRED_DEPTH 0x3include/uapi/drm/drm_mode.h +16
-0@@ -489,4 +489,20 @@ struct drm_mode_destroy_dumb { uint32_t handle; }; +#define DRM_MODE_ATOMIC_TEST_ONLY (1<<0) +#define DRM_MODE_ATOMIC_EVENT (1<<1) +#define DRM_MODE_ATOMIC_NONBLOCK (1<<2) + +/* 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 · 1 line
1.8.3.1
Signature · 2 lines
Ville Syrjälä Intel OTC
Re: [RFCv1 11/12] drm: Atomic modeset ioctl
Quoted 76 lines · Ville Syrjälä
Quoted 62 lines · Rob Clark
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 ClarkSigned-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/drm_crtc.c | 159 ++++++++++++++++++++++++++++++++++++++++++++ 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 | 16 +++++ 6 files changed, 196 insertions(+)drivers/gpu/drm/drm_crtc.c +17
-0@@ -4338,3 +4338,162 @@ 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; +drivers/gpu/drm/drm_crtc.c void drm_mode_config_cleanup(struct drm_device *dev) · line 4367
Quoted 10 lines
drivers/gpu/drm/drm_crtc.c +10
-0+if (arg->flags & ~(DRM_MODE_ATOMIC_TEST_ONLY | +DRM_MODE_ATOMIC_EVENT |DRM_MODE_ATOMIC_NONBLOCK )) +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_ATOMIC_EVENT )) +return -EINVAL ; + +mutex_lock (&dev->mode_config.mutex);I'm pretty sure I had a version w/ fixed locking...
Quoted 1 line
git://gitorious.org/vsyrjala/linux.gitrebased_drm_atomic_24
oh, hmm.. actually the locking should no longer be in the ioctl fxn, but should be pushed down to the commit. looks like I missed this. I need to dig up some actual test code for atomic ioctl ;-)
Quoted 20 lines
Quoted 20 lines
drivers/gpu/drm/drm_crtc.c +20
-0+ + state = dev->driver->atomic_begin (dev, arg->flags); +if (IS_ERR (state)) { + ret =PTR_ERR (state); + goto unlock; + } + +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;
Quoted 8 lines
drivers/gpu/drm/drm_crtc.c void drm_mode_config_cleanup(struct drm_device *dev) · line 4391
Quoted 4 lines
drivers/gpu/drm/drm_crtc.c +4
-0+ } + +if (arg->flags &DRM_MODE_ATOMIC_EVENT ) { +// XXX create atomic event instead.. Some people are apparently more comfortable with a per-crtc event rather than the per-obj events I added. So I think we might want both in the end.
yeah, sorting out events is a bit 'TODO' at the moment. I do kind of like per-crtc event.. it seems easier to implement and I'm not really sure what finer event granularity buys us.
BR,
-R
Quoted 211 lines
Quoted 206 lines
drivers/gpu/drm/drm_crtc.c +108
-0+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); + unlock: +mutex_unlock (&dev->mode_config.mutex); + +return ret; +}drivers/gpu/drm/drm_drv.c +1
-0@@ -166,6 +166,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@@ -1158,6 +1158,12 @@ struct drm_pending_vblank_event {struct drm_event_vblank event; }; +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@@ -1313,6 +1313,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@@ -733,6 +733,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 @@ -774,6 +775,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; +}; +#define DRM_CAP_DUMB_BUFFER 0x1#define DRM_CAP_VBLANK_HIGH_CRTC 0x2#define DRM_CAP_DUMB_PREFERRED_DEPTH 0x3include/uapi/drm/drm_mode.h +16
-1@@ -489,4 +489,20 @@ struct drm_mode_destroy_dumb { uint32_t handle; }; +#define DRM_MODE_ATOMIC_TEST_ONLY (1<<0) +#define DRM_MODE_ATOMIC_EVENT (1<<1) +#define DRM_MODE_ATOMIC_NONBLOCK (1<<2) + +/* 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 --Quoted 1 line
1.8.3.1
--
Ville Syrjälä
Intel OTC
Re: [RFCv1 11/12] drm: Atomic modeset ioctl
Quoted 78 lines · Rob Clark
Quoted 76 lines · Ville Syrjälä
Quoted 62 lines · Rob Clark
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 ClarkSigned-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/drm_crtc.c | 159 ++++++++++++++++++++++++++++++++++++++++++++ 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 | 16 +++++ 6 files changed, 196 insertions(+)drivers/gpu/drm/drm_crtc.c +17
-0@@ -4338,3 +4338,162 @@ 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; +drivers/gpu/drm/drm_crtc.c void drm_mode_config_cleanup(struct drm_device *dev) · line 4367
Quoted 10 lines
drivers/gpu/drm/drm_crtc.c +10
-0+if (arg->flags & ~(DRM_MODE_ATOMIC_TEST_ONLY | +DRM_MODE_ATOMIC_EVENT |DRM_MODE_ATOMIC_NONBLOCK )) +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_ATOMIC_EVENT )) +return -EINVAL ; + +mutex_lock (&dev->mode_config.mutex);I'm pretty sure I had a version w/ fixed locking...
Quoted 5 lines
Quoted 1 line
git://gitorious.org/vsyrjala/linux.gitrebased_drm_atomic_24oh, hmm.. actually the locking should no longer be in the ioctl fxn, but should be pushed down to the commit. looks like I missed this. I need to dig up some actual test code for atomic ioctl ;-)
It can't be in commit. At the very least it has to be around check+commit, and also you need to hold some locks when you're copying the current config over to your temp storage. That's assuming you store _everything_ in the temp storage and so it doesn't matter if the current state can change between the copy and check+commit.
Quoted 30 lines
Quoted 21 lines
Quoted 21 lines
drivers/gpu/drm/drm_crtc.c +20
-0+ + state = dev->driver->atomic_begin (dev, arg->flags); +if (IS_ERR (state)) { + ret =PTR_ERR (state); + goto unlock; + } + +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;Quoted 8 lines
drivers/gpu/drm/drm_crtc.c void drm_mode_config_cleanup(struct drm_device *dev) · line 4391
Quoted 4 lines
drivers/gpu/drm/drm_crtc.c +4
-0+ } + +if (arg->flags &DRM_MODE_ATOMIC_EVENT ) { +// XXX create atomic event instead.. Some people are apparently more comfortable with a per-crtc event rather than the per-obj events I added. So I think we might want both in the end.
Quoted 3 lines
yeah, sorting out events is a bit 'TODO' at the moment. I do kind of like per-crtc event.. it seems easier to implement and I'm not really sure what finer event granularity buys us.
Mainly it gets you the old fb. If you limit youself to < vrefresh it's not a big deal, but going faster than that and you start to want that information.
Quoted 215 lines
BR,
-RQuoted 211 lines
+ struct
drm_pending_vblank_event*e =Quoted 205 lines
drivers/gpu/drm/drm_crtc.c +107
-0+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); + unlock: +mutex_unlock (&dev->mode_config.mutex); + +return ret; +}drivers/gpu/drm/drm_drv.c +1
-0@@ -166,6 +166,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@@ -1158,6 +1158,12 @@ struct drm_pending_vblank_event {struct drm_event_vblank event; }; +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@@ -1313,6 +1313,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@@ -733,6 +733,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 @@ -774,6 +775,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; +}; +#define DRM_CAP_DUMB_BUFFER 0x1#define DRM_CAP_VBLANK_HIGH_CRTC 0x2#define DRM_CAP_DUMB_PREFERRED_DEPTH 0x3include/uapi/drm/drm_mode.h +16
-1@@ -489,4 +489,20 @@ struct drm_mode_destroy_dumb { uint32_t handle; }; +#define DRM_MODE_ATOMIC_TEST_ONLY (1<<0) +#define DRM_MODE_ATOMIC_EVENT (1<<1) +#define DRM_MODE_ATOMIC_NONBLOCK (1<<2) + +/* 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 --Quoted 1 line
1.8.3.1
--
Ville Syrjälä
Intel OTC
Signature · 2 lines
Ville Syrjälä Intel OTC
Re: [RFCv1 11/12] drm: Atomic modeset ioctl
Quoted 85 lines · Ville Syrjälä
Quoted 78 lines · Rob Clark
Quoted 76 lines · Ville Syrjälä
Quoted 62 lines · Rob Clark
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 ClarkSigned-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/drm_crtc.c | 159 ++++++++++++++++++++++++++++++++++++++++++++ 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 | 16 +++++ 6 files changed, 196 insertions(+)drivers/gpu/drm/drm_crtc.c +17
-0@@ -4338,3 +4338,162 @@ 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; +drivers/gpu/drm/drm_crtc.c void drm_mode_config_cleanup(struct drm_device *dev) · line 4367
Quoted 10 lines
drivers/gpu/drm/drm_crtc.c +10
-0+if (arg->flags & ~(DRM_MODE_ATOMIC_TEST_ONLY | +DRM_MODE_ATOMIC_EVENT |DRM_MODE_ATOMIC_NONBLOCK )) +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_ATOMIC_EVENT )) +return -EINVAL ; + +mutex_lock (&dev->mode_config.mutex);I'm pretty sure I had a version w/ fixed locking...
Quoted 5 lines
Quoted 1 line
git://gitorious.org/vsyrjala/linux.gitrebased_drm_atomic_24oh, hmm.. actually the locking should no longer be in the ioctl fxn, but should be pushed down to the commit. looks like I missed this. I need to dig up some actual test code for atomic ioctl ;-)
Quoted 6 lines
It can't be in commit. At the very least it has to be around check+commit, and also you need to hold some locks when you're copying the current config over to your temp storage. That's assuming you store _everything_ in the temp storage and so it doesn't matter if the current state can change between the copy and check+commit.
hmm.. I start to wish we did atomic first, before the fine grained locking re-work ;-)
Quoted 30 lines
Quoted 30 lines
Quoted 29 lines
Quoted 15 lines
drivers/gpu/drm/drm_crtc.c +14
-0+ + state = dev->driver->atomic_begin (dev, arg->flags); +if (IS_ERR (state)) { + ret =PTR_ERR (state); + goto unlock; + } + +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;drivers/gpu/drm/drm_crtc.c void drm_mode_config_cleanup(struct drm_device *dev) · line 4391
Quoted 10 lines
drivers/gpu/drm/drm_crtc.c +10
-0+ } + + obj =drm_mode_object_find (dev, obj_id,DRM_MODE_OBJECT_ANY ); +if (!obj || !obj->properties) { + ret = -ENOENT ; + goto out; + } + +if (arg->flags &DRM_MODE_ATOMIC_EVENT ) { +// XXX create atomic event instead.. Some people are apparently more comfortable with a per-crtc event rather than the per-obj events I added. So I think we might want both in the end.
Quoted 8 lines
Quoted 3 lines
yeah, sorting out events is a bit 'TODO' at the moment. I do kind of like per-crtc event.. it seems easier to implement and I'm not really sure what finer event granularity buys us.
Mainly it gets you the old fb. If you limit youself to < vrefresh it's not a big deal, but going faster than that and you start to want that information.
oh, right.. well I guess it wouldn't be too hard to add the current primary plane fb_id to the existing event, which might be sufficient. At any rate, I don't mind adding new event flags to atomic ioctl once we get atomic in place.
BR,
-R
Quoted 219 lines
Quoted 215 lines
BR,
-RQuoted 211 lines
+ struct
drm_pending_vblank_event*e =Quoted 205 lines
drivers/gpu/drm/drm_crtc.c +107
-0+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); + unlock: +mutex_unlock (&dev->mode_config.mutex); + +return ret; +}drivers/gpu/drm/drm_drv.c +1
-0@@ -166,6 +166,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@@ -1158,6 +1158,12 @@ struct drm_pending_vblank_event {struct drm_event_vblank event; }; +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@@ -1313,6 +1313,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@@ -733,6 +733,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 @@ -774,6 +775,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; +}; +#define DRM_CAP_DUMB_BUFFER 0x1#define DRM_CAP_VBLANK_HIGH_CRTC 0x2#define DRM_CAP_DUMB_PREFERRED_DEPTH 0x3include/uapi/drm/drm_mode.h +16
-1@@ -489,4 +489,20 @@ struct drm_mode_destroy_dumb { uint32_t handle; }; +#define DRM_MODE_ATOMIC_TEST_ONLY (1<<0) +#define DRM_MODE_ATOMIC_EVENT (1<<1) +#define DRM_MODE_ATOMIC_NONBLOCK (1<<2) + +/* 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 --Quoted 1 line
1.8.3.1
--
Ville Syrjälä
Intel OTC--
Ville Syrjälä
Intel OTC
Re: [RFCv1 11/12] drm: Atomic modeset ioctl
Quoted 94 lines · Rob Clark
Quoted 85 lines · Ville Syrjälä
Quoted 78 lines · Rob Clark
Quoted 76 lines · Ville Syrjälä
Quoted 62 lines · Rob Clark
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 ClarkSigned-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/drm_crtc.c | 159 ++++++++++++++++++++++++++++++++++++++++++++ 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 | 16 +++++ 6 files changed, 196 insertions(+)drivers/gpu/drm/drm_crtc.c +17
-0@@ -4338,3 +4338,162 @@ 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; +drivers/gpu/drm/drm_crtc.c void drm_mode_config_cleanup(struct drm_device *dev) · line 4367
Quoted 10 lines
drivers/gpu/drm/drm_crtc.c +10
-0+if (arg->flags & ~(DRM_MODE_ATOMIC_TEST_ONLY | +DRM_MODE_ATOMIC_EVENT |DRM_MODE_ATOMIC_NONBLOCK )) +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_ATOMIC_EVENT )) +return -EINVAL ; + +mutex_lock (&dev->mode_config.mutex);I'm pretty sure I had a version w/ fixed locking...
Quoted 5 lines
Quoted 1 line
git://gitorious.org/vsyrjala/linux.gitrebased_drm_atomic_24oh, hmm.. actually the locking should no longer be in the ioctl fxn, but should be pushed down to the commit. looks like I missed this. I need to dig up some actual test code for atomic ioctl ;-)
Quoted 6 lines
It can't be in commit. At the very least it has to be around check+commit, and also you need to hold some locks when you're copying the current config over to your temp storage. That's assuming you store _everything_ in the temp storage and so it doesn't matter if the current state can change between the copy and check+commit.
Quoted 2 lines
hmm.. I start to wish we did atomic first, before the fine grained locking re-work ;-)
I don't see it mattering for this particular problem if we just grab the big lock anyway.
But as I already stated, I would prefer to solve the plane locking before doing atomic. Whether we have per-plane locks or not can actually matter for this code, especially when dealing with planes that can move between crtcs.
And we still have locking issues to solve in the .check+commit steps when we have to deal with shared resources across the entire device. We can't simply use some small local lock in the .check step since something relevant might have changed by the time we reach .commit. I guess we could re-check such things at the very start of commit, before we've clobbered any state, and then update the global state to match if everything looks good, before we again drop the local lock.
Quoted 40 lines
Quoted 31 lines
Quoted 31 lines
Quoted 30 lines
Quoted 16 lines
drivers/gpu/drm/drm_crtc.c +14
-0+ + state = dev->driver->atomic_begin (dev, arg->flags); +if (IS_ERR (state)) { + ret =PTR_ERR (state); + goto unlock; + } + +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;drivers/gpu/drm/drm_crtc.c void drm_mode_config_cleanup(struct drm_device *dev) · line 4391
Quoted 10 lines
drivers/gpu/drm/drm_crtc.c +10
-0+ } + + obj =drm_mode_object_find (dev, obj_id,DRM_MODE_OBJECT_ANY ); +if (!obj || !obj->properties) { + ret = -ENOENT ; + goto out; + } + +if (arg->flags &DRM_MODE_ATOMIC_EVENT ) { +// XXX create atomic event instead.. Some people are apparently more comfortable with a per-crtc event rather than the per-obj events I added. So I think we might want both in the end.
Quoted 8 lines
Quoted 3 lines
yeah, sorting out events is a bit 'TODO' at the moment. I do kind of like per-crtc event.. it seems easier to implement and I'm not really sure what finer event granularity buys us.
Mainly it gets you the old fb. If you limit youself to < vrefresh it's not a big deal, but going faster than that and you start to want that information.
Quoted 5 lines
oh, right.. well I guess it wouldn't be too hard to add the current primary plane
fb_idto the existing event, which might be sufficient.At any rate, I don't mind adding new event flags to atomic ioctl once we get atomic in place.
Yeah adding new events isn't that hard. We just need to make sure things make sense. The code you posted doesn't :P
You add the event to every object, even though you only wanted one event per crtc. The same object could also be listed multiple times in the object list, so the code would even add multiple events for the same object.
Quoted 223 lines
BR,
-RQuoted 219 lines
Quoted 215 lines
BR,
-RQuoted 211 lines
+ struct
drm_pending_vblank_event*e =Quoted 205 lines
drivers/gpu/drm/drm_crtc.c +107
-0+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); + unlock: +mutex_unlock (&dev->mode_config.mutex); + +return ret; +}drivers/gpu/drm/drm_drv.c +1
-0@@ -166,6 +166,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@@ -1158,6 +1158,12 @@ struct drm_pending_vblank_event {struct drm_event_vblank event; }; +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@@ -1313,6 +1313,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@@ -733,6 +733,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 @@ -774,6 +775,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; +}; +#define DRM_CAP_DUMB_BUFFER 0x1#define DRM_CAP_VBLANK_HIGH_CRTC 0x2#define DRM_CAP_DUMB_PREFERRED_DEPTH 0x3include/uapi/drm/drm_mode.h +16
-1@@ -489,4 +489,20 @@ struct drm_mode_destroy_dumb { uint32_t handle; }; +#define DRM_MODE_ATOMIC_TEST_ONLY (1<<0) +#define DRM_MODE_ATOMIC_EVENT (1<<1) +#define DRM_MODE_ATOMIC_NONBLOCK (1<<2) + +/* 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 --Quoted 1 line
1.8.3.1
--
Ville Syrjälä
Intel OTC--
Ville Syrjälä
Intel OTC
Signature · 2 lines
Ville Syrjälä Intel OTC
Re: [RFCv1 11/12] drm: Atomic modeset ioctl
Quoted 98 lines · Ville Syrjälä
Quoted 94 lines · Rob Clark
Quoted 85 lines · Ville Syrjälä
Quoted 78 lines · Rob Clark
Quoted 76 lines · Ville Syrjälä
Quoted 62 lines · Rob Clark
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 ClarkSigned-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/drm_crtc.c | 159 ++++++++++++++++++++++++++++++++++++++++++++ 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 | 16 +++++ 6 files changed, 196 insertions(+)drivers/gpu/drm/drm_crtc.c +17
-0@@ -4338,3 +4338,162 @@ 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; +drivers/gpu/drm/drm_crtc.c void drm_mode_config_cleanup(struct drm_device *dev) · line 4367
Quoted 10 lines
drivers/gpu/drm/drm_crtc.c +10
-0+if (arg->flags & ~(DRM_MODE_ATOMIC_TEST_ONLY | +DRM_MODE_ATOMIC_EVENT |DRM_MODE_ATOMIC_NONBLOCK )) +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_ATOMIC_EVENT )) +return -EINVAL ; + +mutex_lock (&dev->mode_config.mutex);I'm pretty sure I had a version w/ fixed locking...
Quoted 5 lines
Quoted 1 line
git://gitorious.org/vsyrjala/linux.gitrebased_drm_atomic_24oh, hmm.. actually the locking should no longer be in the ioctl fxn, but should be pushed down to the commit. looks like I missed this. I need to dig up some actual test code for atomic ioctl ;-)
Quoted 6 lines
It can't be in commit. At the very least it has to be around check+commit, and also you need to hold some locks when you're copying the current config over to your temp storage. That's assuming you store _everything_ in the temp storage and so it doesn't matter if the current state can change between the copy and check+commit.
Quoted 2 lines
hmm.. I start to wish we did atomic first, before the fine grained locking re-work ;-)
Quoted 7 lines
I don't see it mattering for this particular problem if we just grab the big lock anyway.
But as I already stated, I would prefer to solve the plane locking before doing atomic. Whether we have per-plane locks or not can actually matter for this code, especially when dealing with planes that can move between crtcs.
right, and I think the only sane way to deal w/ per-plane locking is ww_mutex.. but then at least for crtc move case we can just grab both old and new crtc lock
Quoted 8 lines
And we still have locking issues to solve in the .check+commit steps when we have to deal with shared resources across the entire device. We can't simply use some small local lock in the .check step since something relevant might have changed by the time we reach .commit. I guess we could re-check such things at the very start of commit, before we've clobbered any state, and then update the global state to match if everything looks good, before we again drop the local lock.
I suppose an easy thing would be per-dev atomic to generate sequence #'s for state updates.. then it would be pretty easy to check if there has been a state update since atomic_begin()..
Quoted 46 lines
Quoted 40 lines
Quoted 31 lines
Quoted 31 lines
Quoted 30 lines
Quoted 16 lines
drivers/gpu/drm/drm_crtc.c +14
-0+ + state = dev->driver->atomic_begin (dev, arg->flags); +if (IS_ERR (state)) { + ret =PTR_ERR (state); + goto unlock; + } + +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;drivers/gpu/drm/drm_crtc.c void drm_mode_config_cleanup(struct drm_device *dev) · line 4391
Quoted 10 lines
drivers/gpu/drm/drm_crtc.c +10
-0+ } + + obj =drm_mode_object_find (dev, obj_id,DRM_MODE_OBJECT_ANY ); +if (!obj || !obj->properties) { + ret = -ENOENT ; + goto out; + } + +if (arg->flags &DRM_MODE_ATOMIC_EVENT ) { +// XXX create atomic event instead.. Some people are apparently more comfortable with a per-crtc event rather than the per-obj events I added. So I think we might want both in the end.
Quoted 8 lines
Quoted 3 lines
yeah, sorting out events is a bit 'TODO' at the moment. I do kind of like per-crtc event.. it seems easier to implement and I'm not really sure what finer event granularity buys us.
Mainly it gets you the old fb. If you limit youself to < vrefresh it's not a big deal, but going faster than that and you start to want that information.
Quoted 5 lines
oh, right.. well I guess it wouldn't be too hard to add the current primary plane
fb_idto the existing event, which might be sufficient.At any rate, I don't mind adding new event flags to atomic ioctl once we get atomic in place.
Quoted 7 lines
Yeah adding new events isn't that hard. We just need to make sure things make sense. The code you posted doesn't :P
You add the event to every object, even though you only wanted one event per crtc. The same object could also be listed multiple times in the object list, so the code would even add multiple events for the same object.
yeah, current atomic patch is almost an afterthought in this series. I still need to get planes working on msm and find some test code (I guess you have some somewhere?).. so other than just rebasing it enough to compile, I didn't really spend any time on it yet. Right now I was more interested in getting folks to have a look at the atomic funcs and helpers.
BR,
-R
Quoted 227 lines
Quoted 223 lines
BR,
-RQuoted 219 lines
Quoted 215 lines
BR,
-RQuoted 211 lines
+ struct
drm_pending_vblank_event*e =Quoted 205 lines
drivers/gpu/drm/drm_crtc.c +107
-0+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); + unlock: +mutex_unlock (&dev->mode_config.mutex); + +return ret; +}drivers/gpu/drm/drm_drv.c +1
-0@@ -166,6 +166,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@@ -1158,6 +1158,12 @@ struct drm_pending_vblank_event {struct drm_event_vblank event; }; +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@@ -1313,6 +1313,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@@ -733,6 +733,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 @@ -774,6 +775,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; +}; +#define DRM_CAP_DUMB_BUFFER 0x1#define DRM_CAP_VBLANK_HIGH_CRTC 0x2#define DRM_CAP_DUMB_PREFERRED_DEPTH 0x3include/uapi/drm/drm_mode.h +16
-1@@ -489,4 +489,20 @@ struct drm_mode_destroy_dumb { uint32_t handle; }; +#define DRM_MODE_ATOMIC_TEST_ONLY (1<<0) +#define DRM_MODE_ATOMIC_EVENT (1<<1) +#define DRM_MODE_ATOMIC_NONBLOCK (1<<2) + +/* 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 --Quoted 1 line
1.8.3.1
--
Ville Syrjälä
Intel OTC--
Ville Syrjälä
Intel OTC--
Ville Syrjälä
Intel OTC
Re: [RFCv1 11/12] drm: Atomic modeset ioctl
Quoted 6 lines · Rob Clark
yeah, current atomic patch is almost an afterthought in this series. I still need to get planes working on msm and find some test code (I guess you have some somewhere?).. so other than just rebasing it enough to compile, I didn't really spend any time on it yet. Right now I was more interested in getting folks to have a look at the atomic funcs and helpers.
One in-kernel test user we have is the fbdev restore code - it needs to get rid of all planes, cursors and set up its new config on all crtcs. I think this would be a fairly nice (albeit really basic testcase): You can set up a bunch of planes/cursors, then vt-switch to the fbcon - this way we can exercise the atomic stuff in drivers a bit better even without needing to add any ioctl.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Re: [RFCv1 11/12] drm: Atomic modeset ioctl
Quoted 8 lines · Daniel Vetter
Quoted 6 lines · Rob Clark
yeah, current atomic patch is almost an afterthought in this series. I still need to get planes working on msm and find some test code (I guess you have some somewhere?).. so other than just rebasing it enough to compile, I didn't really spend any time on it yet. Right now I was more interested in getting folks to have a look at the atomic funcs and helpers.
Quoted 6 lines
One in-kernel test user we have is the fbdev restore code - it needs to get rid of all planes, cursors and set up its new config on all crtcs. I think this would be a fairly nice (albeit really basic testcase): You can set up a bunch of planes/cursors, then vt-switch to the fbcon - this way we can exercise the atomic stuff in drivers a bit better even without needing to add any ioctl.
right.. well, we do have code that disables the planes on fbdev restore, and fbdev restore (and initial modeset) still hit crtc->set_config directly. But once those are converted it would be cleaner / more elegant to do fbdev restore w/ atomic.
BR,
-R
Quoted 5 lines
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
Re: [RFCv1 11/12] drm: Atomic modeset ioctl
In reply to Ville SyrjäläQuoted 4 lines · Ville Syrjälä
Quoted 3 lines · Rob Clark
Quoted 1 line · Ville Syrjälä
On Sat, Oct 05, 2013 at 08:45:49PM -0400, Rob Clark wrote:
...
Quoted 29 lines
Quoted 29 lines
Quoted 28 lines
Quoted 14 lines
drivers/gpu/drm/drm_crtc.c +14
-0+ + state = dev->driver->atomic_begin (dev, arg->flags); +if (IS_ERR (state)) { + ret =PTR_ERR (state); + goto unlock; + } + +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;drivers/gpu/drm/drm_crtc.c void drm_mode_config_cleanup(struct drm_device *dev) · line 4391
Quoted 10 lines
drivers/gpu/drm/drm_crtc.c +10
-0+ } + + obj =drm_mode_object_find (dev, obj_id,DRM_MODE_OBJECT_ANY ); +if (!obj || !obj->properties) { + ret = -ENOENT ; + goto out; + } + +if (arg->flags &DRM_MODE_ATOMIC_EVENT ) { +// XXX create atomic event instead.. Some people are apparently more comfortable with a per-crtc event rather than the per-obj events I added. So I think we might want both in the end.
Quoted 7 lines
Quoted 3 lines
yeah, sorting out events is a bit 'TODO' at the moment. I do kind of like per-crtc event.. it seems easier to implement and I'm not really sure what finer event granularity buys us.
Mainly it gets you the old fb. If you limit youself to < vrefresh it's not a big deal, but going faster than that and you start to want that information.
Are there cases where userspace would really need this fb information returned? I'm having trouble envisioning a case where userspace wouldn't have its own bookkeeping to know which fb's are currently displayed on each plane and which fb's are pending.
If you're running a compositor like Weston, the redraw of a display is generally tied to completion events, so there's no real desire/potential for > vrefresh submission in most cases. In this model, having a single per-crtc "I'm done updating everything" event is easier to work with than an event per object where you have to do some additional counting to make sure you consume the right number of events before kicking off the repaint.
Quoted 6 lines
Quoted 6 lines
BR,
-RQuoted 1 line
+ struct
drm_pending_vblank_event*e =
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
drivers/gpu/drm/drm_crtc.c void drm_mode_config_cleanup(struct drm_device *dev) · line 4403
Quoted 11 lines
drivers/gpu/drm/drm_crtc.c +11
-0+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; + } + }
Did you mean to use the drm_pending_atomic_event/drm_event_atomic you declare farther down? It doesn't look like anything is actually using them yet in this patch series.
Quoted 207 lines
Quoted 199 lines
Quoted 199 lines
Quoted 194 lines
drivers/gpu/drm/drm_crtc.c +96
-0+ +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); + unlock: +mutex_unlock (&dev->mode_config.mutex); + +return ret; +}drivers/gpu/drm/drm_drv.c +1
-0@@ -166,6 +166,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@@ -1158,6 +1158,12 @@ struct drm_pending_vblank_event {struct drm_event_vblank event; }; +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@@ -1313,6 +1313,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@@ -733,6 +733,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 @@ -774,6 +775,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; +}; +#define DRM_CAP_DUMB_BUFFER 0x1#define DRM_CAP_VBLANK_HIGH_CRTC 0x2#define DRM_CAP_DUMB_PREFERRED_DEPTH 0x3include/uapi/drm/drm_mode.h +16
-1@@ -489,4 +489,20 @@ struct drm_mode_destroy_dumb { uint32_t handle; }; +#define DRM_MODE_ATOMIC_TEST_ONLY (1<<0) +#define DRM_MODE_ATOMIC_EVENT (1<<1) +#define DRM_MODE_ATOMIC_NONBLOCK (1<<2) + +/* 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 --Quoted 1 line
1.8.3.1
--
Ville Syrjälä
Intel OTCSignature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 4 lines
Matt Roper Intel Corporation Embedded Media & Graphics Driver Group (916) 356-2795
Re: [RFCv1 11/12] drm: Atomic modeset ioctl
Quoted 39 lines · Matt Roper
Quoted 4 lines · Ville Syrjälä
Quoted 3 lines · Rob Clark
Quoted 1 line · Ville Syrjälä
On Sat, Oct 05, 2013 at 08:45:49PM -0400, Rob Clark wrote:
...
Quoted 33 lines
Quoted 32 lines
Quoted 20 lines
Quoted 20 lines
drivers/gpu/drm/drm_crtc.c +20
-0+ + state = dev->driver->atomic_begin (dev, arg->flags); +if (IS_ERR (state)) { + ret =PTR_ERR (state); + goto unlock; + } + +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;Quoted 8 lines
drivers/gpu/drm/drm_crtc.c void drm_mode_config_cleanup(struct drm_device *dev) · line 4391
Quoted 4 lines
drivers/gpu/drm/drm_crtc.c +4
-0+ } + +if (arg->flags &DRM_MODE_ATOMIC_EVENT ) { +// XXX create atomic event instead.. Some people are apparently more comfortable with a per-crtc event rather than the per-obj events I added. So I think we might want both in the end.
yeah, sorting out events is a bit 'TODO' at the moment. I do kind of like per-crtc event.. it seems easier to implement and I'm not really sure what finer event granularity buys us.
Quoted 8 lines
Quoted 3 lines
Mainly it gets you the old fb. If you limit youself to < vrefresh it's not a big deal, but going faster than that and you start to want that information.
Are there cases where userspace would really need this fb information returned? I'm having trouble envisioning a case where userspace wouldn't have its own bookkeeping to know which fb's are currently displayed on each plane and which fb's are pending.
if you let userspace flip faster than vsync, then there is some ambiguity about which buffer is being scanned out after the vblank..
but I think this shouldn't hold up atomic-modeset.. it should be safe to spiff up the events as a later step.
Quoted 27 lines
If you're running a compositor like Weston, the redraw of a display is generally tied to completion events, so there's no real desire/potential for > vrefresh submission in most cases. In this model, having a single per-crtc "I'm done updating everything" event is easier to work with than an event per object where you have to do some additional counting to make sure you consume the right number of events before kicking off the repaint.
Quoted 6 lines
Quoted 6 lines
BR,
-RQuoted 1 line
+ struct
drm_pending_vblank_event*e =Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
drivers/gpu/drm/drm_crtc.c void drm_mode_config_cleanup(struct drm_device *dev) · line 4403
Quoted 11 lines
drivers/gpu/drm/drm_crtc.c +11
-0+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; + } + }
Quoted 3 lines
Did you mean to use the drm_pending_atomic_event/drm_event_atomic you declare farther down? It doesn't look like anything is actually using them yet in this patch series.
right.. the event stuff is a bit messy at the moment as result of merging of two different RFC patchsets about how to do atomic.
I think what I will end up doing is drop the atomic event, and fix up the logic to only create/set vblank events for the crtc(s).
BR,
-R
Quoted 213 lines
Quoted 200 lines
Quoted 191 lines
Quoted 191 lines
Quoted 191 lines
drivers/gpu/drm/drm_crtc.c +96
-0+ +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); + unlock: +mutex_unlock (&dev->mode_config.mutex); + +return ret; +}drivers/gpu/drm/drm_drv.c +1
-0@@ -166,6 +166,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@@ -1158,6 +1158,12 @@ struct drm_pending_vblank_event {struct drm_event_vblank event; }; +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@@ -1313,6 +1313,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@@ -733,6 +733,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 @@ -774,6 +775,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; +}; +#define DRM_CAP_DUMB_BUFFER 0x1#define DRM_CAP_VBLANK_HIGH_CRTC 0x2#define DRM_CAP_DUMB_PREFERRED_DEPTH 0x3include/uapi/drm/drm_mode.h +15
-0@@ -489,4 +489,20 @@ struct drm_mode_destroy_dumb {uint32_t handle; }; +#define DRM_MODE_ATOMIC_TEST_ONLY (1<<0) +#define DRM_MODE_ATOMIC_EVENT (1<<1) +#define DRM_MODE_ATOMIC_NONBLOCK (1<<2) + +/* 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; +};Quoted 8 lines
Quoted 8 lines
Quoted 4 lines
include/uapi/drm/drm_mode.h +1
-1+#endif --1.8.3.1
--
Ville Syrjälä
Intel OTCQuoted 7 lines
--
Ville Syrjälä
Intel OTC
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel--
Matt Roper
Intel Corporation
Embedded Media & Graphics Driver Group
(916) 356-2795
RFC 12/12 ARM: add get_user() support for 8 byte types
In reply to Rob ClarkA new atomic modeset/pageflip ioctl being developed in DRM requires get_user() to work for 64bit types (in addition to just put_user()).
v1: original
v2: pass correct size to check_uaccess, and better handling of narrowing
double word read with __get_user_xb() (Russell King's suggestion)
--- arch/arm/include/asm/uaccess.h | 18 +++++++++++++++++- arch/arm/lib/getuser.S | 17 ++++++++++++++++- 2 files changed, 33 insertions(+), 2 deletions(-)
arch/arm/include/asm/uaccess.h +17 -1
@@ -107,6 +107,7 @@ static inline void set_fs(mm_segment_t fs)extern int __get_user_1 (void *);extern int __get_user_2 (void *);extern int __get_user_4 (void *); +extern int __get_user_8 (void *);#define __GUP_CLOBBER_1 "lr", "cc"#ifdef CONFIG_CPU_USE_DOMAINS
@@ -115,6 +116,7 @@ extern int __get_user_4(void *);#define __GUP_CLOBBER_2 "lr", "cc"#endif #define __GUP_CLOBBER_4 "lr", "cc" +#define __GUP_CLOBBER_8 "lr", "cc"#define __get_user_x (__r2,__p,__e,__l,__s) \ __asm__ __volatile__ ( \
@@ -125,11 +127,19 @@ extern int __get_user_4(void *); : "0" (__p), "r" (__l) \ : __GUP_CLOBBER_##__s) +/* narrowing a double-word get into a single 32bit word register: */ +#ifdef BIG_ENDIAN +#define __get_user_xb (__r2,__p,__e,__l,__s) \ + __get_user_x(__r2,(uintptr_t)__p + 4,__e,__l,__s) +#else +#define __get_user_xb __get_user_x +#endif +#define __get_user_check (x,p) \ ({ \ unsigned long __limit = current_thread_info()->addr_limit - 1; \ register const typeof(*(p)) __user *__p asm("r0") = (p);\ - register unsigned long __r2 asm("r2"); \ + register typeof(x) __r2 asm("r2"); \ register unsigned long __l asm("r1") = __limit; \ register int __e asm("r0"); \ switch (sizeof(*(__p))) { \
@@ -142,6 +152,12 @@ extern int __get_user_4(void *);case 4 : \__get_user_x (__r2, __p, __e, __l,4 ); \break ; \ +case 8 : \ +if (sizeof ((x)) <8 ) \ +__get_user_xb (__r2, __p, __e, __l,4 ); \ +else \ +__get_user_x (__r2, __p, __e, __l,8 ); \ +break ; \default : __e =__get_user_bad ();break ; \ } \ x = (typeof (*(p ))) __r2; \
arch/arm/lib/getuser.S +16 -1
@@ -18,7 +18,7 @@ * Inputs: r0 contains the address * r1 contains the address limit, which must be preserved * Outputs: r0 is the error code - * r2 contains the zero-extended value + * r2, r3 contains the zero-extended value * lr corrupted * * No other registers must be altered. (see <asm/uaccess.h>
@@ -66,6 +66,19 @@ ENTRY(__get_user_4) mov pc, lr ENDPROC(__get_user_4) +ENTRY(__get_user_8) + check_uaccess r0, 8, r1, r2, __get_user_bad +#ifdef CONFIG_THUMB2_KERNEL +5: TUSER(ldr) r2, [r0] +6: TUSER(ldr) r3, [r0, #4] +#else +5: TUSER(ldr) r2, [r0], #4 +6: TUSER(ldr) r3, [r0] +#endif + mov r0, #0 + mov pc, lr +ENDPROC(__get_user_8) + __get_user_bad: mov r2, #0 mov r0, #-EFAULT
@@ -77,4 +90,6 @@ ENDPROC(__get_user_bad) .long 2b, __get_user_bad .long 3b, __get_user_bad .long 4b, __get_user_bad + .long 5b, __get_user_bad + .long 6b, __get_user_bad .popsection
Signature · 1 line
1.8.3.1
Re: [RFCv1 12/12] ARM: add get_user() support for 8 byte types
Quoted 6 lines · Rob Clark
A new atomic modeset/pageflip ioctl being developed in DRM requires
get_user()to work for 64bit types (in addition to justput_user()).v1: original
v2: pass correct size tocheck_uaccess, and better handling of narrowing
double word read with__get_user_xb()(Russell King's suggestion)
I thought we had decided not to support this for 32-bit because x86_32 had problems here as well:
#ifdef CONFIG_X86_32
#define __get_user_asm_u64(x, ptr, retval, errret) (x) = __get_user_bad()
#define __get_user_asm_ex_u64(x, ptr) (x) = __get_user_bad()
#else
#define __get_user_asm_u64(x, ptr, retval, errret) \
__get_user_asm(x, ptr, retval, "q", "", "=r", errret)
#define __get_user_asm_ex_u64(x, ptr) \
__get_user_asm_ex(x, ptr, "q", "", "=r")#endif
Re: [RFCv1 12/12] ARM: add get_user() support for 8 byte types
Quoted 10 lines · Russell King - ARM Linux
Quoted 6 lines · Rob Clark
A new atomic modeset/pageflip ioctl being developed in DRM requires
get_user()to work for 64bit types (in addition to justput_user()).v1: original
v2: pass correct size tocheck_uaccess, and better handling of narrowing
double word read with__get_user_xb()(Russell King's suggestion)I thought we had decided not to support this for 32-bit because
x86_32had problems here as well:
I don't remember.. actually I didn't even realize it wasn't merged until I tried to build with the atomic modeset ioctl.
Ville did have a patch to add it for x86_32, and that patch appears to be merged (96477b4c), so I just assume it wasn't removed since then.
BR,
-R
Quoted 10 lines
#ifdef
CONFIG_X86_32
#define__get_user_asm_u64(x, ptr, retval, errret)(x) =__get_user_bad()
#define__get_user_asm_ex_u64(x, ptr)(x) =__get_user_bad()
#else#define __get_user_asm_u64(x, ptr, retval, errret) \ __get_user_asm(x, ptr, retval, "q", "", "=r", errret) #define __get_user_asm_ex_u64(x, ptr) \ __get_user_asm_ex(x, ptr, "q", "", "=r")#endif
Re: [RFCv1 12/12] ARM: add get_user() support for 8 byte types
Quoted 10 lines · Rob Clark
Quoted 8 lines · Russell King - ARM Linux
Quoted 6 lines · Rob Clark
A new atomic modeset/pageflip ioctl being developed in DRM requires
get_user()to work for 64bit types (in addition to justput_user()).v1: original
v2: pass correct size tocheck_uaccess, and better handling of narrowing
double word read with__get_user_xb()(Russell King's suggestion)
Quoted 8 lines
Quoted 2 lines
I thought we had decided not to support this for 32-bit because
x86_32had problems here as well:I don't remember.. actually I didn't even realize it wasn't merged until I tried to build with the atomic modeset ioctl.
Ville did have a patch to add it for
x86_32, and that patch appears to be merged (96477b4c), so I just assume it wasn't removed since then.
Okay, the code I quoted is for __get_user() not get_user().
This is roughly what we (hpa/myself) came up with for ARM which did get things working, but itw as x86 which made us decide not to persue this. I've added the __get_user_8 implementation to this. The __inttype() thing was hpa's idea.
arch/arm/include/asm/uaccess.h | 17 +++++++++++++---- arch/arm/lib/getuser.S | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 45 insertions(+), 5 deletions(-)
arch/arm/include/asm/uaccess.h +13 -4
@@ -93,6 +93,9 @@ static inline void set_fs(mm_segment_t fs) : "cc"); \ flag; }) +#define __inttype (x) \ + __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL)) +/* * Single-value transfer routines. They automatically use the right * size if we just have the right pointer type. Note that the functions
@@ -107,14 +110,16 @@ static inline void set_fs(mm_segment_t fs)extern int __get_user_1 (void *);extern int __get_user_2 (void *);extern int __get_user_4 (void *); +extern int __get_user_8 (void *); -#define __GUP_CLOBBER_1 "lr", "cc" +#define __GUP_CLOBBER_1 "lr", "cc"#ifdef CONFIG_CPU_USE_DOMAINS -#define __GUP_CLOBBER_2 "ip", "lr", "cc" +#define __GUP_CLOBBER_2 "ip", "lr", "cc"#else #define __GUP_CLOBBER_2 "lr", "cc"#endif -#define __GUP_CLOBBER_4 "lr", "cc" +#define __GUP_CLOBBER_4 "lr", "cc" +#define __GUP_CLOBBER_8 "lr", "cc"#define __get_user_x (__r2,__p,__e,__l,__s) \ __asm__ __volatile__ ( \
@@ -129,7 +134,7 @@ extern int __get_user_4(void *); ({ \ unsigned long __limit = current_thread_info()->addr_limit - 1; \ register const typeof(*(p)) __user *__p asm("r0") = (p);\ - register unsigned long __r2 asm("r2"); \ + register __inttype(*p) __r2 asm("r2"); \ register unsigned long __l asm("r1") = __limit; \ register int __e asm("r0"); \ switch (sizeof(*(__p))) { \
@@ -142,6 +147,9 @@ extern int __get_user_4(void *);case 4 : \__get_user_x (__r2, __p, __e, __l,4 ); \break ; \ +case 8 : \ +__get_user_x (__r2, __p, __e, __l,8 ); \ +break ; \default : __e =__get_user_bad ();break ; \ } \ x = (typeof (*(p ))) __r2; \
@@ -150,6 +158,7 @@ extern int __get_user_4(void *);#define get_user (x,p) \ ({ \ + __chk_user_ptr(ptr); \ might_fault(); \ __get_user_check(x,p); \ })
arch/arm/lib/getuser.S +32 -1
@@ -18,7 +18,7 @@ * Inputs: r0 contains the address * r1 contains the address limit, which must be preserved * Outputs: r0 is the error code - * r2 contains the zero-extended value + * r2/r3 contains the zero-extended value * lr corrupted * * No other registers must be altered. (see <asm/uaccess.h>
@@ -32,6 +32,14 @@ #include <asm/errno.h> #include <asm/domain.h> +#ifdef __ARMEB__ +#define rlo8 r3 +#define rhi8 r2 +#else +#define rlo8 r2 +#define rhi8 r3 +#endif + ENTRY(__get_user_1) check_uaccess r0, 1, r1, r2, __get_user_bad 1: TUSER(ldrb) r2, [r0]
@@ -66,15 +74,38 @@ ENTRY(__get_user_4) mov pc, lr ENDPROC(__get_user_4) +ENTRY(__get_user_8) + check_uaccess r0, 4, r1, r2, __get_user_bad8 +#ifdef CONFIG_CPU_USE_DOMAINS +#define GU8_FIXUPS 5b, 6b +5: ldrt rlo8, [r0], #4 +6: ldrt rhi8, [r0], #0 +#elif __LINUX_ARM_ARCH__ >= 6 +#define GU8_FIXUPS 5b +5: ldrd r2, [r0] +#else +#define GU8_FIXUPS 5b, 6b +5: ldr rlo8, [r0, #0] +6: ldr rhi8, [r0, #4] +#endif + mov r0, #0 + mov pc, lr + +__get_user_bad8: + mov r3, #0 __get_user_bad: mov r2, #0 mov r0, #-EFAULT mov pc, lr ENDPROC(__get_user_bad) +ENDPROC(__get_user_bad8) .pushsection __ex_table, "a" .long 1b, __get_user_bad .long 2b, __get_user_bad .long 3b, __get_user_bad .long 4b, __get_user_bad + .irp param, GU8_FIXUPS + .long \param, __get_user_bad8 + .endr .popsection