mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-20 09:31:09 +00:00
351f950db4
If the CRTC driver ever needs to access the full DRM state, it can't do so at atomic_enable / atomic_disable time since drm_atomic_helper_swap_state will have cleared the pointer from the struct drm_crtc_state to the struct drm_atomic_state before calling those hooks. In order to allow that, let's pass the full DRM state to atomic_enable and atomic_disable. The conversion was done using the coccinelle script below, built tested on all the drivers and actually tested on vc4. virtual report @@ struct drm_crtc_helper_funcs *FUNCS; identifier dev, state; identifier crtc, crtc_state; @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *state) { <... - FUNCS->atomic_disable(crtc, crtc_state); + FUNCS->atomic_disable(crtc, state); ...> } @@ struct drm_crtc_helper_funcs *FUNCS; identifier dev, state; identifier crtc, crtc_state; @@ drm_atomic_helper_commit_modeset_enables(struct drm_device *dev, struct drm_atomic_state *state) { <... - FUNCS->atomic_enable(crtc, crtc_state); + FUNCS->atomic_enable(crtc, state); ...> } @@ identifier crtc, old_state; @@ struct drm_crtc_helper_funcs { ... - void (*atomic_enable)(struct drm_crtc *crtc, struct drm_crtc_state *old_state); + void (*atomic_enable)(struct drm_crtc *crtc, struct drm_atomic_state *state); ... - void (*atomic_disable)(struct drm_crtc *crtc, struct drm_crtc_state *old_state); + void (*atomic_disable)(struct drm_crtc *crtc, struct drm_atomic_state *state); ... } @ crtc_atomic_func @ identifier helpers; identifier func; @@ ( static struct drm_crtc_helper_funcs helpers = { ..., .atomic_enable = func, ..., }; | static struct drm_crtc_helper_funcs helpers = { ..., .atomic_disable = func, ..., }; ) @ ignores_old_state @ identifier crtc_atomic_func.func; identifier crtc, old_state; @@ void func(struct drm_crtc *crtc, struct drm_crtc_state *old_state) { ... when != old_state } @ adds_old_state depends on crtc_atomic_func && !ignores_old_state @ identifier crtc_atomic_func.func; identifier crtc, old_state; @@ void func(struct drm_crtc *crtc, struct drm_crtc_state *old_state) { + struct drm_crtc_state *old_state = drm_atomic_get_old_crtc_state(state, crtc); ... } @ depends on crtc_atomic_func @ identifier crtc_atomic_func.func; expression E; type T; @@ void func(...) { ... - T state = E; + T crtc_state = E; <+... - state + crtc_state ...+> } @ depends on crtc_atomic_func @ identifier crtc_atomic_func.func; type T; @@ void func(...) { ... - T state; + T crtc_state; <+... - state + crtc_state ...+> } @ depends on crtc_atomic_func @ identifier crtc_atomic_func.func; identifier old_state; identifier crtc; @@ void func(struct drm_crtc *crtc, - struct drm_crtc_state *old_state + struct drm_atomic_state *state ) { ... } @ include depends on adds_old_state @ @@ #include <drm/drm_atomic.h> @ no_include depends on !include && adds_old_state @ @@ + #include <drm/drm_atomic.h> #include <drm/...> Signed-off-by: Maxime Ripard <maxime@cerno.tech> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: https://patchwork.freedesktop.org/patch/msgid/845aa10ef171fc0ea060495efef142a0c13f7870.1602161031.git-series.maxime@cerno.tech |
||
---|---|---|
.. | ||
bridge | ||
i2c | ||
ttm | ||
amd_asic_type.h | ||
drm_agpsupport.h | ||
drm_atomic.h | ||
drm_atomic_helper.h | ||
drm_atomic_state_helper.h | ||
drm_atomic_uapi.h | ||
drm_audio_component.h | ||
drm_auth.h | ||
drm_blend.h | ||
drm_bridge.h | ||
drm_bridge_connector.h | ||
drm_cache.h | ||
drm_client.h | ||
drm_color_mgmt.h | ||
drm_connector.h | ||
drm_crtc.h | ||
drm_crtc_helper.h | ||
drm_damage_helper.h | ||
drm_debugfs.h | ||
drm_debugfs_crc.h | ||
drm_device.h | ||
drm_displayid.h | ||
drm_dp_dual_mode_helper.h | ||
drm_dp_helper.h | ||
drm_dp_mst_helper.h | ||
drm_drv.h | ||
drm_dsc.h | ||
drm_edid.h | ||
drm_encoder.h | ||
drm_encoder_slave.h | ||
drm_fb_cma_helper.h | ||
drm_fb_helper.h | ||
drm_file.h | ||
drm_fixed.h | ||
drm_flip_work.h | ||
drm_format_helper.h | ||
drm_fourcc.h | ||
drm_framebuffer.h | ||
drm_gem.h | ||
drm_gem_cma_helper.h | ||
drm_gem_framebuffer_helper.h | ||
drm_gem_shmem_helper.h | ||
drm_gem_ttm_helper.h | ||
drm_gem_vram_helper.h | ||
drm_hashtab.h | ||
drm_hdcp.h | ||
drm_ioctl.h | ||
drm_irq.h | ||
drm_lease.h | ||
drm_legacy.h | ||
drm_managed.h | ||
drm_mipi_dbi.h | ||
drm_mipi_dsi.h | ||
drm_mm.h | ||
drm_mode_config.h | ||
drm_mode_object.h | ||
drm_modes.h | ||
drm_modeset_helper.h | ||
drm_modeset_helper_vtables.h | ||
drm_modeset_lock.h | ||
drm_of.h | ||
drm_panel.h | ||
drm_pciids.h | ||
drm_plane.h | ||
drm_plane_helper.h | ||
drm_prime.h | ||
drm_print.h | ||
drm_probe_helper.h | ||
drm_property.h | ||
drm_rect.h | ||
drm_scdc_helper.h | ||
drm_self_refresh_helper.h | ||
drm_simple_kms_helper.h | ||
drm_syncobj.h | ||
drm_sysfs.h | ||
drm_util.h | ||
drm_utils.h | ||
drm_vblank.h | ||
drm_vblank_work.h | ||
drm_vma_manager.h | ||
drm_writeback.h | ||
gma_drm.h | ||
gpu_scheduler.h | ||
i915_component.h | ||
i915_drm.h | ||
i915_mei_hdcp_interface.h | ||
i915_pciids.h | ||
intel-gtt.h | ||
intel_lpe_audio.h | ||
spsc_queue.h | ||
task_barrier.h |