github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-27 09:36:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm: Rename struct drm_atomic_state to drm_atomic_commit

Browse Source 
The KMS framework uses two slightly different definitions for the state
concept. For a given object (plane, CRTC, encoder, etc., so
drm_$OBJECT_state), the state is the entire state of that object.
However, at the device level, drm_atomic_state refers to a state update
for a limited number of objects.

Thus, drm_atomic_state isn't the entire device state, but only the full
state of some objects in that device. This has been an endless source of
confusion and thus bugs.

We can rename the drm_atomic_state structure to drm_atomic_commit to
make it less confusing.

This patch was created using:

rg -l drm_atomic_state | \
	xargs sed -i 's/drm_atomic_state/drm_atomic_commit/g; s/drm_atomic_commit_helper/drm_atomic_state_helper/g'
mv drivers/gpu/drm/tests/drm_atomic_state_test.c drivers/gpu/drm/tests/drm_atomic_commit_test.c

Acked-by: Simona Vetter <simona.vetter@ffwll.ch>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Tested-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Maxime Ripard <mripard@kernel.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patch.msgid.link/20260427-drm-drm-atomic-update-v4-1-c0e713bfdf25@kernel.org
This commit is contained in:
Maxime Ripard 2026-04-27 09:02:57 +02:00 committed by Dave Airlie
parent 7fd2df204f
commit 5164f7e7ff
365 changed files with 1752 additions and 1752 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Documentation/gpu/drm-kms.rst
View File

@ -206,11 +206,11 @@ Atomic Mode Setting
style=dashed
label="Free-standing state"
"drm_atomic_state" -> "duplicated drm_plane_state A"
"drm_atomic_state" -> "duplicated drm_plane_state B"
"drm_atomic_state" -> "duplicated drm_crtc_state"
"drm_atomic_state" -> "duplicated drm_connector_state"
"drm_atomic_state" -> "duplicated driver private state"
"drm_atomic_commit" -> "duplicated drm_plane_state A"
"drm_atomic_commit" -> "duplicated drm_plane_state B"
"drm_atomic_commit" -> "duplicated drm_crtc_state"
"drm_atomic_commit" -> "duplicated drm_connector_state"
"drm_atomic_commit" -> "duplicated driver private state"
}
subgraph cluster_current {
@ -230,7 +230,7 @@ Atomic Mode Setting
"driver private object" -> "driver private state"
}
"drm_atomic_state" -> "drm_device" [label="atomic_commit"]
"drm_atomic_commit" -> "drm_device" [label="atomic_commit"]
"duplicated drm_plane_state A" -> "drm_device"[style=invis]
}
@ -265,7 +265,7 @@ Taken all together there's two consequences for the atomic design:
drm_private_state<drm_private_state>`.
- An atomic update is assembled and validated as an entirely free-standing pile
of structures within the :c:type:`drm_atomic_state <drm_atomic_state>`
of structures within the :c:type:`drm_atomic_commit <drm_atomic_commit>`
container. Driver private state structures are also tracked in the same
structure; see the next chapter. Only when a state is committed is it applied
to the driver and modeset objects. This way rolling back an update boils down

8
Documentation/gpu/komeda-kms.rst
View File

@ -367,7 +367,7 @@ So, one KMS-Obj represents a sub-pipeline of komeda resources.
So, for komeda, we treat KMS crtc/plane/connector as users of pipeline and
component, and at any one time a pipeline/component only can be used by one
user. And pipeline/component will be treated as private object of DRM-KMS; the
state will be managed by drm_atomic_state as well.
state will be managed by drm_atomic_commit as well.
How to map plane to Layer(input) pipeline
-----------------------------------------
@ -416,8 +416,8 @@ Add :c:type:`drm_private_obj` to :c:type:`komeda_component`, :c:type:`komeda_pip
...
}
Tracking component_state/pipeline_state by drm_atomic_state
-----------------------------------------------------------
Tracking component_state/pipeline_state by drm_atomic_commit
------------------------------------------------------------
Add :c:type:`drm_private_state` and user to :c:type:`komeda_component_state`,
:c:type:`komeda_pipeline_state`
@ -454,7 +454,7 @@ similar, usually including the following steps:
put the data flow into next stage.
Setup 2: check user_state with component features and capabilities to see
if requirements can be met; if not, return fail.
Setup 3: get component_state from drm_atomic_state, and try set to set
Setup 3: get component_state from drm_atomic_commit, and try set to set
user to component; fail if component has been assigned to another
user already.
Setup 3: configure the component_state, like set its input component,

12
Documentation/gpu/todo.rst
View File

@ -152,24 +152,24 @@ Contact: Simona Vetter, respective driver maintainers
Level: Advanced
Rename drm_atomic_state
Rename drm_atomic_commit
-----------------------
The KMS framework uses two slightly different definitions for the ``state``
concept. For a given object (plane, CRTC, encoder, etc., so
``drm_$OBJECT_state``), the state is the entire state of that object. However,
at the device level, ``drm_atomic_state`` refers to a state update for a
at the device level, ``drm_atomic_commit`` refers to a state update for a
limited number of objects.
The state isn't the entire device state, but only the full state of some
objects in that device. This is confusing to newcomers, and
``drm_atomic_state`` should be renamed to something clearer like
``drm_atomic_commit`` should be renamed to something clearer like
``drm_atomic_commit``.
In addition to renaming the structure itself, it would also imply renaming some
related functions (``drm_atomic_state_alloc``, ``drm_atomic_state_get``,
``drm_atomic_state_put``, ``drm_atomic_state_init``,
``__drm_atomic_state_free``, etc.).
related functions (``drm_atomic_commit_alloc``, ``drm_atomic_commit_get``,
``drm_atomic_commit_put``, ``drm_atomic_commit_init``,
``__drm_atomic_commit_free``, etc.).
Contact: Maxime Ripard <mripard@kernel.org>

12
drivers/gpu/drm/adp/adp_drv.c
View File

@ -129,7 +129,7 @@ struct adp_drv_private {
#define crtc_to_adp(x) container_of(x, struct adp_drv_private, crtc)
static int adp_plane_atomic_check(struct drm_plane *plane,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_plane_state *new_plane_state;
struct drm_crtc_state *crtc_state;
@ -151,7 +151,7 @@ static int adp_plane_atomic_check(struct drm_plane *plane,
}
static void adp_plane_atomic_update(struct drm_plane *plane,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct adp_drv_private *adp;
struct drm_rect src_rect;
@ -193,7 +193,7 @@ static void adp_plane_atomic_update(struct drm_plane *plane,
}
static void adp_plane_atomic_disable(struct drm_plane *plane,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct adp_drv_private *adp = to_adp(plane->dev);
@ -279,7 +279,7 @@ static void adp_crtc_disable_vblank(struct drm_crtc *crtc)
}
static void adp_crtc_atomic_enable(struct drm_crtc *crtc,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct adp_drv_private *adp = crtc_to_adp(crtc);
@ -292,7 +292,7 @@ static void adp_crtc_atomic_enable(struct drm_crtc *crtc,
}
static void adp_crtc_atomic_disable(struct drm_crtc *crtc,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct adp_drv_private *adp = crtc_to_adp(crtc);
struct drm_crtc_state *old_state = drm_atomic_get_old_crtc_state(state, crtc);
@ -308,7 +308,7 @@ static void adp_crtc_atomic_disable(struct drm_crtc *crtc,
}
static void adp_crtc_atomic_flush(struct drm_crtc *crtc,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
u32 frame_num = 1;
unsigned long flags;

10
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
View File

@ -130,19 +130,19 @@ static const struct drm_crtc_funcs amdgpu_vkms_crtc_funcs = {
};
static void amdgpu_vkms_crtc_atomic_enable(struct drm_crtc *crtc,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
drm_crtc_vblank_on(crtc);
}
static void amdgpu_vkms_crtc_atomic_disable(struct drm_crtc *crtc,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
drm_crtc_vblank_off(crtc);
}
static void amdgpu_vkms_crtc_atomic_flush(struct drm_crtc *crtc,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
unsigned long flags;
if (crtc->state->event) {
@ -262,13 +262,13 @@ static const struct drm_plane_funcs amdgpu_vkms_plane_funcs = {
};
static void amdgpu_vkms_plane_atomic_update(struct drm_plane *plane,
struct drm_atomic_state *old_state)
struct drm_atomic_commit *old_state)
{
return;
}
static int amdgpu_vkms_plane_atomic_check(struct drm_plane *plane,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state,
plane);

64
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
View File

@ -232,11 +232,11 @@ static int amdgpu_dm_encoder_init(struct drm_device *dev,
static int amdgpu_dm_connector_get_modes(struct drm_connector *connector);
static int amdgpu_dm_atomic_setup_commit(struct drm_atomic_state *state);
static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state);
static int amdgpu_dm_atomic_setup_commit(struct drm_atomic_commit *state);
static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_commit *state);
static int amdgpu_dm_atomic_check(struct drm_device *dev,
struct drm_atomic_state *state);
struct drm_atomic_commit *state);
static void handle_hpd_irq_helper(struct amdgpu_dm_connector *aconnector);
static void handle_hpd_rx_irq(void *param);
@ -3342,7 +3342,7 @@ static int dm_suspend(struct amdgpu_ip_block *ip_block)
}
struct drm_connector *
amdgpu_dm_find_first_crtc_matching_connector(struct drm_atomic_state *state,
amdgpu_dm_find_first_crtc_matching_connector(struct drm_atomic_commit *state,
struct drm_crtc *crtc)
{
u32 i;
@ -4906,7 +4906,7 @@ static int register_outbox_irq_handlers(struct amdgpu_device *adev)
*
* This should only be called during atomic check.
*/
int dm_atomic_get_state(struct drm_atomic_state *state,
int dm_atomic_get_state(struct drm_atomic_commit *state,
struct dm_atomic_state **dm_state)
{
struct drm_device *dev = state->dev;
@ -4927,7 +4927,7 @@ int dm_atomic_get_state(struct drm_atomic_state *state,
}
static struct dm_atomic_state *
dm_atomic_get_new_state(struct drm_atomic_state *state)
dm_atomic_get_new_state(struct drm_atomic_commit *state)
{
struct drm_device *dev = state->dev;
struct amdgpu_device *adev = drm_to_adev(dev);
@ -8370,7 +8370,7 @@ static int fill_hdr_info_packet(const struct drm_connector_state *state,
static int
amdgpu_dm_connector_atomic_check(struct drm_connector *conn,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_connector_state *new_con_state =
drm_atomic_get_new_connector_state(state, conn);
@ -8492,7 +8492,7 @@ static int dm_encoder_helper_atomic_check(struct drm_encoder *encoder,
struct drm_crtc_state *crtc_state,
struct drm_connector_state *conn_state)
{
struct drm_atomic_state *state = crtc_state->state;
struct drm_atomic_commit *state = crtc_state->state;
struct drm_connector *connector = conn_state->connector;
struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);
struct dm_connector_state *dm_new_connector_state = to_dm_connector_state(conn_state);
@ -8564,7 +8564,7 @@ const struct drm_encoder_helper_funcs amdgpu_dm_encoder_helper_funcs = {
.atomic_check = dm_encoder_helper_atomic_check
};
static int dm_update_mst_vcpi_slots_for_dsc(struct drm_atomic_state *state,
static int dm_update_mst_vcpi_slots_for_dsc(struct drm_atomic_commit *state,
struct dc_state *dc_state,
struct dsc_mst_fairness_vars *vars)
{
@ -9838,7 +9838,7 @@ static void amdgpu_dm_handle_vrr_transition(struct dm_crtc_state *old_state,
}
}
static void amdgpu_dm_commit_cursors(struct drm_atomic_state *state)
static void amdgpu_dm_commit_cursors(struct drm_atomic_commit *state)
{
struct drm_plane *plane;
struct drm_plane_state *old_plane_state;
@ -9985,7 +9985,7 @@ static void amdgpu_dm_enable_self_refresh(struct amdgpu_crtc *acrtc_attach,
}
}
static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
static void amdgpu_dm_commit_planes(struct drm_atomic_commit *state,
struct drm_device *dev,
struct amdgpu_display_manager *dm,
struct drm_crtc *pcrtc,
@ -10379,7 +10379,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
}
static void amdgpu_dm_commit_audio(struct drm_device *dev,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct amdgpu_device *adev = drm_to_adev(dev);
struct amdgpu_dm_connector *aconnector;
@ -10479,7 +10479,7 @@ static void dm_clear_writeback(struct amdgpu_display_manager *dm,
dc_stream_remove_writeback(dm->dc, crtc_state->stream, 0);
}
static void amdgpu_dm_commit_streams(struct drm_atomic_state *state,
static void amdgpu_dm_commit_streams(struct drm_atomic_commit *state,
struct dc_state *dc_state)
{
struct drm_device *dev = state->dev;
@ -10779,7 +10779,7 @@ static void dm_set_writeback(struct amdgpu_display_manager *dm,
drm_writeback_queue_job(wb_conn, new_con_state);
}
static void amdgpu_dm_update_hdcp(struct drm_atomic_state *state)
static void amdgpu_dm_update_hdcp(struct drm_atomic_commit *state)
{
struct drm_connector_state *old_con_state, *new_con_state;
struct drm_device *dev = state->dev;
@ -10894,7 +10894,7 @@ static void amdgpu_dm_update_hdcp(struct drm_atomic_state *state)
}
}
static int amdgpu_dm_atomic_setup_commit(struct drm_atomic_state *state)
static int amdgpu_dm_atomic_setup_commit(struct drm_atomic_commit *state)
{
struct drm_crtc *crtc;
struct drm_crtc_state *old_crtc_state, *new_crtc_state;
@ -10935,7 +10935,7 @@ static int amdgpu_dm_atomic_setup_commit(struct drm_atomic_state *state)
* programming the hardware. Any failures here implies a hardware failure, since
* atomic check should have filtered anything non-kosher.
*/
static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_commit *state)
{
struct drm_device *dev = state->dev;
struct amdgpu_device *adev = drm_to_adev(dev);
@ -11240,7 +11240,7 @@ static int dm_force_atomic_commit(struct drm_connector *connector)
{
int ret = 0;
struct drm_device *ddev = connector->dev;
struct drm_atomic_state *state = drm_atomic_state_alloc(ddev);
struct drm_atomic_commit *state = drm_atomic_commit_alloc(ddev);
struct amdgpu_crtc *disconnected_acrtc = to_amdgpu_crtc(connector->encoder->crtc);
struct drm_plane *plane = disconnected_acrtc->base.primary;
struct drm_connector_state *conn_state;
@ -11255,7 +11255,7 @@ static int dm_force_atomic_commit(struct drm_connector *connector)
/* Construct an atomic state to restore previous display setting */
/*
* Attach connectors to drm_atomic_state
* Attach connectors to drm_atomic_commit
*/
conn_state = drm_atomic_get_connector_state(state, connector);
@ -11265,7 +11265,7 @@ static int dm_force_atomic_commit(struct drm_connector *connector)
goto out;
}
/* Attach crtc to drm_atomic_state*/
/* Attach crtc to drm_atomic_commit*/
crtc_state = drm_atomic_get_crtc_state(state, &disconnected_acrtc->base);
/* Check for error in getting crtc state */
@ -11277,7 +11277,7 @@ static int dm_force_atomic_commit(struct drm_connector *connector)
/* force a restore */
crtc_state->mode_changed = true;
/* Attach plane to drm_atomic_state */
/* Attach plane to drm_atomic_commit */
plane_state = drm_atomic_get_plane_state(state, plane);
/* Check for error in getting plane state */
@ -11290,7 +11290,7 @@ static int dm_force_atomic_commit(struct drm_connector *connector)
ret = drm_atomic_commit(state);
out:
drm_atomic_state_put(state);
drm_atomic_commit_put(state);
if (ret)
drm_err(ddev, "Restoring old state failed with %i\n", ret);
@ -11339,7 +11339,7 @@ void dm_restore_drm_connector_state(struct drm_device *dev,
* Waits for completion of all non blocking commits.
*/
static int do_aquire_global_lock(struct drm_device *dev,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_crtc *crtc;
struct drm_crtc_commit *commit;
@ -11484,7 +11484,7 @@ static void set_freesync_fixed_config(struct dm_crtc_state *dm_new_crtc_state)
}
static int dm_update_crtc_state(struct amdgpu_display_manager *dm,
struct drm_atomic_state *state,
struct drm_atomic_commit *state,
struct drm_crtc *crtc,
struct drm_crtc_state *old_crtc_state,
struct drm_crtc_state *new_crtc_state,
@ -11758,7 +11758,7 @@ static int dm_update_crtc_state(struct amdgpu_display_manager *dm,
return ret;
}
static bool should_reset_plane(struct drm_atomic_state *state,
static bool should_reset_plane(struct drm_atomic_commit *state,
struct drm_plane *plane,
struct drm_plane_state *old_plane_state,
struct drm_plane_state *new_plane_state)
@ -12016,7 +12016,7 @@ static int dm_check_native_cursor_state(struct drm_crtc *new_plane_crtc,
return 0;
}
static bool dm_should_update_native_cursor(struct drm_atomic_state *state,
static bool dm_should_update_native_cursor(struct drm_atomic_commit *state,
struct drm_crtc *old_plane_crtc,
struct drm_crtc *new_plane_crtc,
bool enable)
@ -12046,7 +12046,7 @@ static bool dm_should_update_native_cursor(struct drm_atomic_state *state,
}
static int dm_update_plane_state(struct dc *dc,
struct drm_atomic_state *state,
struct drm_atomic_commit *state,
struct drm_plane *plane,
struct drm_plane_state *old_plane_state,
struct drm_plane_state *new_plane_state,
@ -12254,7 +12254,7 @@ dm_get_plane_scale(struct drm_plane_state *plane_state,
* indefinitely.
*/
static inline struct __drm_planes_state *__get_next_zpos(
struct drm_atomic_state *state,
struct drm_atomic_commit *state,
struct __drm_planes_state *prev)
{
unsigned int highest_zpos = 0, prev_zpos = 256;
@ -12304,7 +12304,7 @@ static inline struct __drm_planes_state *__get_next_zpos(
(old_plane_state) = __i->old_state, \
(new_plane_state) = __i->new_state, 1))
static int add_affected_mst_dsc_crtcs(struct drm_atomic_state *state, struct drm_crtc *crtc)
static int add_affected_mst_dsc_crtcs(struct drm_atomic_commit *state, struct drm_crtc *crtc)
{
struct drm_connector *connector;
struct drm_connector_state *conn_state, *old_conn_state;
@ -12363,7 +12363,7 @@ static int add_affected_mst_dsc_crtcs(struct drm_atomic_state *state, struct drm
*
* Return: true if the pipeline modifies pixels, false otherwise.
*/
static bool dm_plane_color_pipeline_active(struct drm_atomic_state *state,
static bool dm_plane_color_pipeline_active(struct drm_atomic_commit *state,
struct drm_plane *plane,
bool use_old)
{
@ -12403,7 +12403,7 @@ static bool dm_plane_color_pipeline_active(struct drm_atomic_state *state,
* failed.
*/
static int dm_crtc_get_cursor_mode(struct amdgpu_device *adev,
struct drm_atomic_state *state,
struct drm_atomic_commit *state,
struct dm_crtc_state *dm_crtc_state,
enum amdgpu_dm_cursor_mode *cursor_mode)
{
@ -12542,7 +12542,7 @@ static int dm_crtc_get_cursor_mode(struct amdgpu_device *adev,
}
static bool amdgpu_dm_crtc_mem_type_changed(struct drm_device *dev,
struct drm_atomic_state *state,
struct drm_atomic_commit *state,
struct drm_crtc_state *crtc_state)
{
struct drm_plane *plane;
@ -12591,7 +12591,7 @@ static bool amdgpu_dm_crtc_mem_type_changed(struct drm_device *dev,
* Return: -Error code if validation failed.
*/
static int amdgpu_dm_atomic_check(struct drm_device *dev,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct amdgpu_device *adev = drm_to_adev(dev);
struct dm_atomic_state *dm_state = NULL;

6
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
View File

@ -584,7 +584,7 @@ struct amdgpu_display_manager {
*/
struct idle_workqueue *idle_workqueue;
struct drm_atomic_state *cached_state;
struct drm_atomic_commit *cached_state;
struct dc_state *cached_dc_state;
struct dm_compressor_info compressor;
@ -1123,11 +1123,11 @@ struct dc_stream_state *
const struct dm_connector_state *dm_state,
const struct dc_stream_state *old_stream);
int dm_atomic_get_state(struct drm_atomic_state *state,
int dm_atomic_get_state(struct drm_atomic_commit *state,
struct dm_atomic_state **dm_state);
struct drm_connector *
amdgpu_dm_find_first_crtc_matching_connector(struct drm_atomic_state *state,
amdgpu_dm_find_first_crtc_matching_connector(struct drm_atomic_commit *state,
struct drm_crtc *crtc);
int convert_dc_color_depth_into_bpc(enum dc_color_depth display_color_depth);

12
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
View File

@ -1499,7 +1499,7 @@ __set_dm_plane_colorop_degamma(struct drm_plane_state *plane_state,
{
struct drm_colorop *old_colorop;
struct drm_colorop_state *colorop_state = NULL, *new_colorop_state;
struct drm_atomic_state *state = plane_state->state;
struct drm_atomic_commit *state = plane_state->state;
int i = 0;
old_colorop = colorop;
@ -1526,7 +1526,7 @@ __set_dm_plane_colorop_3x4_matrix(struct drm_plane_state *plane_state,
{
struct drm_colorop *old_colorop;
struct drm_colorop_state *colorop_state = NULL, *new_colorop_state;
struct drm_atomic_state *state = plane_state->state;
struct drm_atomic_commit *state = plane_state->state;
const struct drm_device *dev = colorop->dev;
const struct drm_property_blob *blob;
struct drm_color_ctm_3x4 *ctm = NULL;
@ -1567,7 +1567,7 @@ __set_dm_plane_colorop_multiplier(struct drm_plane_state *plane_state,
{
struct drm_colorop *old_colorop;
struct drm_colorop_state *colorop_state = NULL, *new_colorop_state;
struct drm_atomic_state *state = plane_state->state;
struct drm_atomic_commit *state = plane_state->state;
const struct drm_device *dev = colorop->dev;
int i = 0;
@ -1596,7 +1596,7 @@ __set_dm_plane_colorop_shaper(struct drm_plane_state *plane_state,
{
struct drm_colorop *old_colorop;
struct drm_colorop_state *colorop_state = NULL, *new_colorop_state;
struct drm_atomic_state *state = plane_state->state;
struct drm_atomic_commit *state = plane_state->state;
enum dc_transfer_func_predefined default_tf = TRANSFER_FUNCTION_LINEAR;
struct dc_transfer_func *tf = &dc_plane_state->in_shaper_func;
const struct drm_color_lut32 *shaper_lut;
@ -1704,7 +1704,7 @@ __set_dm_plane_colorop_3dlut(struct drm_plane_state *plane_state,
struct drm_colorop *old_colorop;
struct drm_colorop_state *colorop_state = NULL, *new_colorop_state;
struct dc_transfer_func *tf = &dc_plane_state->in_shaper_func;
struct drm_atomic_state *state = plane_state->state;
struct drm_atomic_commit *state = plane_state->state;
const struct amdgpu_device *adev = drm_to_adev(colorop->dev);
bool has_3dlut = adev->dm.dc->caps.color.dpp.hw_3d_lut || adev->dm.dc->caps.color.mpc.preblend;
const struct drm_device *dev = colorop->dev;
@ -1759,7 +1759,7 @@ __set_dm_plane_colorop_blend(struct drm_plane_state *plane_state,
{
struct drm_colorop *old_colorop;
struct drm_colorop_state *colorop_state = NULL, *new_colorop_state;
struct drm_atomic_state *state = plane_state->state;
struct drm_atomic_commit *state = plane_state->state;
enum dc_transfer_func_predefined default_tf = TRANSFER_FUNCTION_LINEAR;
struct dc_transfer_func *tf = &dc_plane_state->blend_tf;
const struct drm_color_lut32 *blend_lut = NULL;

4
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c
View File

@ -584,7 +584,7 @@ static void amdgpu_dm_crtc_helper_disable(struct drm_crtc *crtc)
static int amdgpu_dm_crtc_count_crtc_active_planes(struct drm_crtc_state *new_crtc_state)
{
struct drm_atomic_state *state = new_crtc_state->state;
struct drm_atomic_commit *state = new_crtc_state->state;
struct drm_plane *plane;
int num_active = 0;
@ -637,7 +637,7 @@ static bool amdgpu_dm_crtc_helper_mode_fixup(struct drm_crtc *crtc,
}
static int amdgpu_dm_crtc_helper_atomic_check(struct drm_crtc *crtc,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,
crtc);

22
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
View File

@ -497,7 +497,7 @@ static int dm_dp_mst_get_modes(struct drm_connector *connector)
static struct drm_encoder *
dm_mst_atomic_best_encoder(struct drm_connector *connector,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_connector_state *connector_state = drm_atomic_get_new_connector_state(state,
connector);
@ -579,7 +579,7 @@ dm_dp_mst_detect(struct drm_connector *connector,
}
static int dm_dp_mst_atomic_check(struct drm_connector *connector,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);
struct drm_dp_mst_topology_mgr *mst_mgr = &aconnector->mst_root->mst_mgr;
@ -986,7 +986,7 @@ static int bpp_x16_from_pbn(struct dsc_mst_fairness_params param, int pbn)
return dsc_config.bits_per_pixel;
}
static int increase_dsc_bpp(struct drm_atomic_state *state,
static int increase_dsc_bpp(struct drm_atomic_commit *state,
struct drm_dp_mst_topology_state *mst_state,
struct dc_link *dc_link,
struct dsc_mst_fairness_params *params,
@ -1090,7 +1090,7 @@ static int increase_dsc_bpp(struct drm_atomic_state *state,
return 0;
}
static int try_disable_dsc(struct drm_atomic_state *state,
static int try_disable_dsc(struct drm_atomic_commit *state,
struct dc_link *dc_link,
struct dsc_mst_fairness_params *params,
struct dsc_mst_fairness_vars *vars,
@ -1183,7 +1183,7 @@ static void log_dsc_params(int count, struct dsc_mst_fairness_vars *vars, int k)
i, vars[i + k].dsc_enabled, vars[i + k].bpp_x16, vars[i + k].pbn);
}
static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,
static int compute_mst_dsc_configs_for_link(struct drm_atomic_commit *state,
struct dc_state *dc_state,
struct dc_link *dc_link,
struct dsc_mst_fairness_vars *vars,
@ -1348,7 +1348,7 @@ static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,
}
static bool is_dsc_need_re_compute(
struct drm_atomic_state *state,
struct drm_atomic_commit *state,
struct dc_state *dc_state,
struct dc_link *dc_link)
{
@ -1479,7 +1479,7 @@ static bool is_dsc_need_re_compute(
return is_dsc_need_re_compute;
}
int compute_mst_dsc_configs_for_state(struct drm_atomic_state *state,
int compute_mst_dsc_configs_for_state(struct drm_atomic_commit *state,
struct dc_state *dc_state,
struct dsc_mst_fairness_vars *vars)
{
@ -1549,7 +1549,7 @@ int compute_mst_dsc_configs_for_state(struct drm_atomic_state *state,
return ret;
}
static int pre_compute_mst_dsc_configs_for_state(struct drm_atomic_state *state,
static int pre_compute_mst_dsc_configs_for_state(struct drm_atomic_commit *state,
struct dc_state *dc_state,
struct dsc_mst_fairness_vars *vars)
{
@ -1602,7 +1602,7 @@ static int pre_compute_mst_dsc_configs_for_state(struct drm_atomic_state *state,
return ret;
}
static int find_crtc_index_in_state_by_stream(struct drm_atomic_state *state,
static int find_crtc_index_in_state_by_stream(struct drm_atomic_commit *state,
struct dc_stream_state *stream)
{
int i;
@ -1633,7 +1633,7 @@ static bool is_link_to_dschub(struct dc_link *dc_link)
return true;
}
static bool is_dsc_precompute_needed(struct drm_atomic_state *state)
static bool is_dsc_precompute_needed(struct drm_atomic_commit *state)
{
int i;
struct drm_crtc *crtc;
@ -1654,7 +1654,7 @@ static bool is_dsc_precompute_needed(struct drm_atomic_state *state)
return ret;
}
int pre_validate_dsc(struct drm_atomic_state *state,
int pre_validate_dsc(struct drm_atomic_commit *state,
struct dm_atomic_state **dm_state_ptr,
struct dsc_mst_fairness_vars *vars)
{

4
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
View File

@ -80,13 +80,13 @@ struct dsc_mst_fairness_vars {
struct amdgpu_dm_connector *aconnector;
};
int compute_mst_dsc_configs_for_state(struct drm_atomic_state *state,
int compute_mst_dsc_configs_for_state(struct drm_atomic_commit *state,
struct dc_state *dc_state,
struct dsc_mst_fairness_vars *vars);
bool needs_dsc_aux_workaround(struct dc_link *link);
int pre_validate_dsc(struct drm_atomic_state *state,
int pre_validate_dsc(struct drm_atomic_commit *state,
struct dm_atomic_state **dm_state_ptr,
struct dsc_mst_fairness_vars *vars);

6
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
View File

@ -1227,7 +1227,7 @@ int amdgpu_dm_plane_fill_dc_scaling_info(struct amdgpu_device *adev,
}
static int amdgpu_dm_plane_atomic_check(struct drm_plane *plane,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state,
plane);
@ -1274,7 +1274,7 @@ static int amdgpu_dm_plane_atomic_check(struct drm_plane *plane,
}
static int amdgpu_dm_plane_atomic_async_check(struct drm_plane *plane,
struct drm_atomic_state *state, bool flip)
struct drm_atomic_commit *state, bool flip)
{
struct drm_crtc_state *new_crtc_state;
struct drm_plane_state *new_plane_state;
@ -1431,7 +1431,7 @@ void amdgpu_dm_plane_handle_cursor_update(struct drm_plane *plane,
}
static void amdgpu_dm_plane_atomic_async_update(struct drm_plane *plane,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_plane_state *new_state = drm_atomic_get_new_plane_state(state,
plane);

20
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_trace.h
View File

@ -108,7 +108,7 @@ TRACE_EVENT(amdgpu_dm_connector_atomic_check,
TP_STRUCT__entry(
__field(uint32_t, conn_id)
__field(const struct drm_connector_state *, conn_state)
__field(const struct drm_atomic_state *, state)
__field(const struct drm_atomic_commit *, state)
__field(const struct drm_crtc_commit *, commit)
__field(uint32_t, crtc_id)
__field(uint32_t, best_encoder_id)
@ -163,7 +163,7 @@ TRACE_EVENT(amdgpu_dm_crtc_atomic_check,
TP_ARGS(state),
TP_STRUCT__entry(
__field(const struct drm_atomic_state *, state)
__field(const struct drm_atomic_commit *, state)
__field(const struct drm_crtc_state *, crtc_state)
__field(const struct drm_crtc_commit *, commit)
__field(uint32_t, crtc_id)
@ -229,7 +229,7 @@ DECLARE_EVENT_CLASS(amdgpu_dm_plane_state_template,
__field(uint32_t, plane_id)
__field(enum drm_plane_type, plane_type)
__field(const struct drm_plane_state *, plane_state)
__field(const struct drm_atomic_state *, state)
__field(const struct drm_atomic_commit *, state)
__field(uint32_t, crtc_id)
__field(uint32_t, fb_id)
__field(uint32_t, fb_format)
@ -315,11 +315,11 @@ DEFINE_EVENT(amdgpu_dm_plane_state_template, amdgpu_dm_atomic_update_cursor,
TP_ARGS(state));
TRACE_EVENT(amdgpu_dm_atomic_state_template,
TP_PROTO(const struct drm_atomic_state *state),
TP_PROTO(const struct drm_atomic_commit *state),
TP_ARGS(state),
TP_STRUCT__entry(
__field(const struct drm_atomic_state *, state)
__field(const struct drm_atomic_commit *, state)
__field(bool, allow_modeset)
__field(bool, legacy_cursor_update)
__field(bool, async_update)
@ -347,23 +347,23 @@ TRACE_EVENT(amdgpu_dm_atomic_state_template,
);
DEFINE_EVENT(amdgpu_dm_atomic_state_template, amdgpu_dm_atomic_commit_tail_begin,
TP_PROTO(const struct drm_atomic_state *state),
TP_PROTO(const struct drm_atomic_commit *state),
TP_ARGS(state));
DEFINE_EVENT(amdgpu_dm_atomic_state_template, amdgpu_dm_atomic_commit_tail_finish,
TP_PROTO(const struct drm_atomic_state *state),
TP_PROTO(const struct drm_atomic_commit *state),
TP_ARGS(state));
DEFINE_EVENT(amdgpu_dm_atomic_state_template, amdgpu_dm_atomic_check_begin,
TP_PROTO(const struct drm_atomic_state *state),
TP_PROTO(const struct drm_atomic_commit *state),
TP_ARGS(state));
TRACE_EVENT(amdgpu_dm_atomic_check_finish,
TP_PROTO(const struct drm_atomic_state *state, int res),
TP_PROTO(const struct drm_atomic_commit *state, int res),
TP_ARGS(state, res),
TP_STRUCT__entry(
__field(const struct drm_atomic_state *, state)
__field(const struct drm_atomic_commit *, state)
__field(int, res)
__field(bool, async_update)
__field(bool, allow_modeset)

8
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c
View File

@ -75,7 +75,7 @@ static void komeda_crtc_update_clock_ratio(struct komeda_crtc_state *kcrtc_st)
*/
static int
komeda_crtc_atomic_check(struct drm_crtc *crtc,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,
crtc);
@ -279,7 +279,7 @@ komeda_crtc_do_flush(struct drm_crtc *crtc,
static void
komeda_crtc_atomic_enable(struct drm_crtc *crtc,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_crtc_state *old = drm_atomic_get_old_crtc_state(state,
crtc);
@ -325,7 +325,7 @@ komeda_crtc_flush_and_wait_for_flip_done(struct komeda_crtc *kcrtc,
static void
komeda_crtc_atomic_disable(struct drm_crtc *crtc,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_crtc_state *old = drm_atomic_get_old_crtc_state(state,
crtc);
@ -387,7 +387,7 @@ komeda_crtc_atomic_disable(struct drm_crtc *crtc,
static void
komeda_crtc_atomic_flush(struct drm_crtc *crtc,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,
crtc);

10
drivers/gpu/drm/arm/display/komeda/komeda_kms.c
View File

@ -67,7 +67,7 @@ static const struct drm_driver komeda_kms_driver = {
.minor = 1,
};
static void komeda_kms_atomic_commit_hw_done(struct drm_atomic_state *state)
static void komeda_kms_atomic_commit_hw_done(struct drm_atomic_commit *state)
{
struct drm_device *dev = state->dev;
struct komeda_kms_dev *kms = to_kdev(dev);
@ -86,7 +86,7 @@ static void komeda_kms_atomic_commit_hw_done(struct drm_atomic_state *state)
drm_atomic_helper_commit_hw_done(state);
}
static void komeda_kms_commit_tail(struct drm_atomic_state *old_state)
static void komeda_kms_commit_tail(struct drm_atomic_commit *old_state)
{
struct drm_device *dev = old_state->dev;
bool fence_cookie = dma_fence_begin_signalling();
@ -153,7 +153,7 @@ static int komeda_plane_state_list_add(struct drm_plane_state *plane_st,
static int komeda_crtc_normalize_zpos(struct drm_crtc *crtc,
struct drm_crtc_state *crtc_st)
{
struct drm_atomic_state *state = crtc_st->state;
struct drm_atomic_commit *state = crtc_st->state;
struct komeda_crtc *kcrtc = to_kcrtc(crtc);
struct komeda_crtc_state *kcrtc_st = to_kcrtc_st(crtc_st);
struct komeda_plane_state *kplane_st;
@ -216,7 +216,7 @@ static int komeda_crtc_normalize_zpos(struct drm_crtc *crtc,
}
static int komeda_kms_check(struct drm_device *dev,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_crtc *crtc;
struct drm_crtc_state *new_crtc_st;
@ -228,7 +228,7 @@ static int komeda_kms_check(struct drm_device *dev,
/* Komeda need to re-calculate resource assumption in every commit
* so need to add all affected_planes (even unchanged) to
* drm_atomic_state.
* drm_atomic_commit.
*/
for_each_new_crtc_in_state(state, crtc, new_crtc_st, i) {
err = drm_atomic_add_affected_planes(state, crtc);

14
drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h
View File

@ -155,7 +155,7 @@ struct komeda_component_output {
* @komeda_scaler_state
*/
struct komeda_component_state {
/** @obj: tracking component_state by drm_atomic_state */
/** @obj: tracking component_state by drm_atomic_commit */
struct drm_private_state obj;
/** @component: backpointer to the component */
struct komeda_component *component;
@ -388,7 +388,7 @@ struct komeda_pipeline_funcs {
* Represent a complete display pipeline and hold all functional components.
*/
struct komeda_pipeline {
/** @obj: link pipeline as private obj of drm_atomic_state */
/** @obj: link pipeline as private obj of drm_atomic_commit */
struct drm_private_obj obj;
/** @mdev: the parent komeda_dev */
struct komeda_dev *mdev;
@ -448,10 +448,10 @@ struct komeda_pipeline {
*
* NOTE:
* Unlike the pipeline, pipeline_state doesn’t gather any component_state
* into it. It because all component will be managed by drm_atomic_state.
* into it. It because all component will be managed by drm_atomic_commit.
*/
struct komeda_pipeline_state {
/** @obj: tracking pipeline_state by drm_atomic_state */
/** @obj: tracking pipeline_state by drm_atomic_commit */
struct drm_private_state obj;
/** @pipe: backpointer to the pipeline */
struct komeda_pipeline *pipe;
@ -555,11 +555,11 @@ int komeda_release_unclaimed_resources(struct komeda_pipeline *pipe,
struct komeda_pipeline_state *
komeda_pipeline_get_old_state(struct komeda_pipeline *pipe,
struct drm_atomic_state *state);
struct drm_atomic_commit *state);
bool komeda_pipeline_disable(struct komeda_pipeline *pipe,
struct drm_atomic_state *old_state);
struct drm_atomic_commit *old_state);
void komeda_pipeline_update(struct komeda_pipeline *pipe,
struct drm_atomic_state *old_state);
struct drm_atomic_commit *old_state);
void komeda_complete_data_flow_cfg(struct komeda_layer *layer,
struct komeda_data_flow_cfg *dflow,

28
drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c
View File

@ -22,7 +22,7 @@ static inline bool is_switching_user(void *old, void *new)
static struct komeda_pipeline_state *
komeda_pipeline_get_state(struct komeda_pipeline *pipe,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_private_state *priv_st;
@ -35,7 +35,7 @@ komeda_pipeline_get_state(struct komeda_pipeline *pipe,
struct komeda_pipeline_state *
komeda_pipeline_get_old_state(struct komeda_pipeline *pipe,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_private_state *priv_st;
@ -47,7 +47,7 @@ komeda_pipeline_get_old_state(struct komeda_pipeline *pipe,
static struct komeda_pipeline_state *
komeda_pipeline_get_new_state(struct komeda_pipeline *pipe,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_private_state *priv_st;
@ -60,7 +60,7 @@ komeda_pipeline_get_new_state(struct komeda_pipeline *pipe,
/* Assign pipeline for crtc */
static struct komeda_pipeline_state *
komeda_pipeline_get_state_and_set_crtc(struct komeda_pipeline *pipe,
struct drm_atomic_state *state,
struct drm_atomic_commit *state,
struct drm_crtc *crtc)
{
struct komeda_pipeline_state *st;
@ -97,7 +97,7 @@ komeda_pipeline_get_state_and_set_crtc(struct komeda_pipeline *pipe,
static struct komeda_component_state *
komeda_component_get_state(struct komeda_component *c,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_private_state *priv_st;
@ -112,7 +112,7 @@ komeda_component_get_state(struct komeda_component *c,
static struct komeda_component_state *
komeda_component_get_old_state(struct komeda_component *c,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_private_state *priv_st;
@ -149,7 +149,7 @@ komeda_component_get_old_state(struct komeda_component *c,
*/
static struct komeda_component_state *
komeda_component_get_state_and_set_user(struct komeda_component *c,
struct drm_atomic_state *state,
struct drm_atomic_commit *state,
void *user,
struct drm_crtc *crtc)
{
@ -253,7 +253,7 @@ komeda_component_validate_private(struct komeda_component *c,
/* Get current available scaler from the component->supported_outputs */
static struct komeda_scaler *
komeda_component_get_avail_scaler(struct komeda_component *c,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct komeda_pipeline_state *pipe_st;
u32 avail_scalers;
@ -505,7 +505,7 @@ komeda_scaler_validate(void *user,
struct komeda_crtc_state *kcrtc_st,
struct komeda_data_flow_cfg *dflow)
{
struct drm_atomic_state *drm_st = kcrtc_st->base.state;
struct drm_atomic_commit *drm_st = kcrtc_st->base.state;
struct komeda_component_state *c_st;
struct komeda_scaler_state *st;
struct komeda_scaler *scaler;
@ -669,7 +669,7 @@ komeda_compiz_set_input(struct komeda_compiz *compiz,
struct komeda_crtc_state *kcrtc_st,
struct komeda_data_flow_cfg *dflow)
{
struct drm_atomic_state *drm_st = kcrtc_st->base.state;
struct drm_atomic_commit *drm_st = kcrtc_st->base.state;
struct komeda_component_state *c_st, *old_st;
struct komeda_compiz_input_cfg *cin;
u16 compiz_w, compiz_h;
@ -1227,7 +1227,7 @@ static int
komeda_pipeline_unbound_components(struct komeda_pipeline *pipe,
struct komeda_pipeline_state *new)
{
struct drm_atomic_state *drm_st = new->obj.state;
struct drm_atomic_commit *drm_st = new->obj.state;
struct komeda_pipeline_state *old = priv_to_pipe_st(pipe->obj.state);
struct komeda_component_state *c_st;
struct komeda_component *c;
@ -1255,7 +1255,7 @@ komeda_pipeline_unbound_components(struct komeda_pipeline *pipe,
int komeda_release_unclaimed_resources(struct komeda_pipeline *pipe,
struct komeda_crtc_state *kcrtc_st)
{
struct drm_atomic_state *drm_st = kcrtc_st->base.state;
struct drm_atomic_commit *drm_st = kcrtc_st->base.state;
struct komeda_pipeline_state *st;
/* ignore the pipeline which is not affected */
@ -1285,7 +1285,7 @@ int komeda_release_unclaimed_resources(struct komeda_pipeline *pipe,
* false: disable is complete.
*/
bool komeda_pipeline_disable(struct komeda_pipeline *pipe,
struct drm_atomic_state *old_state)
struct drm_atomic_commit *old_state)
{
struct komeda_pipeline_state *old;
struct komeda_component *c;
@ -1330,7 +1330,7 @@ bool komeda_pipeline_disable(struct komeda_pipeline *pipe,
}
void komeda_pipeline_update(struct komeda_pipeline *pipe,
struct drm_atomic_state *old_state)
struct drm_atomic_commit *old_state)
{
struct komeda_pipeline_state *new = priv_to_pipe_st(pipe->obj.state);
struct komeda_pipeline_state *old;

4
drivers/gpu/drm/arm/display/komeda/komeda_plane.c
View File

@ -69,7 +69,7 @@ komeda_plane_init_data_flow(struct drm_plane_state *st,
*/
static int
komeda_plane_atomic_check(struct drm_plane *plane,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state,
plane);
@ -116,7 +116,7 @@ komeda_plane_atomic_check(struct drm_plane *plane,
*/
static void
komeda_plane_atomic_update(struct drm_plane *plane,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
}

10
drivers/gpu/drm/arm/hdlcd_crtc.c
View File

@ -175,7 +175,7 @@ static void hdlcd_crtc_mode_set_nofb(struct drm_crtc *crtc)
}
static void hdlcd_crtc_atomic_enable(struct drm_crtc *crtc,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc);
@ -186,7 +186,7 @@ static void hdlcd_crtc_atomic_enable(struct drm_crtc *crtc,
}
static void hdlcd_crtc_atomic_disable(struct drm_crtc *crtc,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc);
@ -212,7 +212,7 @@ static enum drm_mode_status hdlcd_crtc_mode_valid(struct drm_crtc *crtc,
}
static void hdlcd_crtc_atomic_begin(struct drm_crtc *crtc,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_pending_vblank_event *event = crtc->state->event;
@ -236,7 +236,7 @@ static const struct drm_crtc_helper_funcs hdlcd_crtc_helper_funcs = {
};
static int hdlcd_plane_atomic_check(struct drm_plane *plane,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state,
plane);
@ -267,7 +267,7 @@ static int hdlcd_plane_atomic_check(struct drm_plane *plane,
}
static void hdlcd_plane_atomic_update(struct drm_plane *plane,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state,
plane);

6
drivers/gpu/drm/arm/malidp_crtc.c
View File

@ -47,7 +47,7 @@ static enum drm_mode_status malidp_crtc_mode_valid(struct drm_crtc *crtc,
}
static void malidp_crtc_atomic_enable(struct drm_crtc *crtc,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct malidp_drm *malidp = crtc_to_malidp_device(crtc);
struct malidp_hw_device *hwdev = malidp->dev;
@ -71,7 +71,7 @@ static void malidp_crtc_atomic_enable(struct drm_crtc *crtc,
}
static void malidp_crtc_atomic_disable(struct drm_crtc *crtc,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_crtc_state *old_state = drm_atomic_get_old_crtc_state(state,
crtc);
@ -334,7 +334,7 @@ static int malidp_crtc_atomic_check_scaling(struct drm_crtc *crtc,
}
static int malidp_crtc_atomic_check(struct drm_crtc *crtc,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,
crtc);

4
drivers/gpu/drm/arm/malidp_drv.c
View File

@ -190,7 +190,7 @@ static int malidp_set_and_wait_config_valid(struct drm_device *drm)
return (ret > 0) ? 0 : -ETIMEDOUT;
}
static void malidp_atomic_commit_hw_done(struct drm_atomic_state *state)
static void malidp_atomic_commit_hw_done(struct drm_atomic_commit *state)
{
struct drm_device *drm = state->dev;
struct malidp_drm *malidp = drm_to_malidp(drm);
@ -231,7 +231,7 @@ static void malidp_atomic_commit_hw_done(struct drm_atomic_state *state)
drm_atomic_helper_commit_hw_done(state);
}
static void malidp_atomic_commit_tail(struct drm_atomic_state *state)
static void malidp_atomic_commit_tail(struct drm_atomic_commit *state)
{
struct drm_device *drm = state->dev;
struct malidp_drm *malidp = drm_to_malidp(drm);

2
drivers/gpu/drm/arm/malidp_mw.c
View File

@ -237,7 +237,7 @@ int malidp_mw_connector_init(struct drm_device *drm)
}
void malidp_mw_atomic_commit(struct drm_device *drm,
struct drm_atomic_state *old_state)
struct drm_atomic_commit *old_state)
{
struct malidp_drm *malidp = drm_to_malidp(drm);
struct drm_writeback_connector *mw_conn = &malidp->mw_connector;

2
drivers/gpu/drm/arm/malidp_mw.h
View File

@ -10,5 +10,5 @@
int malidp_mw_connector_init(struct drm_device *drm);
void malidp_mw_atomic_commit(struct drm_device *drm,
struct drm_atomic_state *old_state);
struct drm_atomic_commit *old_state);
#endif

6
drivers/gpu/drm/arm/malidp_planes.c
View File

@ -490,7 +490,7 @@ static void malidp_de_prefetch_settings(struct malidp_plane *mp,
}
static int malidp_de_plane_check(struct drm_plane *plane,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state,
plane);
@ -779,7 +779,7 @@ static void malidp_de_set_plane_afbc(struct drm_plane *plane)
}
static void malidp_de_plane_update(struct drm_plane *plane,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_plane_state *old_state = drm_atomic_get_old_plane_state(state,
plane);
@ -900,7 +900,7 @@ static void malidp_de_plane_update(struct drm_plane *plane,
}
static void malidp_de_plane_disable(struct drm_plane *plane,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct malidp_plane *mp = to_malidp_plane(plane);

10
drivers/gpu/drm/armada/armada_crtc.c
View File

@ -414,7 +414,7 @@ static void armada_drm_crtc_mode_set_nofb(struct drm_crtc *crtc)
}
static int armada_drm_crtc_atomic_check(struct drm_crtc *crtc,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,
crtc);
@ -430,7 +430,7 @@ static int armada_drm_crtc_atomic_check(struct drm_crtc *crtc,
}
static void armada_drm_crtc_atomic_begin(struct drm_crtc *crtc,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,
crtc);
@ -446,7 +446,7 @@ static void armada_drm_crtc_atomic_begin(struct drm_crtc *crtc,
}
static void armada_drm_crtc_atomic_flush(struct drm_crtc *crtc,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,
crtc);
@ -474,7 +474,7 @@ static void armada_drm_crtc_atomic_flush(struct drm_crtc *crtc,
}
static void armada_drm_crtc_atomic_disable(struct drm_crtc *crtc,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_crtc_state *old_state = drm_atomic_get_old_crtc_state(state,
crtc);
@ -512,7 +512,7 @@ static void armada_drm_crtc_atomic_disable(struct drm_crtc *crtc,
}
static void armada_drm_crtc_atomic_enable(struct drm_crtc *crtc,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_crtc_state *old_state = drm_atomic_get_old_crtc_state(state,
crtc);

10
drivers/gpu/drm/armada/armada_overlay.c
View File

@ -69,7 +69,7 @@ static inline u32 armada_csc(struct drm_plane_state *state)
/* === Plane support === */
static void armada_drm_overlay_plane_atomic_update(struct drm_plane *plane,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_plane_state *old_state = drm_atomic_get_old_plane_state(state,
plane);
@ -220,7 +220,7 @@ static void armada_drm_overlay_plane_atomic_update(struct drm_plane *plane,
}
static void armada_drm_overlay_plane_atomic_disable(struct drm_plane *plane,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_plane_state *old_state = drm_atomic_get_old_plane_state(state,
plane);
@ -262,7 +262,7 @@ armada_overlay_plane_update(struct drm_plane *plane, struct drm_crtc *crtc,
uint32_t src_x, uint32_t src_y, uint32_t src_w, uint32_t src_h,
struct drm_modeset_acquire_ctx *ctx)
{
struct drm_atomic_state *state;
struct drm_atomic_commit *state;
struct drm_plane_state *plane_state;
int ret = 0;
@ -270,7 +270,7 @@ armada_overlay_plane_update(struct drm_plane *plane, struct drm_crtc *crtc,
crtc_x, crtc_y, crtc_w, crtc_h,
src_x, src_y, src_w, src_h);
state = drm_atomic_state_alloc(plane->dev);
state = drm_atomic_commit_alloc(plane->dev);
if (!state)
return -ENOMEM;
@ -297,7 +297,7 @@ armada_overlay_plane_update(struct drm_plane *plane, struct drm_crtc *crtc,
ret = drm_atomic_nonblocking_commit(state);
fail:
drm_atomic_state_put(state);
drm_atomic_commit_put(state);
return ret;
}

6
drivers/gpu/drm/armada/armada_plane.c
View File

@ -80,7 +80,7 @@ void armada_drm_plane_calc(struct drm_plane_state *state, u32 addrs[2][3],
}
int armada_drm_plane_atomic_check(struct drm_plane *plane,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state,
plane);
@ -130,7 +130,7 @@ int armada_drm_plane_atomic_check(struct drm_plane *plane,
}
static void armada_drm_primary_plane_atomic_update(struct drm_plane *plane,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_plane_state *old_state = drm_atomic_get_old_plane_state(state,
plane);
@ -220,7 +220,7 @@ static void armada_drm_primary_plane_atomic_update(struct drm_plane *plane,
}
static void armada_drm_primary_plane_atomic_disable(struct drm_plane *plane,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_plane_state *old_state = drm_atomic_get_old_plane_state(state,
plane);

2
drivers/gpu/drm/armada/armada_plane.h
View File

@ -24,7 +24,7 @@ void armada_drm_plane_calc(struct drm_plane_state *state, u32 addrs[2][3],
void armada_drm_plane_cleanup_fb(struct drm_plane *plane,
struct drm_plane_state *old_state);
int armada_drm_plane_atomic_check(struct drm_plane *plane,
struct drm_atomic_state *state);
struct drm_atomic_commit *state);
void armada_plane_reset(struct drm_plane *plane);
struct drm_plane_state *armada_plane_duplicate_state(struct drm_plane *plane);
void armada_plane_destroy_state(struct drm_plane *plane,

6
drivers/gpu/drm/ast/ast_cursor.c
View File

@ -164,7 +164,7 @@ static const uint32_t ast_cursor_plane_formats[] = {
};
static int ast_cursor_plane_helper_atomic_check(struct drm_plane *plane,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state, plane);
struct drm_framebuffer *new_fb = new_plane_state->fb;
@ -244,7 +244,7 @@ static const u8 *ast_cursor_plane_get_argb4444(struct ast_cursor_plane *ast_curs
}
static void ast_cursor_plane_helper_atomic_update(struct drm_plane *plane,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct ast_cursor_plane *ast_cursor_plane = to_ast_cursor_plane(plane);
struct ast_plane *ast_plane = to_ast_plane(plane);
@ -309,7 +309,7 @@ static void ast_cursor_plane_helper_atomic_update(struct drm_plane *plane,
}
static void ast_cursor_plane_helper_atomic_disable(struct drm_plane *plane,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct ast_device *ast = to_ast_device(plane->dev);

4
drivers/gpu/drm/ast/ast_dp.c
View File

@ -359,7 +359,7 @@ static void ast_astdp_encoder_helper_atomic_mode_set(struct drm_encoder *encoder
}
static void ast_astdp_encoder_helper_atomic_enable(struct drm_encoder *encoder,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct ast_device *ast = to_ast_device(encoder->dev);
struct ast_connector *ast_connector = &ast->output.astdp.connector;
@ -374,7 +374,7 @@ static void ast_astdp_encoder_helper_atomic_enable(struct drm_encoder *encoder,
}
static void ast_astdp_encoder_helper_atomic_disable(struct drm_encoder *encoder,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct ast_device *ast = to_ast_device(encoder->dev);

4
drivers/gpu/drm/ast/ast_dp501.c
View File

@ -477,7 +477,7 @@ static const struct drm_encoder_funcs ast_dp501_encoder_funcs = {
};
static void ast_dp501_encoder_helper_atomic_enable(struct drm_encoder *encoder,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct ast_device *ast = to_ast_device(encoder->dev);
@ -485,7 +485,7 @@ static void ast_dp501_encoder_helper_atomic_enable(struct drm_encoder *encoder,
}
static void ast_dp501_encoder_helper_atomic_disable(struct drm_encoder *encoder,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct ast_device *ast = to_ast_device(encoder->dev);

18
drivers/gpu/drm/ast/ast_mode.c
View File

@ -493,7 +493,7 @@ static const uint32_t ast_primary_plane_formats[] = {
};
static int ast_primary_plane_helper_atomic_check(struct drm_plane *plane,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_device *dev = plane->dev;
struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state, plane);
@ -541,7 +541,7 @@ static void ast_handle_damage(struct ast_plane *ast_plane, struct iosys_map *src
}
static void ast_primary_plane_helper_atomic_update(struct drm_plane *plane,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_device *dev = plane->dev;
struct ast_device *ast = to_ast_device(dev);
@ -585,7 +585,7 @@ static void ast_primary_plane_helper_atomic_update(struct drm_plane *plane,
}
static void ast_primary_plane_helper_atomic_enable(struct drm_plane *plane,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct ast_device *ast = to_ast_device(plane->dev);
struct ast_plane *ast_plane = to_ast_plane(plane);
@ -600,7 +600,7 @@ static void ast_primary_plane_helper_atomic_enable(struct drm_plane *plane,
}
static void ast_primary_plane_helper_atomic_disable(struct drm_plane *plane,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
/*
* Keep this empty function to avoid calling
@ -708,7 +708,7 @@ static void ast_crtc_helper_mode_set_nofb(struct drm_crtc *crtc)
}
static int ast_crtc_helper_atomic_check(struct drm_crtc *crtc,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
struct drm_display_mode *adjusted_mode = &crtc_state->adjusted_mode;
@ -808,7 +808,7 @@ static int ast_crtc_helper_atomic_check(struct drm_crtc *crtc,
static void
ast_crtc_helper_atomic_flush(struct drm_crtc *crtc,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,
crtc);
@ -830,7 +830,7 @@ ast_crtc_helper_atomic_flush(struct drm_crtc *crtc,
}
}
static void ast_crtc_helper_atomic_enable(struct drm_crtc *crtc, struct drm_atomic_state *state)
static void ast_crtc_helper_atomic_enable(struct drm_crtc *crtc, struct drm_atomic_commit *state)
{
struct ast_device *ast = to_ast_device(crtc->dev);
u8 vgacr17 = 0x00;
@ -843,7 +843,7 @@ static void ast_crtc_helper_atomic_enable(struct drm_crtc *crtc, struct drm_atom
ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb6, 0xfc, vgacrb6);
}
static void ast_crtc_helper_atomic_disable(struct drm_crtc *crtc, struct drm_atomic_state *state)
static void ast_crtc_helper_atomic_disable(struct drm_crtc *crtc, struct drm_atomic_commit *state)
{
struct drm_crtc_state *old_crtc_state = drm_atomic_get_old_crtc_state(state, crtc);
struct ast_device *ast = to_ast_device(crtc->dev);
@ -952,7 +952,7 @@ static int ast_crtc_init(struct ast_device *ast)
* Mode config
*/
static void ast_mode_config_helper_atomic_commit_tail(struct drm_atomic_state *state)
static void ast_mode_config_helper_atomic_commit_tail(struct drm_atomic_commit *state)
{
struct ast_device *ast = to_ast_device(state->dev);

10
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
View File

@ -200,7 +200,7 @@ atmel_hlcdc_crtc_mode_valid(struct drm_crtc *c,
}
static void atmel_hlcdc_crtc_atomic_disable(struct drm_crtc *c,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_device *dev = c->dev;
struct atmel_hlcdc_crtc *crtc = drm_crtc_to_atmel_hlcdc_crtc(c);
@ -252,7 +252,7 @@ static void atmel_hlcdc_crtc_atomic_disable(struct drm_crtc *c,
}
static void atmel_hlcdc_crtc_atomic_enable(struct drm_crtc *c,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_device *dev = c->dev;
struct atmel_hlcdc_crtc *crtc = drm_crtc_to_atmel_hlcdc_crtc(c);
@ -458,7 +458,7 @@ static int atmel_hlcdc_crtc_select_output_mode(struct drm_crtc_state *state)
}
static int atmel_hlcdc_crtc_atomic_check(struct drm_crtc *c,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_crtc_state *s = drm_atomic_get_new_crtc_state(state, c);
int ret;
@ -475,13 +475,13 @@ static int atmel_hlcdc_crtc_atomic_check(struct drm_crtc *c,
}
static void atmel_hlcdc_crtc_atomic_begin(struct drm_crtc *c,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
drm_crtc_vblank_on(c);
}
static void atmel_hlcdc_crtc_atomic_flush(struct drm_crtc *c,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct atmel_hlcdc_crtc *crtc = drm_crtc_to_atmel_hlcdc_crtc(c);
unsigned long flags;

2
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
View File

@ -983,7 +983,7 @@ static int atmel_hlcdc_dc_drm_suspend(struct device *dev)
struct drm_device *drm_dev = dev_get_drvdata(dev);
struct atmel_hlcdc_dc *dc = drm_dev->dev_private;
struct regmap *regmap = dc->hlcdc->regmap;
struct drm_atomic_state *state;
struct drm_atomic_commit *state;
state = drm_atomic_helper_suspend(drm_dev);
if (IS_ERR(state))

2
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h
View File

@ -354,7 +354,7 @@ struct atmel_hlcdc_dc {
struct atmel_hlcdc_layer *layers[ATMEL_HLCDC_MAX_LAYERS];
struct {
u32 imr;
struct drm_atomic_state *state;
struct drm_atomic_commit *state;
} suspend;
};

6
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
View File

@ -718,7 +718,7 @@ atmel_hlcdc_plane_update_disc_area(struct atmel_hlcdc_plane *plane,
}
static int atmel_hlcdc_plane_atomic_check(struct drm_plane *p,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_plane_state *s = drm_atomic_get_new_plane_state(state, p);
struct atmel_hlcdc_plane *plane = drm_plane_to_atmel_hlcdc_plane(p);
@ -869,7 +869,7 @@ static void atmel_xlcdc_atomic_disable(struct atmel_hlcdc_plane *plane,
}
static void atmel_hlcdc_plane_atomic_disable(struct drm_plane *p,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct atmel_hlcdc_plane *plane = drm_plane_to_atmel_hlcdc_plane(p);
struct atmel_hlcdc_dc *dc = plane->base.dev->dev_private;
@ -919,7 +919,7 @@ static void atmel_xlcdc_atomic_update(struct atmel_hlcdc_plane *plane,
}
static void atmel_hlcdc_plane_atomic_update(struct drm_plane *p,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_plane_state *new_s = drm_atomic_get_new_plane_state(state,
p);

4
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
View File

@ -783,7 +783,7 @@ static const struct adv7511 *bridge_to_adv7511_const(const struct drm_bridge *br
}
static void adv7511_bridge_atomic_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct adv7511 *adv = bridge_to_adv7511(bridge);
struct drm_connector *connector;
@ -812,7 +812,7 @@ static void adv7511_bridge_atomic_enable(struct drm_bridge *bridge,
}
static void adv7511_bridge_atomic_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct adv7511 *adv = bridge_to_adv7511(bridge);

14
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
View File

@ -891,7 +891,7 @@ analogix_dp_best_encoder(struct drm_connector *connector)
static int analogix_dp_atomic_check(struct drm_connector *connector,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct analogix_dp_device *dp = to_dp(connector);
struct drm_connector_state *conn_state;
@ -995,7 +995,7 @@ static int analogix_dp_bridge_attach(struct drm_bridge *bridge,
static
struct drm_crtc *analogix_dp_get_old_crtc(struct analogix_dp_device *dp,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_encoder *encoder = dp->encoder;
struct drm_connector *connector;
@ -1014,7 +1014,7 @@ struct drm_crtc *analogix_dp_get_old_crtc(struct analogix_dp_device *dp,
static
struct drm_crtc *analogix_dp_get_new_crtc(struct analogix_dp_device *dp,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_encoder *encoder = dp->encoder;
struct drm_connector *connector;
@ -1032,7 +1032,7 @@ struct drm_crtc *analogix_dp_get_new_crtc(struct analogix_dp_device *dp,
}
static void analogix_dp_bridge_atomic_pre_enable(struct drm_bridge *bridge,
struct drm_atomic_state *old_state)
struct drm_atomic_commit *old_state)
{
struct analogix_dp_device *dp = to_dp(bridge);
struct drm_crtc *crtc;
@ -1163,7 +1163,7 @@ static void analogix_dp_bridge_mode_set(struct drm_bridge *bridge,
}
static void analogix_dp_bridge_atomic_enable(struct drm_bridge *bridge,
struct drm_atomic_state *old_state)
struct drm_atomic_commit *old_state)
{
struct analogix_dp_device *dp = to_dp(bridge);
struct drm_crtc *crtc;
@ -1228,7 +1228,7 @@ static void analogix_dp_bridge_disable(struct drm_bridge *bridge)
}
static void analogix_dp_bridge_atomic_disable(struct drm_bridge *bridge,
struct drm_atomic_state *old_state)
struct drm_atomic_commit *old_state)
{
struct analogix_dp_device *dp = to_dp(bridge);
struct drm_crtc *old_crtc, *new_crtc;
@ -1266,7 +1266,7 @@ static void analogix_dp_bridge_atomic_disable(struct drm_bridge *bridge,
}
static void analogix_dp_bridge_atomic_post_disable(struct drm_bridge *bridge,
struct drm_atomic_state *old_state)
struct drm_atomic_commit *old_state)
{
struct analogix_dp_device *dp = to_dp(bridge);
struct drm_crtc *crtc;

4
drivers/gpu/drm/bridge/analogix/anx7625.c
View File

@ -2559,7 +2559,7 @@ static int anx7625_bridge_atomic_check(struct drm_bridge *bridge,
}
static void anx7625_bridge_atomic_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct anx7625_data *ctx = bridge_to_anx7625(bridge);
struct device *dev = ctx->dev;
@ -2598,7 +2598,7 @@ static void anx7625_bridge_atomic_enable(struct drm_bridge *bridge,
}
static void anx7625_bridge_atomic_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct anx7625_data *ctx = bridge_to_anx7625(bridge);
struct device *dev = ctx->dev;

4
drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c
View File

@ -591,7 +591,7 @@ cdns_dsi_bridge_mode_valid(struct drm_bridge *bridge,
}
static void cdns_dsi_bridge_atomic_post_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct cdns_dsi_input *input = bridge_to_cdns_dsi_input(bridge);
struct cdns_dsi *dsi = input_to_dsi(input);
@ -701,7 +701,7 @@ static void cdns_dsi_init_link(struct cdns_dsi *dsi)
}
static void cdns_dsi_bridge_atomic_pre_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct cdns_dsi_input *input = bridge_to_cdns_dsi_input(bridge);
struct cdns_dsi *dsi = input_to_dsi(input);

6
drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
View File

@ -1750,7 +1750,7 @@ static void cdns_mhdp_sst_enable(struct cdns_mhdp_device *mhdp,
}
static void cdns_mhdp_atomic_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
struct cdns_mhdp_bridge_state *mhdp_state;
@ -1841,7 +1841,7 @@ static void cdns_mhdp_atomic_enable(struct drm_bridge *bridge,
}
static void cdns_mhdp_atomic_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
u32 resp;
@ -1963,7 +1963,7 @@ static int cdns_mhdp_atomic_check(struct drm_bridge *bridge,
struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
const struct drm_display_mode *mode = &crtc_state->adjusted_mode;
struct drm_connector_state *old_state, *new_state;
struct drm_atomic_state *state = crtc_state->state;
struct drm_atomic_commit *state = crtc_state->state;
struct drm_connector *conn = mhdp->connector;
u64 old_cp, new_cp;

6
drivers/gpu/drm/bridge/chipone-icn6211.c
View File

@ -341,7 +341,7 @@ static void chipone_configure_pll(struct chipone *icn,
}
static void chipone_atomic_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct chipone *icn = bridge_to_chipone(bridge);
struct drm_display_mode *mode = &icn->mode;
@ -444,7 +444,7 @@ static void chipone_atomic_enable(struct drm_bridge *bridge,
}
static void chipone_atomic_pre_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct chipone *icn = bridge_to_chipone(bridge);
int ret;
@ -481,7 +481,7 @@ static void chipone_atomic_pre_enable(struct drm_bridge *bridge,
}
static void chipone_atomic_post_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct chipone *icn = bridge_to_chipone(bridge);

4
drivers/gpu/drm/bridge/fsl-ldb.c
View File

@ -124,7 +124,7 @@ static int fsl_ldb_attach(struct drm_bridge *bridge,
}
static void fsl_ldb_atomic_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct fsl_ldb *fsl_ldb = to_fsl_ldb(bridge);
const struct drm_bridge_state *bridge_state;
@ -228,7 +228,7 @@ static void fsl_ldb_atomic_enable(struct drm_bridge *bridge,
}
static void fsl_ldb_atomic_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct fsl_ldb *fsl_ldb = to_fsl_ldb(bridge);

4
drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pvi.c
View File

@ -49,7 +49,7 @@ static int imx8mp_hdmi_pvi_bridge_attach(struct drm_bridge *bridge,
}
static void imx8mp_hdmi_pvi_bridge_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct imx8mp_hdmi_pvi *pvi = to_imx8mp_hdmi_pvi(bridge);
struct drm_connector_state *conn_state;
@ -89,7 +89,7 @@ static void imx8mp_hdmi_pvi_bridge_enable(struct drm_bridge *bridge,
}
static void imx8mp_hdmi_pvi_bridge_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct imx8mp_hdmi_pvi *pvi = to_imx8mp_hdmi_pvi(bridge);

4
drivers/gpu/drm/bridge/imx/imx8qm-ldb.c
View File

@ -201,7 +201,7 @@ imx8qm_ldb_bridge_mode_set(struct drm_bridge *bridge,
}
static void imx8qm_ldb_bridge_atomic_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct ldb_channel *ldb_ch = bridge->driver_private;
struct ldb *ldb = ldb_ch->ldb;
@ -247,7 +247,7 @@ static void imx8qm_ldb_bridge_atomic_enable(struct drm_bridge *bridge,
}
static void imx8qm_ldb_bridge_atomic_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct ldb_channel *ldb_ch = bridge->driver_private;
struct ldb *ldb = ldb_ch->ldb;

6
drivers/gpu/drm/bridge/imx/imx8qxp-ldb.c
View File

@ -216,7 +216,7 @@ imx8qxp_ldb_bridge_mode_set(struct drm_bridge *bridge,
}
static void imx8qxp_ldb_bridge_atomic_pre_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct ldb_channel *ldb_ch = bridge->driver_private;
struct ldb *ldb = ldb_ch->ldb;
@ -232,7 +232,7 @@ static void imx8qxp_ldb_bridge_atomic_pre_enable(struct drm_bridge *bridge,
}
static void imx8qxp_ldb_bridge_atomic_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct ldb_channel *ldb_ch = bridge->driver_private;
struct ldb *ldb = ldb_ch->ldb;
@ -266,7 +266,7 @@ static void imx8qxp_ldb_bridge_atomic_enable(struct drm_bridge *bridge,
}
static void imx8qxp_ldb_bridge_atomic_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct ldb_channel *ldb_ch = bridge->driver_private;
struct ldb *ldb = ldb_ch->ldb;

2
drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c
View File

@ -176,7 +176,7 @@ imx8qxp_pc_bridge_mode_set(struct drm_bridge *bridge,
}
static void imx8qxp_pc_bridge_atomic_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct imx8qxp_pc_channel *ch = bridge->driver_private;
struct imx8qxp_pc *pc = ch->pc;

4
drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c
View File

@ -154,7 +154,7 @@ imx8qxp_pixel_link_bridge_mode_set(struct drm_bridge *bridge,
}
static void imx8qxp_pixel_link_bridge_atomic_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct imx8qxp_pixel_link *pl = bridge->driver_private;
@ -164,7 +164,7 @@ static void imx8qxp_pixel_link_bridge_atomic_enable(struct drm_bridge *bridge,
}
static void imx8qxp_pixel_link_bridge_atomic_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct imx8qxp_pixel_link *pl = bridge->driver_private;

2
drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c
View File

@ -133,7 +133,7 @@ imx8qxp_pxl2dpi_bridge_mode_set(struct drm_bridge *bridge,
}
static void imx8qxp_pxl2dpi_bridge_atomic_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct imx8qxp_pxl2dpi *p2d = bridge->driver_private;

6
drivers/gpu/drm/bridge/inno-hdmi.c
View File

@ -756,7 +756,7 @@ static int inno_hdmi_config_video_timing(struct inno_hdmi *hdmi,
return 0;
}
static int inno_hdmi_setup(struct inno_hdmi *hdmi, struct drm_atomic_state *state)
static int inno_hdmi_setup(struct inno_hdmi *hdmi, struct drm_atomic_commit *state)
{
struct drm_bridge *bridge = &hdmi->bridge;
struct drm_connector *connector;
@ -863,7 +863,7 @@ inno_hdmi_bridge_edid_read(struct drm_bridge *bridge, struct drm_connector *conn
}
static void inno_hdmi_bridge_atomic_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct inno_hdmi *hdmi = bridge_to_inno_hdmi(bridge);
@ -871,7 +871,7 @@ static void inno_hdmi_bridge_atomic_enable(struct drm_bridge *bridge,
}
static void inno_hdmi_bridge_atomic_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct inno_hdmi *hdmi = bridge_to_inno_hdmi(bridge);

4
drivers/gpu/drm/bridge/ite-it6263.c
View File

@ -579,7 +579,7 @@ static int it6263_read_edid(void *data, u8 *buf, unsigned int block, size_t len)
}
static void it6263_bridge_atomic_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct it6263 *it = bridge_to_it6263(bridge);
@ -590,7 +590,7 @@ static void it6263_bridge_atomic_disable(struct drm_bridge *bridge,
}
static void it6263_bridge_atomic_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct it6263 *it = bridge_to_it6263(bridge);
const struct drm_crtc_state *crtc_state;

8
drivers/gpu/drm/bridge/ite-it6505.c
View File

@ -3119,7 +3119,7 @@ it6505_bridge_mode_valid(struct drm_bridge *bridge,
}
static void it6505_bridge_atomic_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct it6505 *it6505 = bridge_to_it6505(bridge);
struct device *dev = it6505->dev;
@ -3173,7 +3173,7 @@ static void it6505_bridge_atomic_enable(struct drm_bridge *bridge,
}
static void it6505_bridge_atomic_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct it6505 *it6505 = bridge_to_it6505(bridge);
struct device *dev = it6505->dev;
@ -3187,7 +3187,7 @@ static void it6505_bridge_atomic_disable(struct drm_bridge *bridge,
}
static void it6505_bridge_atomic_pre_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct it6505 *it6505 = bridge_to_it6505(bridge);
struct device *dev = it6505->dev;
@ -3198,7 +3198,7 @@ static void it6505_bridge_atomic_pre_enable(struct drm_bridge *bridge,
}
static void it6505_bridge_atomic_post_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct it6505 *it6505 = bridge_to_it6505(bridge);
struct device *dev = it6505->dev;

4
drivers/gpu/drm/bridge/ite-it66121.c
View File

@ -722,7 +722,7 @@ static u32 *it66121_bridge_atomic_get_input_bus_fmts(struct drm_bridge *bridge,
}
static void it66121_bridge_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct it66121_ctx *ctx = container_of(bridge, struct it66121_ctx, bridge);
@ -732,7 +732,7 @@ static void it66121_bridge_enable(struct drm_bridge *bridge,
}
static void it66121_bridge_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct it66121_ctx *ctx = container_of(bridge, struct it66121_ctx, bridge);

4
drivers/gpu/drm/bridge/lontium-lt9211.c
View File

@ -455,7 +455,7 @@ static int lt9211_configure_tx(struct lt9211 *ctx, bool jeida,
}
static void lt9211_atomic_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct lt9211 *ctx = bridge_to_lt9211(bridge);
const struct drm_bridge_state *bridge_state;
@ -552,7 +552,7 @@ static void lt9211_atomic_enable(struct drm_bridge *bridge,
}
static void lt9211_atomic_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct lt9211 *ctx = bridge_to_lt9211(bridge);
int ret;

8
drivers/gpu/drm/bridge/lontium-lt9611.c
View File

@ -657,7 +657,7 @@ lt9611_get_edid_block(void *data, u8 *buf, unsigned int block, size_t len)
/* bridge funcs */
static void lt9611_bridge_atomic_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct lt9611 *lt9611 = bridge_to_lt9611(bridge);
struct drm_connector *connector;
@ -704,7 +704,7 @@ static void lt9611_bridge_atomic_enable(struct drm_bridge *bridge,
}
static void lt9611_bridge_atomic_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct lt9611 *lt9611 = bridge_to_lt9611(bridge);
int ret;
@ -782,7 +782,7 @@ static enum drm_mode_status lt9611_bridge_mode_valid(struct drm_bridge *bridge,
}
static void lt9611_bridge_atomic_pre_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct lt9611 *lt9611 = bridge_to_lt9611(bridge);
static const struct reg_sequence reg_cfg[] = {
@ -802,7 +802,7 @@ static void lt9611_bridge_atomic_pre_enable(struct drm_bridge *bridge,
}
static void lt9611_bridge_atomic_post_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct lt9611 *lt9611 = bridge_to_lt9611(bridge);

4
drivers/gpu/drm/bridge/nwl-dsi.c
View File

@ -737,7 +737,7 @@ static int nwl_dsi_disable(struct nwl_dsi *dsi)
}
static void nwl_dsi_bridge_atomic_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct nwl_dsi *dsi = bridge_to_dsi(bridge);
int ret;
@ -898,7 +898,7 @@ nwl_dsi_bridge_mode_set(struct drm_bridge *bridge,
}
static void nwl_dsi_bridge_atomic_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct nwl_dsi *dsi = bridge_to_dsi(bridge);
int ret;

8
drivers/gpu/drm/bridge/panel.c
View File

@ -111,7 +111,7 @@ static void panel_bridge_detach(struct drm_bridge *bridge)
}
static void panel_bridge_atomic_pre_enable(struct drm_bridge *bridge,
struct drm_atomic_state *atomic_state)
struct drm_atomic_commit *atomic_state)
{
struct panel_bridge *panel_bridge = drm_bridge_to_panel_bridge(bridge);
struct drm_encoder *encoder = bridge->encoder;
@ -130,7 +130,7 @@ static void panel_bridge_atomic_pre_enable(struct drm_bridge *bridge,
}
static void panel_bridge_atomic_enable(struct drm_bridge *bridge,
struct drm_atomic_state *atomic_state)
struct drm_atomic_commit *atomic_state)
{
struct panel_bridge *panel_bridge = drm_bridge_to_panel_bridge(bridge);
struct drm_encoder *encoder = bridge->encoder;
@ -149,7 +149,7 @@ static void panel_bridge_atomic_enable(struct drm_bridge *bridge,
}
static void panel_bridge_atomic_disable(struct drm_bridge *bridge,
struct drm_atomic_state *atomic_state)
struct drm_atomic_commit *atomic_state)
{
struct panel_bridge *panel_bridge = drm_bridge_to_panel_bridge(bridge);
struct drm_encoder *encoder = bridge->encoder;
@ -168,7 +168,7 @@ static void panel_bridge_atomic_disable(struct drm_bridge *bridge,
}
static void panel_bridge_atomic_post_disable(struct drm_bridge *bridge,
struct drm_atomic_state *atomic_state)
struct drm_atomic_commit *atomic_state)
{
struct panel_bridge *panel_bridge = drm_bridge_to_panel_bridge(bridge);
struct drm_encoder *encoder = bridge->encoder;

4
drivers/gpu/drm/bridge/parade-ps8640.c
View File

@ -437,7 +437,7 @@ static const struct dev_pm_ops ps8640_pm_ops = {
};
static void ps8640_atomic_pre_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct ps8640 *ps_bridge = bridge_to_ps8640(bridge);
struct regmap *map = ps_bridge->regmap[PAGE2_TOP_CNTL];
@ -472,7 +472,7 @@ static void ps8640_atomic_pre_enable(struct drm_bridge *bridge,
}
static void ps8640_atomic_post_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct ps8640 *ps_bridge = bridge_to_ps8640(bridge);

8
drivers/gpu/drm/bridge/samsung-dsim.c
View File

@ -1640,7 +1640,7 @@ static int samsung_dsim_init(struct samsung_dsim *dsi)
}
static void samsung_dsim_atomic_pre_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct samsung_dsim *dsi = bridge_to_dsi(bridge);
int ret;
@ -1668,7 +1668,7 @@ static void samsung_dsim_atomic_pre_enable(struct drm_bridge *bridge,
}
static void samsung_dsim_atomic_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct samsung_dsim *dsi = bridge_to_dsi(bridge);
@ -1679,7 +1679,7 @@ static void samsung_dsim_atomic_enable(struct drm_bridge *bridge,
}
static void samsung_dsim_atomic_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct samsung_dsim *dsi = bridge_to_dsi(bridge);
@ -1691,7 +1691,7 @@ static void samsung_dsim_atomic_disable(struct drm_bridge *bridge,
}
static void samsung_dsim_atomic_post_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct samsung_dsim *dsi = bridge_to_dsi(bridge);

4
drivers/gpu/drm/bridge/sii902x.c
View File

@ -321,7 +321,7 @@ static const struct drm_connector_helper_funcs sii902x_connector_helper_funcs =
};
static void sii902x_bridge_atomic_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct sii902x *sii902x = bridge_to_sii902x(bridge);
@ -335,7 +335,7 @@ static void sii902x_bridge_atomic_disable(struct drm_bridge *bridge,
}
static void sii902x_bridge_atomic_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct sii902x *sii902x = bridge_to_sii902x(bridge);
struct drm_connector *connector;

6
drivers/gpu/drm/bridge/ssd2825.c
View File

@ -482,7 +482,7 @@ static int ssd2825_setup_pll(struct ssd2825_priv *priv,
}
static void ssd2825_bridge_atomic_pre_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct ssd2825_priv *priv = bridge_to_ssd2825(bridge);
struct mipi_dsi_device *dsi_dev = priv->output.dev;
@ -585,7 +585,7 @@ static void ssd2825_bridge_atomic_pre_enable(struct drm_bridge *bridge,
}
static void ssd2825_bridge_atomic_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct ssd2825_priv *priv = bridge_to_ssd2825(bridge);
struct mipi_dsi_device *dsi_dev = priv->output.dev;
@ -607,7 +607,7 @@ static void ssd2825_bridge_atomic_enable(struct drm_bridge *bridge,
}
static void ssd2825_bridge_atomic_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct ssd2825_priv *priv = bridge_to_ssd2825(bridge);
int ret;

4
drivers/gpu/drm/bridge/synopsys/dw-dp.c
View File

@ -1644,7 +1644,7 @@ static int dw_dp_link_enable(struct dw_dp *dp)
}
static void dw_dp_bridge_atomic_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct dw_dp *dp = bridge_to_dp(bridge);
struct drm_connector *connector;
@ -1697,7 +1697,7 @@ static void dw_dp_reset(struct dw_dp *dp)
}
static void dw_dp_bridge_atomic_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct dw_dp *dp = bridge_to_dp(bridge);

4
drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c
View File

@ -750,7 +750,7 @@ static struct i2c_adapter *dw_hdmi_qp_i2c_adapter(struct dw_hdmi_qp *hdmi)
}
static void dw_hdmi_qp_bridge_atomic_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct dw_hdmi_qp *hdmi = bridge->driver_private;
struct drm_connector_state *conn_state;
@ -785,7 +785,7 @@ static void dw_hdmi_qp_bridge_atomic_enable(struct drm_bridge *bridge,
}
static void dw_hdmi_qp_bridge_atomic_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct dw_hdmi_qp *hdmi = bridge->driver_private;

6
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
View File

@ -2529,7 +2529,7 @@ static int dw_hdmi_connector_get_modes(struct drm_connector *connector)
}
static int dw_hdmi_connector_atomic_check(struct drm_connector *connector,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_connector_state *old_state =
drm_atomic_get_old_connector_state(state, connector);
@ -2962,7 +2962,7 @@ static void dw_hdmi_bridge_mode_set(struct drm_bridge *bridge,
}
static void dw_hdmi_bridge_atomic_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct dw_hdmi *hdmi = bridge->driver_private;
@ -2976,7 +2976,7 @@ static void dw_hdmi_bridge_atomic_disable(struct drm_bridge *bridge,
}
static void dw_hdmi_bridge_atomic_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct dw_hdmi *hdmi = bridge->driver_private;
struct drm_connector *connector;

6
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c
View File

@ -939,7 +939,7 @@ static void dw_mipi_dsi_clear_err(struct dw_mipi_dsi *dsi)
}
static void dw_mipi_dsi_bridge_post_atomic_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct dw_mipi_dsi *dsi = bridge_to_dsi(bridge);
const struct dw_mipi_dsi_phy_ops *phy_ops = dsi->plat_data->phy_ops;
@ -1027,7 +1027,7 @@ static void dw_mipi_dsi_mode_set(struct dw_mipi_dsi *dsi,
}
static void dw_mipi_dsi_bridge_atomic_pre_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct dw_mipi_dsi *dsi = bridge_to_dsi(bridge);
@ -1048,7 +1048,7 @@ static void dw_mipi_dsi_bridge_mode_set(struct drm_bridge *bridge,
}
static void dw_mipi_dsi_bridge_atomic_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct dw_mipi_dsi *dsi = bridge_to_dsi(bridge);

6
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c
View File

@ -750,7 +750,7 @@ static int dw_mipi_dsi2_bridge_atomic_check(struct drm_bridge *bridge,
}
static void dw_mipi_dsi2_bridge_post_atomic_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct dw_mipi_dsi2 *dsi2 = bridge_to_dsi2(bridge);
const struct dw_mipi_dsi2_phy_ops *phy_ops = dsi2->plat_data->phy_ops;
@ -826,7 +826,7 @@ static void dw_mipi_dsi2_mode_set(struct dw_mipi_dsi2 *dsi2,
}
static void dw_mipi_dsi2_bridge_atomic_pre_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct dw_mipi_dsi2 *dsi2 = bridge_to_dsi2(bridge);
@ -845,7 +845,7 @@ static void dw_mipi_dsi2_bridge_mode_set(struct drm_bridge *bridge,
}
static void dw_mipi_dsi2_bridge_atomic_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct dw_mipi_dsi2 *dsi2 = bridge_to_dsi2(bridge);

6
drivers/gpu/drm/bridge/tc358762.c
View File

@ -150,7 +150,7 @@ static int tc358762_init(struct tc358762 *ctx)
}
static void tc358762_post_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct tc358762 *ctx = bridge_to_tc358762(bridge);
int ret;
@ -173,7 +173,7 @@ static void tc358762_post_disable(struct drm_bridge *bridge,
}
static void tc358762_pre_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct tc358762 *ctx = bridge_to_tc358762(bridge);
int ret;
@ -191,7 +191,7 @@ static void tc358762_pre_enable(struct drm_bridge *bridge,
}
static void tc358762_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct tc358762 *ctx = bridge_to_tc358762(bridge);
int ret;

8
drivers/gpu/drm/bridge/tc358767.c
View File

@ -1557,7 +1557,7 @@ static int tc_edp_stream_disable(struct tc_data *tc)
}
static void tc_dpi_bridge_atomic_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct tc_data *tc = bridge_to_tc(bridge);
@ -1572,7 +1572,7 @@ static void tc_dpi_bridge_atomic_enable(struct drm_bridge *bridge,
}
static void tc_dpi_bridge_atomic_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct tc_data *tc = bridge_to_tc(bridge);
int ret;
@ -1583,7 +1583,7 @@ static void tc_dpi_bridge_atomic_disable(struct drm_bridge *bridge,
}
static void tc_edp_bridge_atomic_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct tc_data *tc = bridge_to_tc(bridge);
int ret;
@ -1609,7 +1609,7 @@ static void tc_edp_bridge_atomic_enable(struct drm_bridge *bridge,
}
static void tc_edp_bridge_atomic_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct tc_data *tc = bridge_to_tc(bridge);
int ret;

8
drivers/gpu/drm/bridge/tc358768.c
View File

@ -582,7 +582,7 @@ tc358768_bridge_mode_valid(struct drm_bridge *bridge,
}
static void tc358768_bridge_atomic_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct tc358768_priv *priv = bridge_to_tc358768(bridge);
int ret;
@ -605,7 +605,7 @@ static void tc358768_bridge_atomic_disable(struct drm_bridge *bridge,
}
static void tc358768_bridge_atomic_post_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct tc358768_priv *priv = bridge_to_tc358768(bridge);
@ -686,7 +686,7 @@ static u32 tc358768_dsi_bytes_to_ns(struct tc358768_priv *priv, u32 val)
}
static void tc358768_bridge_atomic_pre_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct tc358768_priv *priv = bridge_to_tc358768(bridge);
struct mipi_dsi_device *dsi_dev = priv->output.dev;
@ -1091,7 +1091,7 @@ static void tc358768_bridge_atomic_pre_enable(struct drm_bridge *bridge,
}
static void tc358768_bridge_atomic_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct tc358768_priv *priv = bridge_to_tc358768(bridge);
int ret;

6
drivers/gpu/drm/bridge/tc358775.c
View File

@ -287,7 +287,7 @@ static inline struct tc_data *bridge_to_tc(struct drm_bridge *b)
}
static void tc_bridge_atomic_pre_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct tc_data *tc = bridge_to_tc(bridge);
struct device *dev = &tc->dsi->dev;
@ -311,7 +311,7 @@ static void tc_bridge_atomic_pre_enable(struct drm_bridge *bridge,
}
static void tc_bridge_atomic_post_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct tc_data *tc = bridge_to_tc(bridge);
struct device *dev = &tc->dsi->dev;
@ -371,7 +371,7 @@ static void d2l_write(struct i2c_client *i2c, u16 addr, u32 val)
}
static void tc_bridge_atomic_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct tc_data *tc = bridge_to_tc(bridge);
u32 hback_porch, hsync_len, hfront_porch, hactive, htime1, htime2;

6
drivers/gpu/drm/bridge/ti-dlpc3433.c
View File

@ -105,7 +105,7 @@ static const struct regmap_config dlpc_regmap_config = {
};
static void dlpc_atomic_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct dlpc *dlpc = bridge_to_dlpc(bridge);
struct device *dev = dlpc->dev;
@ -170,7 +170,7 @@ static void dlpc_atomic_enable(struct drm_bridge *bridge,
}
static void dlpc_atomic_pre_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct dlpc *dlpc = bridge_to_dlpc(bridge);
int ret;
@ -193,7 +193,7 @@ static void dlpc_atomic_pre_enable(struct drm_bridge *bridge,
}
static void dlpc_atomic_post_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct dlpc *dlpc = bridge_to_dlpc(bridge);

6
drivers/gpu/drm/bridge/ti-sn65dsi83.c
View File

@ -514,7 +514,7 @@ static void sn65dsi83_release_resources(void *data)
}
static void sn65dsi83_atomic_pre_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct sn65dsi83 *ctx = bridge_to_sn65dsi83(bridge);
const unsigned int dual_factor = ctx->lvds_dual_link ? 2 : 1;
@ -696,7 +696,7 @@ static void sn65dsi83_atomic_pre_enable(struct drm_bridge *bridge,
}
static void sn65dsi83_atomic_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct sn65dsi83 *ctx = bridge_to_sn65dsi83(bridge);
unsigned int pval;
@ -728,7 +728,7 @@ static void sn65dsi83_atomic_enable(struct drm_bridge *bridge,
}
static void sn65dsi83_atomic_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct sn65dsi83 *ctx = bridge_to_sn65dsi83(bridge);
int idx;

22
drivers/gpu/drm/bridge/ti-sn65dsi86.c
View File

@ -278,7 +278,7 @@ static void ti_sn65dsi86_write_u16(struct ti_sn65dsi86 *pdata,
static struct drm_display_mode *
get_new_adjusted_display_mode(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_connector *connector =
drm_atomic_get_new_connector_for_encoder(state, bridge->encoder);
@ -291,7 +291,7 @@ get_new_adjusted_display_mode(struct drm_bridge *bridge,
}
static u32 ti_sn_bridge_get_dsi_freq(struct ti_sn65dsi86 *pdata,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
u32 bit_rate_khz, clk_freq_khz;
struct drm_display_mode *mode =
@ -323,7 +323,7 @@ static const u32 ti_sn_bridge_dsiclk_lut[] = {
};
static void ti_sn_bridge_set_refclk_freq(struct ti_sn65dsi86 *pdata,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
int i;
u32 refclk_rate;
@ -361,7 +361,7 @@ static void ti_sn_bridge_set_refclk_freq(struct ti_sn65dsi86 *pdata,
}
static void ti_sn65dsi86_enable_comms(struct ti_sn65dsi86 *pdata,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
mutex_lock(&pdata->comms_mutex);
@ -826,7 +826,7 @@ ti_sn_bridge_mode_valid(struct drm_bridge *bridge,
}
static void ti_sn_bridge_atomic_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct ti_sn65dsi86 *pdata = bridge_to_ti_sn65dsi86(bridge);
@ -835,7 +835,7 @@ static void ti_sn_bridge_atomic_disable(struct drm_bridge *bridge,
}
static void ti_sn_bridge_set_dsi_rate(struct ti_sn65dsi86 *pdata,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
unsigned int bit_rate_mhz, clk_freq_mhz;
unsigned int val;
@ -871,7 +871,7 @@ static const unsigned int ti_sn_bridge_dp_rate_lut[] = {
};
static int ti_sn_bridge_calc_min_dp_rate_idx(struct ti_sn65dsi86 *pdata,
struct drm_atomic_state *state,
struct drm_atomic_commit *state,
unsigned int bpp)
{
unsigned int bit_rate_khz, dp_rate_mhz;
@ -977,7 +977,7 @@ static unsigned int ti_sn_bridge_read_valid_rates(struct ti_sn65dsi86 *pdata)
}
static void ti_sn_bridge_set_video_timings(struct ti_sn65dsi86 *pdata,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_display_mode *mode =
get_new_adjusted_display_mode(&pdata->bridge, state);
@ -1090,7 +1090,7 @@ static int ti_sn_link_training(struct ti_sn65dsi86 *pdata, int dp_rate_idx,
}
static void ti_sn_bridge_atomic_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct ti_sn65dsi86 *pdata = bridge_to_ti_sn65dsi86(bridge);
struct drm_connector *connector;
@ -1181,7 +1181,7 @@ static void ti_sn_bridge_atomic_enable(struct drm_bridge *bridge,
}
static void ti_sn_bridge_atomic_pre_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct ti_sn65dsi86 *pdata = bridge_to_ti_sn65dsi86(bridge);
@ -1195,7 +1195,7 @@ static void ti_sn_bridge_atomic_pre_enable(struct drm_bridge *bridge,
}
static void ti_sn_bridge_atomic_post_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct ti_sn65dsi86 *pdata = bridge_to_ti_sn65dsi86(bridge);

4
drivers/gpu/drm/bridge/ti-tdp158.c
View File

@ -19,7 +19,7 @@ struct tdp158 {
};
static void tdp158_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
int err;
struct tdp158 *tdp158 = bridge->driver_private;
@ -36,7 +36,7 @@ static void tdp158_enable(struct drm_bridge *bridge,
}
static void tdp158_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct tdp158 *tdp158 = bridge->driver_private;

20
drivers/gpu/drm/ci/xfails/vkms-none-skips.txt
View File

@ -288,8 +288,8 @@ kms_cursor_edge_walk@128x128-left-edge
# ? __pfx_drm_property_free_blob+0x10/0x10
# ? vkms_atomic_crtc_destroy_state+0x31/0x40 [vkms]
# ? vkms_atomic_crtc_destroy_state+0x10/0x40 [vkms]
# drm_atomic_state_default_clear+0x137/0x2f0
# __drm_atomic_state_free+0x6c/0xb0
# drm_atomic_commit_default_clear+0x137/0x2f0
# __drm_atomic_commit_free+0x6c/0xb0
# drm_atomic_helper_update_plane+0x100/0x150
# drm_mode_cursor_universal+0x10e/0x270
# drm_mode_cursor_common+0x115/0x240
@ -394,8 +394,8 @@ kms_cursor_edge_walk@128x128-left-edge
# ? __pfx_drm_property_free_blob+0x10/0x10
# ? vkms_atomic_crtc_destroy_state+0x31/0x40 [vkms]
# ? vkms_atomic_crtc_destroy_state+0x10/0x40 [vkms]
# drm_atomic_state_default_clear+0x137/0x2f0
# __drm_atomic_state_free+0x6c/0xb0
# drm_atomic_commit_default_clear+0x137/0x2f0
# __drm_atomic_commit_free+0x6c/0xb0
# drm_atomic_helper_update_plane+0x100/0x150
# drm_mode_cursor_universal+0x10e/0x270
# drm_mode_cursor_common+0x115/0x240
@ -500,8 +500,8 @@ kms_cursor_edge_walk@128x128-left-edge
# ? __pfx_drm_property_free_blob+0x10/0x10
# ? vkms_atomic_crtc_destroy_state+0x31/0x40 [vkms]
# ? vkms_atomic_crtc_destroy_state+0x10/0x40 [vkms]
# drm_atomic_state_default_clear+0x137/0x2f0
# __drm_atomic_state_free+0x6c/0xb0
# drm_atomic_commit_default_clear+0x137/0x2f0
# __drm_atomic_commit_free+0x6c/0xb0
# drm_atomic_helper_update_plane+0x100/0x150
# drm_mode_cursor_universal+0x10e/0x270
# drm_mode_cursor_common+0x115/0x240
@ -606,8 +606,8 @@ kms_cursor_edge_walk@128x128-left-edge
# ? __pfx_drm_property_free_blob+0x10/0x10
# ? vkms_atomic_crtc_destroy_state+0x31/0x40 [vkms]
# ? vkms_atomic_crtc_destroy_state+0x10/0x40 [vkms]
# drm_atomic_state_default_clear+0x137/0x2f0
# __drm_atomic_state_free+0x6c/0xb0
# drm_atomic_commit_default_clear+0x137/0x2f0
# __drm_atomic_commit_free+0x6c/0xb0
# drm_atomic_helper_update_plane+0x100/0x150
# drm_mode_cursor_universal+0x10e/0x270
# drm_mode_cursor_common+0x115/0x240
@ -712,8 +712,8 @@ kms_cursor_edge_walk@128x128-left-edge
# ? __pfx_drm_property_free_blob+0x10/0x10
# ? vkms_atomic_crtc_destroy_state+0x31/0x40 [vkms]
# ? vkms_atomic_crtc_destroy_state+0x10/0x40 [vkms]
# drm_atomic_state_default_clear+0x137/0x2f0
# __drm_atomic_state_free+0x6c/0xb0
# drm_atomic_commit_default_clear+0x137/0x2f0
# __drm_atomic_commit_free+0x6c/0xb0
# drm_atomic_helper_update_plane+0x100/0x150
# drm_mode_cursor_universal+0x10e/0x270
# drm_mode_cursor_common+0x115/0x240

2
drivers/gpu/drm/display/drm_bridge_connector.c
View File

@ -371,7 +371,7 @@ drm_bridge_connector_mode_valid(struct drm_connector *connector,
}
static int drm_bridge_connector_atomic_check(struct drm_connector *connector,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_bridge_connector *bridge_connector =
to_drm_bridge_connector(connector);

26
drivers/gpu/drm/display/drm_dp_mst_topology.c
View File

@ -4433,7 +4433,7 @@ EXPORT_SYMBOL(drm_dp_mst_get_edid);
* Total slots in the atomic state assigned for this port, or a negative error
* code if the port no longer exists
*/
int drm_dp_atomic_find_time_slots(struct drm_atomic_state *state,
int drm_dp_atomic_find_time_slots(struct drm_atomic_commit *state,
struct drm_dp_mst_topology_mgr *mgr,
struct drm_dp_mst_port *port, int pbn)
{
@ -4523,7 +4523,7 @@ EXPORT_SYMBOL(drm_dp_atomic_find_time_slots);
* Returns:
* 0 on success, negative error code otherwise
*/
int drm_dp_atomic_release_time_slots(struct drm_atomic_state *state,
int drm_dp_atomic_release_time_slots(struct drm_atomic_commit *state,
struct drm_dp_mst_topology_mgr *mgr,
struct drm_dp_mst_port *port)
{
@ -4591,7 +4591,7 @@ EXPORT_SYMBOL(drm_dp_atomic_release_time_slots);
* Returns:
* 0 if all CRTC commits were retrieved successfully, negative error code otherwise
*/
int drm_dp_mst_atomic_setup_commit(struct drm_atomic_state *state)
int drm_dp_mst_atomic_setup_commit(struct drm_atomic_commit *state)
{
struct drm_dp_mst_topology_mgr *mgr;
struct drm_dp_mst_topology_state *mst_state;
@ -4641,7 +4641,7 @@ EXPORT_SYMBOL(drm_dp_mst_atomic_setup_commit);
* All MST drivers must call this function after calling drm_atomic_helper_wait_for_dependencies(),
* or whatever their equivalent of that is.
*/
void drm_dp_mst_atomic_wait_for_dependencies(struct drm_atomic_state *state)
void drm_dp_mst_atomic_wait_for_dependencies(struct drm_atomic_commit *state)
{
struct drm_dp_mst_topology_state *old_mst_state, *new_mst_state;
struct drm_dp_mst_topology_mgr *mgr;
@ -4698,7 +4698,7 @@ EXPORT_SYMBOL(drm_dp_mst_atomic_wait_for_dependencies);
int drm_dp_mst_root_conn_atomic_check(struct drm_connector_state *new_conn_state,
struct drm_dp_mst_topology_mgr *mgr)
{
struct drm_atomic_state *state = new_conn_state->state;
struct drm_atomic_commit *state = new_conn_state->state;
struct drm_connector_state *old_conn_state =
drm_atomic_get_old_connector_state(state, new_conn_state->connector);
struct drm_crtc_state *crtc_state;
@ -5436,7 +5436,7 @@ drm_dp_mst_atomic_check_payload_alloc_limits(struct drm_dp_mst_topology_mgr *mgr
* See also:
* drm_dp_mst_atomic_enable_dsc()
*/
int drm_dp_mst_add_affected_dsc_crtcs(struct drm_atomic_state *state, struct drm_dp_mst_topology_mgr *mgr)
int drm_dp_mst_add_affected_dsc_crtcs(struct drm_atomic_commit *state, struct drm_dp_mst_topology_mgr *mgr)
{
struct drm_dp_mst_topology_state *mst_state;
struct drm_dp_mst_atomic_payload *pos;
@ -5486,7 +5486,7 @@ EXPORT_SYMBOL(drm_dp_mst_add_affected_dsc_crtcs);
/**
* drm_dp_mst_atomic_enable_dsc - Set DSC Enable Flag to On/Off
* @state: Pointer to the new drm_atomic_state
* @state: Pointer to the new drm_atomic_commit
* @port: Pointer to the affected MST Port
* @pbn: Newly recalculated bw required for link with DSC enabled
* @enable: Boolean flag to enable or disable DSC on the port
@ -5497,7 +5497,7 @@ EXPORT_SYMBOL(drm_dp_mst_add_affected_dsc_crtcs);
* ports have DSC enabled
*
*/
int drm_dp_mst_atomic_enable_dsc(struct drm_atomic_state *state,
int drm_dp_mst_atomic_enable_dsc(struct drm_atomic_commit *state,
struct drm_dp_mst_port *port,
int pbn, bool enable)
{
@ -5576,7 +5576,7 @@ EXPORT_SYMBOL(drm_dp_mst_atomic_enable_dsc);
* - %-EINVAL, if the new state is invalid, because the root port has
* too many payloads.
*/
int drm_dp_mst_atomic_check_mgr(struct drm_atomic_state *state,
int drm_dp_mst_atomic_check_mgr(struct drm_atomic_commit *state,
struct drm_dp_mst_topology_mgr *mgr,
struct drm_dp_mst_topology_state *mst_state,
struct drm_dp_mst_port **failing_port)
@ -5623,7 +5623,7 @@ EXPORT_SYMBOL(drm_dp_mst_atomic_check_mgr);
* Returns:
* 0 if the new state is valid, negative error code otherwise.
*/
int drm_dp_mst_atomic_check(struct drm_atomic_state *state)
int drm_dp_mst_atomic_check(struct drm_atomic_commit *state)
{
struct drm_dp_mst_topology_mgr *mgr;
struct drm_dp_mst_topology_state *mst_state;
@ -5660,7 +5660,7 @@ EXPORT_SYMBOL(drm_dp_mst_topology_state_funcs);
* RETURNS:
* The MST topology state or error pointer.
*/
struct drm_dp_mst_topology_state *drm_atomic_get_mst_topology_state(struct drm_atomic_state *state,
struct drm_dp_mst_topology_state *drm_atomic_get_mst_topology_state(struct drm_atomic_commit *state,
struct drm_dp_mst_topology_mgr *mgr)
{
return to_dp_mst_topology_state(drm_atomic_get_private_obj_state(state, &mgr->base));
@ -5681,7 +5681,7 @@ EXPORT_SYMBOL(drm_atomic_get_mst_topology_state);
* in the global atomic state
*/
struct drm_dp_mst_topology_state *
drm_atomic_get_old_mst_topology_state(struct drm_atomic_state *state,
drm_atomic_get_old_mst_topology_state(struct drm_atomic_commit *state,
struct drm_dp_mst_topology_mgr *mgr)
{
struct drm_private_state *old_priv_state =
@ -5705,7 +5705,7 @@ EXPORT_SYMBOL(drm_atomic_get_old_mst_topology_state);
* in the global atomic state
*/
struct drm_dp_mst_topology_state *
drm_atomic_get_new_mst_topology_state(struct drm_atomic_state *state,
drm_atomic_get_new_mst_topology_state(struct drm_atomic_commit *state,
struct drm_dp_mst_topology_mgr *mgr)
{
struct drm_private_state *new_priv_state =

14
drivers/gpu/drm/display/drm_dp_tunnel.c
View File

@ -1369,7 +1369,7 @@ int drm_dp_tunnel_available_bw(const struct drm_dp_tunnel *tunnel)
EXPORT_SYMBOL(drm_dp_tunnel_available_bw);
static struct drm_dp_tunnel_group_state *
drm_dp_tunnel_atomic_get_group_state(struct drm_atomic_state *state,
drm_dp_tunnel_atomic_get_group_state(struct drm_atomic_commit *state,
const struct drm_dp_tunnel *tunnel)
{
return (struct drm_dp_tunnel_group_state *)
@ -1528,7 +1528,7 @@ static const struct drm_private_state_funcs tunnel_group_funcs = {
* Return the state or an ERR_PTR() error on failure.
*/
struct drm_dp_tunnel_state *
drm_dp_tunnel_atomic_get_state(struct drm_atomic_state *state,
drm_dp_tunnel_atomic_get_state(struct drm_atomic_commit *state,
struct drm_dp_tunnel *tunnel)
{
struct drm_dp_tunnel_group_state *group_state;
@ -1556,7 +1556,7 @@ EXPORT_SYMBOL(drm_dp_tunnel_atomic_get_state);
* Return the old state or NULL if the tunnel's atomic state is not in @state.
*/
struct drm_dp_tunnel_state *
drm_dp_tunnel_atomic_get_old_state(struct drm_atomic_state *state,
drm_dp_tunnel_atomic_get_old_state(struct drm_atomic_commit *state,
const struct drm_dp_tunnel *tunnel)
{
struct drm_dp_tunnel_group_state *old_group_state;
@ -1580,7 +1580,7 @@ EXPORT_SYMBOL(drm_dp_tunnel_atomic_get_old_state);
* Return the new state or NULL if the tunnel's atomic state is not in @state.
*/
struct drm_dp_tunnel_state *
drm_dp_tunnel_atomic_get_new_state(struct drm_atomic_state *state,
drm_dp_tunnel_atomic_get_new_state(struct drm_atomic_commit *state,
const struct drm_dp_tunnel *tunnel)
{
struct drm_dp_tunnel_group_state *new_group_state;
@ -1706,7 +1706,7 @@ static int clear_stream_bw(struct drm_dp_tunnel_state *tunnel_state,
*
* Returns 0 in case of success, a negative error code otherwise.
*/
int drm_dp_tunnel_atomic_set_stream_bw(struct drm_atomic_state *state,
int drm_dp_tunnel_atomic_set_stream_bw(struct drm_atomic_commit *state,
struct drm_dp_tunnel *tunnel,
u8 stream_id, int bw)
{
@ -1783,7 +1783,7 @@ EXPORT_SYMBOL(drm_dp_tunnel_atomic_get_required_bw);
* Return 0 in case of success - with the stream IDs in @stream_mask - or a
* negative error code in case of failure.
*/
int drm_dp_tunnel_atomic_get_group_streams_in_state(struct drm_atomic_state *state,
int drm_dp_tunnel_atomic_get_group_streams_in_state(struct drm_atomic_commit *state,
const struct drm_dp_tunnel *tunnel,
u32 *stream_mask)
{
@ -1861,7 +1861,7 @@ drm_dp_tunnel_atomic_check_group_bw(struct drm_dp_tunnel_group_state *new_group_
* check failed - with @failed_stream_mask containing the streams failing the
* check - or a negative error code otherwise.
*/
int drm_dp_tunnel_atomic_check_stream_bws(struct drm_atomic_state *state,
int drm_dp_tunnel_atomic_check_stream_bws(struct drm_atomic_commit *state,
u32 *failed_stream_mask)
{
struct drm_dp_tunnel_group_state *new_group_state;

6
drivers/gpu/drm/display/drm_hdmi_state_helper.c
View File

@ -348,7 +348,7 @@ output_color_format_to_hdmi_colorspace(const struct drm_connector *connector,
static const struct drm_display_mode *
connector_state_get_mode(const struct drm_connector_state *conn_state)
{
struct drm_atomic_state *state;
struct drm_atomic_commit *state;
struct drm_crtc_state *crtc_state;
struct drm_crtc *crtc;
@ -858,7 +858,7 @@ hdmi_generate_infoframes(const struct drm_connector *connector,
* Zero on success, or an errno code otherwise.
*/
int drm_atomic_helper_connector_hdmi_check(struct drm_connector *connector,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_connector_state *old_conn_state =
drm_atomic_get_old_connector_state(state, connector);
@ -1000,7 +1000,7 @@ static int write_or_clear_infoframe(struct drm_connector *connector,
* Zero on success, error code on failure.
*/
int drm_atomic_helper_connector_hdmi_update_infoframes(struct drm_connector *connector,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
const struct drm_connector_hdmi_funcs *funcs = connector->hdmi.funcs;
struct drm_connector_state *old_conn_state =

128
drivers/gpu/drm/drm_atomic.c
View File

@ -95,15 +95,15 @@ int drm_crtc_commit_wait(struct drm_crtc_commit *commit)
EXPORT_SYMBOL(drm_crtc_commit_wait);
/**
* drm_atomic_state_default_release -
* release memory initialized by drm_atomic_state_init
* drm_atomic_commit_default_release -
* release memory initialized by drm_atomic_commit_init
* @state: atomic state
*
* Free all the memory allocated by drm_atomic_state_init.
* Free all the memory allocated by drm_atomic_commit_init.
* This should only be used by drivers which are still subclassing
* &drm_atomic_state and haven't switched to &drm_private_state yet.
* &drm_atomic_commit and haven't switched to &drm_private_state yet.
*/
void drm_atomic_state_default_release(struct drm_atomic_state *state)
void drm_atomic_commit_default_release(struct drm_atomic_commit *state)
{
kfree(state->connectors);
kfree(state->crtcs);
@ -111,19 +111,19 @@ void drm_atomic_state_default_release(struct drm_atomic_state *state)
kfree(state->colorops);
kfree(state->private_objs);
}
EXPORT_SYMBOL(drm_atomic_state_default_release);
EXPORT_SYMBOL(drm_atomic_commit_default_release);
/**
* drm_atomic_state_init - init new atomic state
* drm_atomic_commit_init - init new atomic state
* @dev: DRM device
* @state: atomic state
*
* Default implementation for filling in a new atomic state.
* This should only be used by drivers which are still subclassing
* &drm_atomic_state and haven't switched to &drm_private_state yet.
* &drm_atomic_commit and haven't switched to &drm_private_state yet.
*/
int
drm_atomic_state_init(struct drm_device *dev, struct drm_atomic_state *state)
drm_atomic_commit_init(struct drm_device *dev, struct drm_atomic_commit *state)
{
kref_init(&state->ref);
@ -145,7 +145,7 @@ drm_atomic_state_init(struct drm_device *dev, struct drm_atomic_state *state)
goto fail;
/*
* Because drm_atomic_state can be committed asynchronously we need our
* Because drm_atomic_commit can be committed asynchronously we need our
* own reference and cannot rely on the on implied by drm_file in the
* ioctl call.
*/
@ -156,29 +156,29 @@ drm_atomic_state_init(struct drm_device *dev, struct drm_atomic_state *state)
return 0;
fail:
drm_atomic_state_default_release(state);
drm_atomic_commit_default_release(state);
return -ENOMEM;
}
EXPORT_SYMBOL(drm_atomic_state_init);
EXPORT_SYMBOL(drm_atomic_commit_init);
/**
* drm_atomic_state_alloc - allocate atomic state
* drm_atomic_commit_alloc - allocate atomic state
* @dev: DRM device
*
* This allocates an empty atomic state to track updates.
*/
struct drm_atomic_state *
drm_atomic_state_alloc(struct drm_device *dev)
struct drm_atomic_commit *
drm_atomic_commit_alloc(struct drm_device *dev)
{
struct drm_mode_config *config = &dev->mode_config;
if (!config->funcs->atomic_state_alloc) {
struct drm_atomic_state *state;
struct drm_atomic_commit *state;
state = kzalloc_obj(*state);
if (!state)
return NULL;
if (drm_atomic_state_init(dev, state) < 0) {
if (drm_atomic_commit_init(dev, state) < 0) {
kfree(state);
return NULL;
}
@ -187,17 +187,17 @@ drm_atomic_state_alloc(struct drm_device *dev)
return config->funcs->atomic_state_alloc(dev);
}
EXPORT_SYMBOL(drm_atomic_state_alloc);
EXPORT_SYMBOL(drm_atomic_commit_alloc);
/**
* drm_atomic_state_default_clear - clear base atomic state
* drm_atomic_commit_default_clear - clear base atomic state
* @state: atomic state
*
* Default implementation for clearing atomic state.
* This should only be used by drivers which are still subclassing
* &drm_atomic_state and haven't switched to &drm_private_state yet.
* &drm_atomic_commit and haven't switched to &drm_private_state yet.
*/
void drm_atomic_state_default_clear(struct drm_atomic_state *state)
void drm_atomic_commit_default_clear(struct drm_atomic_commit *state)
{
struct drm_device *dev = state->dev;
struct drm_mode_config *config = &dev->mode_config;
@ -287,10 +287,10 @@ void drm_atomic_state_default_clear(struct drm_atomic_state *state)
state->fake_commit = NULL;
}
}
EXPORT_SYMBOL(drm_atomic_state_default_clear);
EXPORT_SYMBOL(drm_atomic_commit_default_clear);
/**
* drm_atomic_state_clear - clear state object
* drm_atomic_commit_clear - clear state object
* @state: atomic state
*
* When the w/w mutex algorithm detects a deadlock we need to back off and drop
@ -303,7 +303,7 @@ EXPORT_SYMBOL(drm_atomic_state_default_clear);
* Hence we must clear all cached state and completely start over, using this
* function.
*/
void drm_atomic_state_clear(struct drm_atomic_state *state)
void drm_atomic_commit_clear(struct drm_atomic_commit *state)
{
struct drm_device *dev = state->dev;
struct drm_mode_config *config = &dev->mode_config;
@ -311,37 +311,37 @@ void drm_atomic_state_clear(struct drm_atomic_state *state)
if (config->funcs->atomic_state_clear)
config->funcs->atomic_state_clear(state);
else
drm_atomic_state_default_clear(state);
drm_atomic_commit_default_clear(state);
}
EXPORT_SYMBOL(drm_atomic_state_clear);
EXPORT_SYMBOL(drm_atomic_commit_clear);
/**
* __drm_atomic_state_free - free all memory for an atomic state
* __drm_atomic_commit_free - free all memory for an atomic state
* @ref: This atomic state to deallocate
*
* This frees all memory associated with an atomic state, including all the
* per-object state for planes, CRTCs and connectors.
*/
void __drm_atomic_state_free(struct kref *ref)
void __drm_atomic_commit_free(struct kref *ref)
{
struct drm_atomic_state *state = container_of(ref, typeof(*state), ref);
struct drm_atomic_commit *state = container_of(ref, typeof(*state), ref);
struct drm_device *dev = state->dev;
struct drm_mode_config *config = &dev->mode_config;
drm_atomic_state_clear(state);
drm_atomic_commit_clear(state);
drm_dbg_atomic(state->dev, "Freeing atomic state %p\n", state);
if (config->funcs->atomic_state_free) {
config->funcs->atomic_state_free(state);
} else {
drm_atomic_state_default_release(state);
drm_atomic_commit_default_release(state);
kfree(state);
}
drm_dev_put(dev);
}
EXPORT_SYMBOL(__drm_atomic_state_free);
EXPORT_SYMBOL(__drm_atomic_commit_free);
/**
* drm_atomic_get_crtc_state - get CRTC state
@ -353,7 +353,7 @@ EXPORT_SYMBOL(__drm_atomic_state_free);
* is consistent.
*
* WARNING: Drivers may only add new CRTC states to a @state if
* drm_atomic_state.allow_modeset is set, or if it's a driver-internal commit
* drm_atomic_commit.allow_modeset is set, or if it's a driver-internal commit
* not created by userspace through an IOCTL call.
*
* Returns:
@ -362,7 +362,7 @@ EXPORT_SYMBOL(__drm_atomic_state_free);
* entire atomic sequence must be restarted. All other errors are fatal.
*/
struct drm_crtc_state *
drm_atomic_get_crtc_state(struct drm_atomic_state *state,
drm_atomic_get_crtc_state(struct drm_atomic_commit *state,
struct drm_crtc *crtc)
{
int ret, index = drm_crtc_index(crtc);
@ -544,7 +544,7 @@ static int drm_atomic_connector_check(struct drm_connector *connector,
* entire atomic sequence must be restarted. All other errors are fatal.
*/
struct drm_plane_state *
drm_atomic_get_plane_state(struct drm_atomic_state *state,
drm_atomic_get_plane_state(struct drm_atomic_commit *state,
struct drm_plane *plane)
{
int ret, index = drm_plane_index(plane);
@ -608,7 +608,7 @@ EXPORT_SYMBOL(drm_atomic_get_plane_state);
* entire atomic sequence must be restarted. All other errors are fatal.
*/
struct drm_colorop_state *
drm_atomic_get_colorop_state(struct drm_atomic_state *state,
drm_atomic_get_colorop_state(struct drm_atomic_commit *state,
struct drm_colorop *colorop)
{
int ret, index = drm_colorop_index(colorop);
@ -650,7 +650,7 @@ EXPORT_SYMBOL(drm_atomic_get_colorop_state);
* NULL if the colorop is not part of the global atomic state.
*/
struct drm_colorop_state *
drm_atomic_get_old_colorop_state(struct drm_atomic_state *state,
drm_atomic_get_old_colorop_state(struct drm_atomic_commit *state,
struct drm_colorop *colorop)
{
return state->colorops[drm_colorop_index(colorop)].old_state;
@ -666,7 +666,7 @@ EXPORT_SYMBOL(drm_atomic_get_old_colorop_state);
* NULL if the colorop is not part of the global atomic state.
*/
struct drm_colorop_state *
drm_atomic_get_new_colorop_state(struct drm_atomic_state *state,
drm_atomic_get_new_colorop_state(struct drm_atomic_commit *state,
struct drm_colorop *colorop)
{
return state->colorops[drm_colorop_index(colorop)].new_state;
@ -901,9 +901,9 @@ static void drm_atomic_plane_print_state(struct drm_printer *p,
* directly. Sequence of the actual hardware state commit is not handled,
* drivers might need to keep track of struct drm_crtc_commit within subclassed
* structure of &drm_private_state as necessary, e.g. similar to
* &drm_plane_state.commit. See also &drm_atomic_state.fake_commit.
* &drm_plane_state.commit. See also &drm_atomic_commit.fake_commit.
*
* All private state structures contained in a &drm_atomic_state update can be
* All private state structures contained in a &drm_atomic_commit update can be
* iterated using for_each_oldnew_private_obj_in_state(),
* for_each_new_private_obj_in_state() and for_each_old_private_obj_in_state().
* Drivers are recommended to wrap these for each type of driver private state
@ -911,7 +911,7 @@ static void drm_atomic_plane_print_state(struct drm_printer *p,
* least if they want to iterate over all objects of a given type.
*
* An earlier way to handle driver private state was by subclassing struct
* &drm_atomic_state. But since that encourages non-standard ways to implement
* &drm_atomic_commit. But since that encourages non-standard ways to implement
* the check/commit split atomic requires (by using e.g. "check and rollback or
* commit instead" of "duplicate state, check, then either commit or release
* duplicated state) it is deprecated in favour of using &drm_private_state.
@ -981,7 +981,7 @@ EXPORT_SYMBOL(drm_atomic_private_obj_fini);
* Either the allocated state or the error code encoded into a pointer.
*/
struct drm_private_state *
drm_atomic_get_private_obj_state(struct drm_atomic_state *state,
drm_atomic_get_private_obj_state(struct drm_atomic_commit *state,
struct drm_private_obj *obj)
{
int index, num_objs, ret;
@ -1039,7 +1039,7 @@ EXPORT_SYMBOL(drm_atomic_get_private_obj_state);
* or NULL if the private_obj is not part of the global atomic state.
*/
struct drm_private_state *
drm_atomic_get_old_private_obj_state(const struct drm_atomic_state *state,
drm_atomic_get_old_private_obj_state(const struct drm_atomic_commit *state,
struct drm_private_obj *obj)
{
int i;
@ -1061,7 +1061,7 @@ EXPORT_SYMBOL(drm_atomic_get_old_private_obj_state);
* or NULL if the private_obj is not part of the global atomic state.
*/
struct drm_private_state *
drm_atomic_get_new_private_obj_state(const struct drm_atomic_state *state,
drm_atomic_get_new_private_obj_state(const struct drm_atomic_commit *state,
struct drm_private_obj *obj)
{
int i;
@ -1096,7 +1096,7 @@ EXPORT_SYMBOL(drm_atomic_get_new_private_obj_state);
* not connected.
*/
struct drm_connector *
drm_atomic_get_old_connector_for_encoder(const struct drm_atomic_state *state,
drm_atomic_get_old_connector_for_encoder(const struct drm_atomic_commit *state,
struct drm_encoder *encoder)
{
struct drm_connector_state *conn_state;
@ -1133,7 +1133,7 @@ EXPORT_SYMBOL(drm_atomic_get_old_connector_for_encoder);
* not connected.
*/
struct drm_connector *
drm_atomic_get_new_connector_for_encoder(const struct drm_atomic_state *state,
drm_atomic_get_new_connector_for_encoder(const struct drm_atomic_commit *state,
struct drm_encoder *encoder)
{
struct drm_connector_state *conn_state;
@ -1214,7 +1214,7 @@ EXPORT_SYMBOL(drm_atomic_get_connector_for_encoder);
* not connected.
*/
struct drm_crtc *
drm_atomic_get_old_crtc_for_encoder(struct drm_atomic_state *state,
drm_atomic_get_old_crtc_for_encoder(struct drm_atomic_commit *state,
struct drm_encoder *encoder)
{
struct drm_connector *connector;
@ -1244,7 +1244,7 @@ EXPORT_SYMBOL(drm_atomic_get_old_crtc_for_encoder);
* not connected.
*/
struct drm_crtc *
drm_atomic_get_new_crtc_for_encoder(struct drm_atomic_state *state,
drm_atomic_get_new_crtc_for_encoder(struct drm_atomic_commit *state,
struct drm_encoder *encoder)
{
struct drm_connector *connector;
@ -1277,7 +1277,7 @@ EXPORT_SYMBOL(drm_atomic_get_new_crtc_for_encoder);
* entire atomic sequence must be restarted. All other errors are fatal.
*/
struct drm_connector_state *
drm_atomic_get_connector_state(struct drm_atomic_state *state,
drm_atomic_get_connector_state(struct drm_atomic_commit *state,
struct drm_connector *connector)
{
int ret, index;
@ -1388,7 +1388,7 @@ static void drm_atomic_connector_print_state(struct drm_printer *p,
* entire atomic sequence must be restarted.
*/
struct drm_bridge_state *
drm_atomic_get_bridge_state(struct drm_atomic_state *state,
drm_atomic_get_bridge_state(struct drm_atomic_commit *state,
struct drm_bridge *bridge)
{
struct drm_private_state *obj_state;
@ -1410,7 +1410,7 @@ EXPORT_SYMBOL(drm_atomic_get_bridge_state);
* the bridge is not part of the global atomic state.
*/
struct drm_bridge_state *
drm_atomic_get_old_bridge_state(const struct drm_atomic_state *state,
drm_atomic_get_old_bridge_state(const struct drm_atomic_commit *state,
struct drm_bridge *bridge)
{
struct drm_private_state *obj_state;
@ -1432,7 +1432,7 @@ EXPORT_SYMBOL(drm_atomic_get_old_bridge_state);
* the bridge is not part of the global atomic state.
*/
struct drm_bridge_state *
drm_atomic_get_new_bridge_state(const struct drm_atomic_state *state,
drm_atomic_get_new_bridge_state(const struct drm_atomic_commit *state,
struct drm_bridge *bridge)
{
struct drm_private_state *obj_state;
@ -1462,7 +1462,7 @@ EXPORT_SYMBOL(drm_atomic_get_new_bridge_state);
* sequence must be restarted. All other errors are fatal.
*/
int
drm_atomic_add_encoder_bridges(struct drm_atomic_state *state,
drm_atomic_add_encoder_bridges(struct drm_atomic_commit *state,
struct drm_encoder *encoder)
{
struct drm_bridge_state *bridge_state;
@ -1506,7 +1506,7 @@ EXPORT_SYMBOL(drm_atomic_add_encoder_bridges);
* sequence must be restarted. All other errors are fatal.
*/
int
drm_atomic_add_affected_connectors(struct drm_atomic_state *state,
drm_atomic_add_affected_connectors(struct drm_atomic_commit *state,
struct drm_crtc *crtc)
{
struct drm_mode_config *config = &state->dev->mode_config;
@ -1570,7 +1570,7 @@ EXPORT_SYMBOL(drm_atomic_add_affected_connectors);
* sequence must be restarted. All other errors are fatal.
*/
int
drm_atomic_add_affected_planes(struct drm_atomic_state *state,
drm_atomic_add_affected_planes(struct drm_atomic_commit *state,
struct drm_crtc *crtc)
{
const struct drm_crtc_state *old_crtc_state =
@ -1622,7 +1622,7 @@ EXPORT_SYMBOL(drm_atomic_add_affected_planes);
* sequence must be restarted. All other errors are fatal.
*/
int
drm_atomic_add_affected_colorops(struct drm_atomic_state *state,
drm_atomic_add_affected_colorops(struct drm_atomic_commit *state,
struct drm_plane *plane)
{
struct drm_colorop *colorop;
@ -1658,7 +1658,7 @@ EXPORT_SYMBOL(drm_atomic_add_affected_colorops);
* Returns:
* 0 on success, negative error code on failure.
*/
int drm_atomic_check_only(struct drm_atomic_state *state)
int drm_atomic_check_only(struct drm_atomic_commit *state)
{
struct drm_device *dev = state->dev;
struct drm_mode_config *config = &dev->mode_config;
@ -1766,12 +1766,12 @@ EXPORT_SYMBOL(drm_atomic_check_only);
* backoff dance and restart. All other errors are fatal.
*
* This function will take its own reference on @state.
* Callers should always release their reference with drm_atomic_state_put().
* Callers should always release their reference with drm_atomic_commit_put().
*
* Returns:
* 0 on success, negative error code on failure.
*/
int drm_atomic_commit(struct drm_atomic_state *state)
int drm_atomic_commit(struct drm_atomic_commit *state)
{
struct drm_mode_config *config = &state->dev->mode_config;
struct drm_printer p = drm_info_printer(state->dev->dev);
@ -1799,12 +1799,12 @@ EXPORT_SYMBOL(drm_atomic_commit);
* backoff dance and restart. All other errors are fatal.
*
* This function will take its own reference on @state.
* Callers should always release their reference with drm_atomic_state_put().
* Callers should always release their reference with drm_atomic_commit_put().
*
* Returns:
* 0 on success, negative error code on failure.
*/
int drm_atomic_nonblocking_commit(struct drm_atomic_state *state)
int drm_atomic_nonblocking_commit(struct drm_atomic_commit *state)
{
struct drm_mode_config *config = &state->dev->mode_config;
int ret;
@ -1843,7 +1843,7 @@ int __drm_atomic_helper_disable_plane(struct drm_plane *plane,
}
EXPORT_SYMBOL(__drm_atomic_helper_disable_plane);
static int update_output_state(struct drm_atomic_state *state,
static int update_output_state(struct drm_atomic_commit *state,
struct drm_mode_set *set)
{
struct drm_device *dev = set->crtc->dev;
@ -1913,7 +1913,7 @@ static int update_output_state(struct drm_atomic_state *state,
/* just used from drm-client and atomic-helper: */
int __drm_atomic_helper_set_config(struct drm_mode_set *set,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_crtc_state *crtc_state;
struct drm_plane_state *primary_state;
@ -2007,7 +2007,7 @@ static void drm_atomic_private_obj_print_state(struct drm_printer *p,
* Note that this function looks into the new state objects and hence its not
* safe to be used after the call to drm_atomic_helper_commit_hw_done().
*/
void drm_atomic_print_new_state(const struct drm_atomic_state *state,
void drm_atomic_print_new_state(const struct drm_atomic_commit *state,
struct drm_printer *p)
{
struct drm_plane *plane;

172
drivers/gpu/drm/drm_atomic_helper.c
View File

@ -77,7 +77,7 @@
* helpers.
*/
static void
drm_atomic_helper_plane_changed(struct drm_atomic_state *state,
drm_atomic_helper_plane_changed(struct drm_atomic_commit *state,
struct drm_plane_state *old_plane_state,
struct drm_plane_state *plane_state,
struct drm_plane *plane)
@ -104,7 +104,7 @@ drm_atomic_helper_plane_changed(struct drm_atomic_state *state,
}
}
static int handle_conflicting_encoders(struct drm_atomic_state *state,
static int handle_conflicting_encoders(struct drm_atomic_commit *state,
bool disable_conflicting_encoders)
{
struct drm_connector_state *new_conn_state;
@ -218,7 +218,7 @@ static int handle_conflicting_encoders(struct drm_atomic_state *state,
}
static void
set_best_encoder(struct drm_atomic_state *state,
set_best_encoder(struct drm_atomic_commit *state,
struct drm_connector_state *conn_state,
struct drm_encoder *encoder)
{
@ -259,7 +259,7 @@ set_best_encoder(struct drm_atomic_state *state,
}
static void
steal_encoder(struct drm_atomic_state *state,
steal_encoder(struct drm_atomic_commit *state,
struct drm_encoder *encoder)
{
struct drm_crtc_state *crtc_state;
@ -290,7 +290,7 @@ steal_encoder(struct drm_atomic_state *state,
}
static int
update_connector_routing(struct drm_atomic_state *state,
update_connector_routing(struct drm_atomic_commit *state,
struct drm_connector *connector,
struct drm_connector_state *old_connector_state,
struct drm_connector_state *new_connector_state,
@ -416,7 +416,7 @@ update_connector_routing(struct drm_atomic_state *state,
}
static int
mode_fixup(struct drm_atomic_state *state)
mode_fixup(struct drm_atomic_commit *state)
{
struct drm_crtc *crtc;
struct drm_crtc_state *new_crtc_state;
@ -546,7 +546,7 @@ static enum drm_mode_status mode_valid_path(struct drm_connector *connector,
}
static int
mode_valid(struct drm_atomic_state *state)
mode_valid(struct drm_atomic_commit *state)
{
struct drm_connector_state *conn_state;
struct drm_connector *connector;
@ -578,7 +578,7 @@ mode_valid(struct drm_atomic_state *state)
return 0;
}
static int drm_atomic_check_valid_clones(struct drm_atomic_state *state,
static int drm_atomic_check_valid_clones(struct drm_atomic_commit *state,
struct drm_crtc *crtc)
{
struct drm_encoder *drm_enc;
@ -647,7 +647,7 @@ static int drm_atomic_check_valid_clones(struct drm_atomic_state *state,
*/
int
drm_atomic_helper_check_modeset(struct drm_device *dev,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_crtc *crtc;
struct drm_crtc_state *old_crtc_state, *new_crtc_state;
@ -841,7 +841,7 @@ EXPORT_SYMBOL(drm_atomic_helper_check_modeset);
*/
int
drm_atomic_helper_check_wb_connector_state(struct drm_connector *connector,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_connector_state *conn_state =
drm_atomic_get_new_connector_state(state, connector);
@ -1017,7 +1017,7 @@ EXPORT_SYMBOL(drm_atomic_helper_check_crtc_primary_plane);
*/
int
drm_atomic_helper_check_planes(struct drm_device *dev,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_crtc *crtc;
struct drm_crtc_state *new_crtc_state;
@ -1105,7 +1105,7 @@ EXPORT_SYMBOL(drm_atomic_helper_check_planes);
* Zero for success or -errno
*/
int drm_atomic_helper_check(struct drm_device *dev,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
int ret;
@ -1174,7 +1174,7 @@ crtc_needs_disable(struct drm_crtc_state *old_state,
*/
void
drm_atomic_helper_commit_encoder_bridge_disable(struct drm_device *dev,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_connector *connector;
struct drm_connector_state *old_conn_state, *new_conn_state;
@ -1251,7 +1251,7 @@ EXPORT_SYMBOL(drm_atomic_helper_commit_encoder_bridge_disable);
* it, disables it.
*/
void
drm_atomic_helper_commit_crtc_disable(struct drm_device *dev, struct drm_atomic_state *state)
drm_atomic_helper_commit_crtc_disable(struct drm_device *dev, struct drm_atomic_commit *state)
{
struct drm_crtc *crtc;
struct drm_crtc_state *old_crtc_state, *new_crtc_state;
@ -1313,7 +1313,7 @@ EXPORT_SYMBOL(drm_atomic_helper_commit_crtc_disable);
* it, post-disables all encoder bridges.
*/
void
drm_atomic_helper_commit_encoder_bridge_post_disable(struct drm_device *dev, struct drm_atomic_state *state)
drm_atomic_helper_commit_encoder_bridge_post_disable(struct drm_device *dev, struct drm_atomic_commit *state)
{
struct drm_connector *connector;
struct drm_connector_state *old_conn_state, *new_conn_state;
@ -1367,7 +1367,7 @@ drm_atomic_helper_commit_encoder_bridge_post_disable(struct drm_device *dev, str
EXPORT_SYMBOL(drm_atomic_helper_commit_encoder_bridge_post_disable);
static void
disable_outputs(struct drm_device *dev, struct drm_atomic_state *state)
disable_outputs(struct drm_device *dev, struct drm_atomic_commit *state)
{
drm_atomic_helper_commit_encoder_bridge_disable(dev, state);
@ -1395,7 +1395,7 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *state)
*/
void
drm_atomic_helper_update_legacy_modeset_state(struct drm_device *dev,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_connector *connector;
struct drm_connector_state *old_conn_state, *new_conn_state;
@ -1462,7 +1462,7 @@ EXPORT_SYMBOL(drm_atomic_helper_update_legacy_modeset_state);
* Updates the timestamping constants used for precise vblank timestamps
* by calling drm_calc_timestamping_constants() for all enabled crtcs in @state.
*/
void drm_atomic_helper_calc_timestamping_constants(struct drm_atomic_state *state)
void drm_atomic_helper_calc_timestamping_constants(struct drm_atomic_commit *state)
{
struct drm_crtc_state *new_crtc_state;
struct drm_crtc *crtc;
@ -1486,7 +1486,7 @@ EXPORT_SYMBOL(drm_atomic_helper_calc_timestamping_constants);
* chain and change the mode in all bridges as well.
*/
void
drm_atomic_helper_commit_crtc_set_mode(struct drm_device *dev, struct drm_atomic_state *state)
drm_atomic_helper_commit_crtc_set_mode(struct drm_device *dev, struct drm_atomic_commit *state)
{
struct drm_crtc *crtc;
struct drm_crtc_state *new_crtc_state;
@ -1564,7 +1564,7 @@ EXPORT_SYMBOL(drm_atomic_helper_commit_crtc_set_mode);
* PM since planes updates then only happen when the CRTC is actually enabled.
*/
void drm_atomic_helper_commit_modeset_disables(struct drm_device *dev,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
disable_outputs(dev, state);
@ -1585,7 +1585,7 @@ EXPORT_SYMBOL(drm_atomic_helper_commit_modeset_disables);
* commit on each connector.
*/
void drm_atomic_helper_commit_writebacks(struct drm_device *dev,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_connector *connector;
struct drm_connector_state *new_conn_state;
@ -1615,7 +1615,7 @@ EXPORT_SYMBOL(drm_atomic_helper_commit_writebacks);
* the entire bridge chain.
*/
void
drm_atomic_helper_commit_encoder_bridge_pre_enable(struct drm_device *dev, struct drm_atomic_state *state)
drm_atomic_helper_commit_encoder_bridge_pre_enable(struct drm_device *dev, struct drm_atomic_commit *state)
{
struct drm_connector *connector;
struct drm_connector_state *new_conn_state;
@ -1657,7 +1657,7 @@ EXPORT_SYMBOL(drm_atomic_helper_commit_encoder_bridge_pre_enable);
* it, enables it.
*/
void
drm_atomic_helper_commit_crtc_enable(struct drm_device *dev, struct drm_atomic_state *state)
drm_atomic_helper_commit_crtc_enable(struct drm_device *dev, struct drm_atomic_commit *state)
{
struct drm_crtc *crtc;
struct drm_crtc_state *old_crtc_state;
@ -1697,7 +1697,7 @@ EXPORT_SYMBOL(drm_atomic_helper_commit_crtc_enable);
* it, enables the entire bridge chain.
*/
void
drm_atomic_helper_commit_encoder_bridge_enable(struct drm_device *dev, struct drm_atomic_state *state)
drm_atomic_helper_commit_encoder_bridge_enable(struct drm_device *dev, struct drm_atomic_commit *state)
{
struct drm_connector *connector;
struct drm_connector_state *new_conn_state;
@ -1757,7 +1757,7 @@ EXPORT_SYMBOL(drm_atomic_helper_commit_encoder_bridge_enable);
* PM since planes updates then only happen when the CRTC is actually enabled.
*/
void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
drm_atomic_helper_commit_crtc_enable(dev, state);
@ -1774,7 +1774,7 @@ EXPORT_SYMBOL(drm_atomic_helper_commit_modeset_enables);
* next vblank, and inform all the fences of the deadline.
*/
static void set_fence_deadline(struct drm_device *dev,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_crtc *crtc;
struct drm_crtc_state *new_crtc_state;
@ -1832,7 +1832,7 @@ static void set_fence_deadline(struct drm_device *dev,
* Returns zero if success or < 0 if dma_fence_wait() fails.
*/
int drm_atomic_helper_wait_for_fences(struct drm_device *dev,
struct drm_atomic_state *state,
struct drm_atomic_commit *state,
bool pre_swap)
{
struct drm_plane *plane;
@ -1881,7 +1881,7 @@ EXPORT_SYMBOL(drm_atomic_helper_wait_for_fences);
*/
void
drm_atomic_helper_wait_for_vblanks(struct drm_device *dev,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_crtc *crtc;
struct drm_crtc_state *old_crtc_state, *new_crtc_state;
@ -1942,7 +1942,7 @@ EXPORT_SYMBOL(drm_atomic_helper_wait_for_vblanks);
* initialized using drm_atomic_helper_setup_commit().
*/
void drm_atomic_helper_wait_for_flip_done(struct drm_device *dev,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_crtc *crtc;
int i;
@ -1980,7 +1980,7 @@ EXPORT_SYMBOL(drm_atomic_helper_wait_for_flip_done);
* Note that the default ordering of how the various stages are called is to
* match the legacy modeset helper library closest.
*/
void drm_atomic_helper_commit_tail(struct drm_atomic_state *state)
void drm_atomic_helper_commit_tail(struct drm_atomic_commit *state)
{
struct drm_device *dev = state->dev;
@ -2010,7 +2010,7 @@ EXPORT_SYMBOL(drm_atomic_helper_commit_tail);
* commit. Otherwise, one should use the default implementation
* drm_atomic_helper_commit_tail().
*/
void drm_atomic_helper_commit_tail_rpm(struct drm_atomic_state *state)
void drm_atomic_helper_commit_tail_rpm(struct drm_atomic_commit *state)
{
struct drm_device *dev = state->dev;
@ -2031,7 +2031,7 @@ void drm_atomic_helper_commit_tail_rpm(struct drm_atomic_state *state)
}
EXPORT_SYMBOL(drm_atomic_helper_commit_tail_rpm);
static void commit_tail(struct drm_atomic_state *state)
static void commit_tail(struct drm_atomic_commit *state)
{
struct drm_device *dev = state->dev;
const struct drm_mode_config_helper_funcs *funcs;
@ -2081,13 +2081,13 @@ static void commit_tail(struct drm_atomic_state *state)
drm_atomic_helper_commit_cleanup_done(state);
drm_atomic_state_put(state);
drm_atomic_commit_put(state);
}
static void commit_work(struct work_struct *work)
{
struct drm_atomic_state *state = container_of(work,
struct drm_atomic_state,
struct drm_atomic_commit *state = container_of(work,
struct drm_atomic_commit,
commit_work);
commit_tail(state);
}
@ -2106,7 +2106,7 @@ static void commit_work(struct work_struct *work)
* fails the commit should be treated like a normal synchronous commit.
*/
int drm_atomic_helper_async_check(struct drm_device *dev,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_crtc *crtc;
struct drm_crtc_state *crtc_state;
@ -2190,7 +2190,7 @@ EXPORT_SYMBOL(drm_atomic_helper_async_check);
* TODO: Implement full swap instead of doing in-place changes.
*/
void drm_atomic_helper_async_commit(struct drm_device *dev,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_plane *plane;
struct drm_plane_state *plane_state;
@ -2243,7 +2243,7 @@ EXPORT_SYMBOL(drm_atomic_helper_async_commit);
* Zero for success or -errno.
*/
int drm_atomic_helper_commit(struct drm_device *dev,
struct drm_atomic_state *state,
struct drm_atomic_commit *state,
bool nonblock)
{
int ret;
@ -2305,7 +2305,7 @@ int drm_atomic_helper_commit(struct drm_device *dev,
* make sure work items don't artificially stall on each another.
*/
drm_atomic_state_get(state);
drm_atomic_commit_get(state);
if (nonblock)
queue_work(system_dfl_wq, &state->commit_work);
else
@ -2347,7 +2347,7 @@ EXPORT_SYMBOL(drm_atomic_helper_commit);
* must be done as one global operation, and enabling or disabling a CRTC can
* take a long time. But even that is not required.
*
* IMPORTANT: A &drm_atomic_state update for multiple CRTCs is sequenced
* IMPORTANT: A &drm_atomic_commit update for multiple CRTCs is sequenced
* against all CRTCs therein. Therefore for atomic state updates which only flip
* planes the driver must not get the struct &drm_crtc_state of unrelated CRTCs
* in its atomic check code: This would prevent committing of atomic updates to
@ -2442,7 +2442,7 @@ static void init_commit(struct drm_crtc_commit *commit, struct drm_crtc *crtc)
}
static struct drm_crtc_commit *
crtc_or_fake_commit(struct drm_atomic_state *state, struct drm_crtc *crtc)
crtc_or_fake_commit(struct drm_atomic_commit *state, struct drm_crtc *crtc)
{
if (crtc) {
struct drm_crtc_state *new_crtc_state;
@ -2501,14 +2501,14 @@ crtc_or_fake_commit(struct drm_atomic_state *state, struct drm_crtc *crtc)
* using the core structure &drm_crtc_commit.
*
* By default there's no need to clean up resources allocated by this function
* explicitly: drm_atomic_state_default_clear() will take care of that
* explicitly: drm_atomic_commit_default_clear() will take care of that
* automatically.
*
* Returns:
* 0 on success. -EBUSY when userspace schedules nonblocking commits too fast,
* -ENOMEM on allocation failures and -EINTR when a signal is pending.
*/
int drm_atomic_helper_setup_commit(struct drm_atomic_state *state,
int drm_atomic_helper_setup_commit(struct drm_atomic_commit *state,
bool nonblock)
{
struct drm_crtc *crtc;
@ -2633,7 +2633,7 @@ EXPORT_SYMBOL(drm_atomic_helper_setup_commit);
* This is part of the atomic helper support for nonblocking commits, see
* drm_atomic_helper_setup_commit() for an overview.
*/
void drm_atomic_helper_wait_for_dependencies(struct drm_atomic_state *state)
void drm_atomic_helper_wait_for_dependencies(struct drm_atomic_commit *state)
{
struct drm_crtc *crtc;
struct drm_crtc_state *old_crtc_state;
@ -2688,7 +2688,7 @@ EXPORT_SYMBOL(drm_atomic_helper_wait_for_dependencies);
* This is part of the atomic helper support for nonblocking commits, see
* drm_atomic_helper_setup_commit() for an overview.
*/
void drm_atomic_helper_fake_vblank(struct drm_atomic_state *state)
void drm_atomic_helper_fake_vblank(struct drm_atomic_commit *state)
{
struct drm_crtc_state *new_crtc_state;
struct drm_crtc *crtc;
@ -2726,7 +2726,7 @@ EXPORT_SYMBOL(drm_atomic_helper_fake_vblank);
* This is part of the atomic helper support for nonblocking commits, see
* drm_atomic_helper_setup_commit() for an overview.
*/
void drm_atomic_helper_commit_hw_done(struct drm_atomic_state *state)
void drm_atomic_helper_commit_hw_done(struct drm_atomic_commit *state)
{
struct drm_crtc *crtc;
struct drm_crtc_state *old_crtc_state, *new_crtc_state;
@ -2766,12 +2766,12 @@ EXPORT_SYMBOL(drm_atomic_helper_commit_hw_done);
*
* This signals completion of the atomic update @state, including any
* cleanup work. If used, it must be called right before calling
* drm_atomic_state_put().
* drm_atomic_commit_put().
*
* This is part of the atomic helper support for nonblocking commits, see
* drm_atomic_helper_setup_commit() for an overview.
*/
void drm_atomic_helper_commit_cleanup_done(struct drm_atomic_state *state)
void drm_atomic_helper_commit_cleanup_done(struct drm_atomic_commit *state)
{
struct drm_crtc *crtc;
struct drm_crtc_state *old_crtc_state;
@ -2812,7 +2812,7 @@ EXPORT_SYMBOL(drm_atomic_helper_commit_cleanup_done);
* 0 on success, negative error code on failure.
*/
int drm_atomic_helper_prepare_planes(struct drm_device *dev,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_connector *connector;
struct drm_connector_state *new_conn_state;
@ -2901,7 +2901,7 @@ EXPORT_SYMBOL(drm_atomic_helper_prepare_planes);
* use drm_atomic_helper_cleanup_planes().
*/
void drm_atomic_helper_unprepare_planes(struct drm_device *dev,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_plane *plane;
struct drm_plane_state *new_plane_state;
@ -2970,7 +2970,7 @@ static bool plane_crtc_active(const struct drm_plane_state *state)
* This should not be copied blindly by drivers.
*/
void drm_atomic_helper_commit_planes(struct drm_device *dev,
struct drm_atomic_state *state,
struct drm_atomic_commit *state,
uint32_t flags)
{
struct drm_crtc *crtc;
@ -3093,7 +3093,7 @@ drm_atomic_helper_commit_planes_on_crtc(struct drm_crtc_state *old_crtc_state)
{
const struct drm_crtc_helper_funcs *crtc_funcs;
struct drm_crtc *crtc = old_crtc_state->crtc;
struct drm_atomic_state *old_state = old_crtc_state->state;
struct drm_atomic_commit *old_state = old_crtc_state->state;
struct drm_crtc_state *new_crtc_state =
drm_atomic_get_new_crtc_state(old_state, crtc);
struct drm_plane *plane;
@ -3200,7 +3200,7 @@ EXPORT_SYMBOL(drm_atomic_helper_disable_planes_on_crtc);
* drm_atomic_helper_unprepare_planes() in this case.
*/
void drm_atomic_helper_cleanup_planes(struct drm_device *dev,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_plane *plane;
struct drm_plane_state *old_plane_state;
@ -3249,7 +3249,7 @@ EXPORT_SYMBOL(drm_atomic_helper_cleanup_planes);
* Returns 0 on success. Can return -ERESTARTSYS when @stall is true and the
* waiting for the previous commits has been interrupted.
*/
int drm_atomic_helper_swap_state(struct drm_atomic_state *state,
int drm_atomic_helper_swap_state(struct drm_atomic_commit *state,
bool stall)
{
int i, ret;
@ -3404,11 +3404,11 @@ int drm_atomic_helper_update_plane(struct drm_plane *plane,
uint32_t src_w, uint32_t src_h,
struct drm_modeset_acquire_ctx *ctx)
{
struct drm_atomic_state *state;
struct drm_atomic_commit *state;
struct drm_plane_state *plane_state;
int ret = 0;
state = drm_atomic_state_alloc(plane->dev);
state = drm_atomic_commit_alloc(plane->dev);
if (!state)
return -ENOMEM;
@ -3437,7 +3437,7 @@ int drm_atomic_helper_update_plane(struct drm_plane *plane,
ret = drm_atomic_commit(state);
fail:
drm_atomic_state_put(state);
drm_atomic_commit_put(state);
return ret;
}
EXPORT_SYMBOL(drm_atomic_helper_update_plane);
@ -3455,11 +3455,11 @@ EXPORT_SYMBOL(drm_atomic_helper_update_plane);
int drm_atomic_helper_disable_plane(struct drm_plane *plane,
struct drm_modeset_acquire_ctx *ctx)
{
struct drm_atomic_state *state;
struct drm_atomic_commit *state;
struct drm_plane_state *plane_state;
int ret = 0;
state = drm_atomic_state_alloc(plane->dev);
state = drm_atomic_commit_alloc(plane->dev);
if (!state)
return -ENOMEM;
@ -3479,7 +3479,7 @@ int drm_atomic_helper_disable_plane(struct drm_plane *plane,
ret = drm_atomic_commit(state);
fail:
drm_atomic_state_put(state);
drm_atomic_commit_put(state);
return ret;
}
EXPORT_SYMBOL(drm_atomic_helper_disable_plane);
@ -3503,11 +3503,11 @@ EXPORT_SYMBOL(drm_atomic_helper_disable_plane);
int drm_atomic_helper_set_config(struct drm_mode_set *set,
struct drm_modeset_acquire_ctx *ctx)
{
struct drm_atomic_state *state;
struct drm_atomic_commit *state;
struct drm_crtc *crtc = set->crtc;
int ret = 0;
state = drm_atomic_state_alloc(crtc->dev);
state = drm_atomic_commit_alloc(crtc->dev);
if (!state)
return -ENOMEM;
@ -3523,7 +3523,7 @@ int drm_atomic_helper_set_config(struct drm_mode_set *set,
ret = drm_atomic_commit(state);
fail:
drm_atomic_state_put(state);
drm_atomic_commit_put(state);
return ret;
}
EXPORT_SYMBOL(drm_atomic_helper_set_config);
@ -3554,7 +3554,7 @@ EXPORT_SYMBOL(drm_atomic_helper_set_config);
int drm_atomic_helper_disable_all(struct drm_device *dev,
struct drm_modeset_acquire_ctx *ctx)
{
struct drm_atomic_state *state;
struct drm_atomic_commit *state;
struct drm_connector_state *conn_state;
struct drm_connector *conn;
struct drm_plane_state *plane_state;
@ -3563,7 +3563,7 @@ int drm_atomic_helper_disable_all(struct drm_device *dev,
struct drm_crtc *crtc;
int ret, i;
state = drm_atomic_state_alloc(dev);
state = drm_atomic_commit_alloc(dev);
if (!state)
return -ENOMEM;
@ -3607,7 +3607,7 @@ int drm_atomic_helper_disable_all(struct drm_device *dev,
ret = drm_atomic_commit(state);
free:
drm_atomic_state_put(state);
drm_atomic_commit_put(state);
return ret;
}
EXPORT_SYMBOL(drm_atomic_helper_disable_all);
@ -3634,11 +3634,11 @@ EXPORT_SYMBOL(drm_atomic_helper_disable_all);
int drm_atomic_helper_reset_crtc(struct drm_crtc *crtc,
struct drm_modeset_acquire_ctx *ctx)
{
struct drm_atomic_state *state;
struct drm_atomic_commit *state;
struct drm_crtc_state *crtc_state;
int ret;
state = drm_atomic_state_alloc(crtc->dev);
state = drm_atomic_commit_alloc(crtc->dev);
if (!state)
return -ENOMEM;
@ -3654,7 +3654,7 @@ int drm_atomic_helper_reset_crtc(struct drm_crtc *crtc,
ret = drm_atomic_commit(state);
out:
drm_atomic_state_put(state);
drm_atomic_commit_put(state);
return ret;
}
@ -3715,18 +3715,18 @@ EXPORT_SYMBOL(drm_atomic_helper_shutdown);
* See also:
* drm_atomic_helper_suspend(), drm_atomic_helper_resume()
*/
struct drm_atomic_state *
struct drm_atomic_commit *
drm_atomic_helper_duplicate_state(struct drm_device *dev,
struct drm_modeset_acquire_ctx *ctx)
{
struct drm_atomic_state *state;
struct drm_atomic_commit *state;
struct drm_connector *conn;
struct drm_connector_list_iter conn_iter;
struct drm_plane *plane;
struct drm_crtc *crtc;
int err = 0;
state = drm_atomic_state_alloc(dev);
state = drm_atomic_commit_alloc(dev);
if (!state)
return ERR_PTR(-ENOMEM);
@ -3778,7 +3778,7 @@ drm_atomic_helper_duplicate_state(struct drm_device *dev,
free:
if (err < 0) {
drm_atomic_state_put(state);
drm_atomic_commit_put(state);
state = ERR_PTR(err);
}
@ -3811,10 +3811,10 @@ EXPORT_SYMBOL(drm_atomic_helper_duplicate_state);
* drm_atomic_helper_duplicate_state(), drm_atomic_helper_disable_all(),
* drm_atomic_helper_resume(), drm_atomic_helper_commit_duplicated_state()
*/
struct drm_atomic_state *drm_atomic_helper_suspend(struct drm_device *dev)
struct drm_atomic_commit *drm_atomic_helper_suspend(struct drm_device *dev)
{
struct drm_modeset_acquire_ctx ctx;
struct drm_atomic_state *state;
struct drm_atomic_commit *state;
int err;
/* This can never be returned, but it makes the compiler happy */
@ -3828,7 +3828,7 @@ struct drm_atomic_state *drm_atomic_helper_suspend(struct drm_device *dev)
err = drm_atomic_helper_disable_all(dev, &ctx);
if (err < 0) {
drm_atomic_state_put(state);
drm_atomic_commit_put(state);
state = ERR_PTR(err);
goto unlock;
}
@ -3857,7 +3857,7 @@ EXPORT_SYMBOL(drm_atomic_helper_suspend);
* See also:
* drm_atomic_helper_suspend()
*/
int drm_atomic_helper_commit_duplicated_state(struct drm_atomic_state *state,
int drm_atomic_helper_commit_duplicated_state(struct drm_atomic_commit *state,
struct drm_modeset_acquire_ctx *ctx)
{
int i, ret;
@ -3909,7 +3909,7 @@ EXPORT_SYMBOL(drm_atomic_helper_commit_duplicated_state);
* drm_atomic_helper_suspend()
*/
int drm_atomic_helper_resume(struct drm_device *dev,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_modeset_acquire_ctx ctx;
int err;
@ -3921,13 +3921,13 @@ int drm_atomic_helper_resume(struct drm_device *dev,
err = drm_atomic_helper_commit_duplicated_state(state, &ctx);
DRM_MODESET_LOCK_ALL_END(dev, ctx, err);
drm_atomic_state_put(state);
drm_atomic_commit_put(state);
return err;
}
EXPORT_SYMBOL(drm_atomic_helper_resume);
static int page_flip_common(struct drm_atomic_state *state,
static int page_flip_common(struct drm_atomic_commit *state,
struct drm_crtc *crtc,
struct drm_framebuffer *fb,
struct drm_pending_vblank_event *event,
@ -3990,10 +3990,10 @@ int drm_atomic_helper_page_flip(struct drm_crtc *crtc,
struct drm_modeset_acquire_ctx *ctx)
{
struct drm_plane *plane = crtc->primary;
struct drm_atomic_state *state;
struct drm_atomic_commit *state;
int ret = 0;
state = drm_atomic_state_alloc(plane->dev);
state = drm_atomic_commit_alloc(plane->dev);
if (!state)
return -ENOMEM;
@ -4005,7 +4005,7 @@ int drm_atomic_helper_page_flip(struct drm_crtc *crtc,
ret = drm_atomic_nonblocking_commit(state);
fail:
drm_atomic_state_put(state);
drm_atomic_commit_put(state);
return ret;
}
EXPORT_SYMBOL(drm_atomic_helper_page_flip);
@ -4034,11 +4034,11 @@ int drm_atomic_helper_page_flip_target(struct drm_crtc *crtc,
struct drm_modeset_acquire_ctx *ctx)
{
struct drm_plane *plane = crtc->primary;
struct drm_atomic_state *state;
struct drm_atomic_commit *state;
struct drm_crtc_state *crtc_state;
int ret = 0;
state = drm_atomic_state_alloc(plane->dev);
state = drm_atomic_commit_alloc(plane->dev);
if (!state)
return -ENOMEM;
@ -4057,7 +4057,7 @@ int drm_atomic_helper_page_flip_target(struct drm_crtc *crtc,
ret = drm_atomic_nonblocking_commit(state);
fail:
drm_atomic_state_put(state);
drm_atomic_commit_put(state);
return ret;
}
EXPORT_SYMBOL(drm_atomic_helper_page_flip_target);

2
drivers/gpu/drm/drm_atomic_state_helper.c
View File

@ -589,7 +589,7 @@ EXPORT_SYMBOL(drm_atomic_helper_connector_tv_reset);
* %0 for success, a negative error code on error.
*/
int drm_atomic_helper_connector_tv_check(struct drm_connector *connector,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_connector_state *old_conn_state =
drm_atomic_get_old_connector_state(state, connector);

28
drivers/gpu/drm/drm_atomic_uapi.c
View File

@ -347,13 +347,13 @@ drm_atomic_set_crtc_for_connector(struct drm_connector_state *conn_state,
}
EXPORT_SYMBOL(drm_atomic_set_crtc_for_connector);
static void set_out_fence_for_crtc(struct drm_atomic_state *state,
static void set_out_fence_for_crtc(struct drm_atomic_commit *state,
struct drm_crtc *crtc, s32 __user *fence_ptr)
{
state->crtcs[drm_crtc_index(crtc)].out_fence_ptr = fence_ptr;
}
static s32 __user *get_out_fence_for_crtc(struct drm_atomic_state *state,
static s32 __user *get_out_fence_for_crtc(struct drm_atomic_commit *state,
struct drm_crtc *crtc)
{
s32 __user *fence_ptr;
@ -364,7 +364,7 @@ static s32 __user *get_out_fence_for_crtc(struct drm_atomic_state *state,
return fence_ptr;
}
static int set_out_fence_for_connector(struct drm_atomic_state *state,
static int set_out_fence_for_connector(struct drm_atomic_commit *state,
struct drm_connector *connector,
s32 __user *fence_ptr)
{
@ -381,7 +381,7 @@ static int set_out_fence_for_connector(struct drm_atomic_state *state,
return 0;
}
static s32 __user *get_out_fence_for_connector(struct drm_atomic_state *state,
static s32 __user *get_out_fence_for_connector(struct drm_atomic_commit *state,
struct drm_connector *connector)
{
unsigned int index = drm_connector_index(connector);
@ -1104,7 +1104,7 @@ static struct drm_pending_vblank_event *create_vblank_event(
return e;
}
int drm_atomic_connector_commit_dpms(struct drm_atomic_state *state,
int drm_atomic_connector_commit_dpms(struct drm_atomic_commit *state,
struct drm_connector *connector,
int mode)
{
@ -1171,7 +1171,7 @@ static int drm_atomic_check_prop_changes(int ret, uint64_t old_val, uint64_t pro
return 0;
}
int drm_atomic_set_property(struct drm_atomic_state *state,
int drm_atomic_set_property(struct drm_atomic_commit *state,
struct drm_file *file_priv,
struct drm_mode_object *obj,
struct drm_property *prop,
@ -1374,7 +1374,7 @@ static int setup_out_fence(struct drm_out_fence_state *fence_state,
}
static int prepare_signaling(struct drm_device *dev,
struct drm_atomic_state *state,
struct drm_atomic_commit *state,
struct drm_mode_atomic *arg,
struct drm_file *file_priv,
struct drm_out_fence_state **fence_state,
@ -1499,7 +1499,7 @@ static int prepare_signaling(struct drm_device *dev,
}
static void complete_signaling(struct drm_device *dev,
struct drm_atomic_state *state,
struct drm_atomic_commit *state,
struct drm_out_fence_state *fence_state,
unsigned int num_fences,
bool install_fds)
@ -1522,7 +1522,7 @@ static void complete_signaling(struct drm_device *dev,
/*
* Free the allocated event. drm_atomic_helper_setup_commit
* can allocate an event too, so only free it if it's ours
* to prevent a double free in drm_atomic_state_clear.
* to prevent a double free in drm_atomic_commit_clear.
*/
if (event && (event->base.fence || event->base.file_priv)) {
drm_event_cancel_free(dev, &event->base);
@ -1549,7 +1549,7 @@ static void complete_signaling(struct drm_device *dev,
}
static void
set_async_flip(struct drm_atomic_state *state)
set_async_flip(struct drm_atomic_commit *state)
{
struct drm_crtc *crtc;
struct drm_crtc_state *crtc_state;
@ -1569,7 +1569,7 @@ int drm_mode_atomic_ioctl(struct drm_device *dev,
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);
unsigned int copied_objs, copied_props;
struct drm_atomic_state *state;
struct drm_atomic_commit *state;
struct drm_modeset_acquire_ctx ctx;
struct drm_out_fence_state *fence_state;
int ret = 0;
@ -1618,7 +1618,7 @@ int drm_mode_atomic_ioctl(struct drm_device *dev,
return -EINVAL;
}
state = drm_atomic_state_alloc(dev);
state = drm_atomic_commit_alloc(dev);
if (!state)
return -ENOMEM;
@ -1726,13 +1726,13 @@ int drm_mode_atomic_ioctl(struct drm_device *dev,
complete_signaling(dev, state, fence_state, num_fences, !ret);
if (ret == -EDEADLK) {
drm_atomic_state_clear(state);
drm_atomic_commit_clear(state);
ret = drm_modeset_backoff(&ctx);
if (!ret)
goto retry;
}
drm_atomic_state_put(state);
drm_atomic_commit_put(state);
drm_modeset_drop_locks(&ctx);
drm_modeset_acquire_fini(&ctx);

8
drivers/gpu/drm/drm_blend.c
View File

@ -449,7 +449,7 @@ int drm_plane_create_zpos_immutable_property(struct drm_plane *plane,
}
EXPORT_SYMBOL(drm_plane_create_zpos_immutable_property);
static int drm_atomic_state_zpos_cmp(const void *a, const void *b)
static int drm_atomic_commit_zpos_cmp(const void *a, const void *b)
{
const struct drm_plane_state *sa = *(struct drm_plane_state **)a;
const struct drm_plane_state *sb = *(struct drm_plane_state **)b;
@ -463,7 +463,7 @@ static int drm_atomic_state_zpos_cmp(const void *a, const void *b)
static int drm_atomic_helper_crtc_normalize_zpos(struct drm_crtc *crtc,
struct drm_crtc_state *crtc_state)
{
struct drm_atomic_state *state = crtc_state->state;
struct drm_atomic_commit *state = crtc_state->state;
struct drm_device *dev = crtc->dev;
int total_planes = dev->mode_config.num_total_plane;
struct drm_plane_state **states;
@ -494,7 +494,7 @@ static int drm_atomic_helper_crtc_normalize_zpos(struct drm_crtc *crtc,
plane->base.id, plane->name, plane_state->zpos);
}
sort(states, n, sizeof(*states), drm_atomic_state_zpos_cmp, NULL);
sort(states, n, sizeof(*states), drm_atomic_commit_zpos_cmp, NULL);
for (i = 0; i < n; i++) {
plane = states[i]->plane;
@ -529,7 +529,7 @@ static int drm_atomic_helper_crtc_normalize_zpos(struct drm_crtc *crtc,
* Zero for success or -errno
*/
int drm_atomic_normalize_zpos(struct drm_device *dev,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_crtc *crtc;
struct drm_crtc_state *old_crtc_state, *new_crtc_state;

14
drivers/gpu/drm/drm_bridge.c
View File

@ -802,7 +802,7 @@ EXPORT_SYMBOL(drm_bridge_chain_mode_set);
* Note: the bridge passed should be the one closest to the encoder
*/
void drm_atomic_bridge_chain_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_encoder *encoder;
struct drm_bridge *iter;
@ -825,7 +825,7 @@ void drm_atomic_bridge_chain_disable(struct drm_bridge *bridge,
EXPORT_SYMBOL(drm_atomic_bridge_chain_disable);
static void drm_atomic_bridge_call_post_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
if (state && bridge->funcs->atomic_post_disable)
bridge->funcs->atomic_post_disable(bridge, state);
@ -858,7 +858,7 @@ static void drm_atomic_bridge_call_post_disable(struct drm_bridge *bridge,
* Note: the bridge passed should be the one closest to the encoder
*/
void drm_atomic_bridge_chain_post_disable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_encoder *encoder;
struct drm_bridge *next, *limit;
@ -920,7 +920,7 @@ void drm_atomic_bridge_chain_post_disable(struct drm_bridge *bridge,
EXPORT_SYMBOL(drm_atomic_bridge_chain_post_disable);
static void drm_atomic_bridge_call_pre_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
if (state && bridge->funcs->atomic_pre_enable)
bridge->funcs->atomic_pre_enable(bridge, state);
@ -952,7 +952,7 @@ static void drm_atomic_bridge_call_pre_enable(struct drm_bridge *bridge,
* Note: the bridge passed should be the one closest to the encoder
*/
void drm_atomic_bridge_chain_pre_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_encoder *encoder;
struct drm_bridge *iter, *next, *limit;
@ -1020,7 +1020,7 @@ EXPORT_SYMBOL(drm_atomic_bridge_chain_pre_enable);
* Note: the bridge passed should be the one closest to the encoder
*/
void drm_atomic_bridge_chain_enable(struct drm_bridge *bridge,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_encoder *encoder;
@ -1249,7 +1249,7 @@ drm_atomic_bridge_chain_select_bus_fmts(struct drm_bridge *bridge,
static void
drm_atomic_bridge_propagate_bus_flags(struct drm_bridge *bridge,
struct drm_connector *conn,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_bridge_state *bridge_state, *next_bridge_state;
u32 output_flags = 0;

8
drivers/gpu/drm/drm_client_modeset.c
View File

@ -1035,14 +1035,14 @@ static int drm_client_modeset_commit_atomic(struct drm_client_dev *client, bool
{
struct drm_device *dev = client->dev;
struct drm_plane *plane;
struct drm_atomic_state *state;
struct drm_atomic_commit *state;
struct drm_modeset_acquire_ctx ctx;
struct drm_mode_set *mode_set;
int ret;
drm_modeset_acquire_init(&ctx, 0);
state = drm_atomic_state_alloc(dev);
state = drm_atomic_commit_alloc(dev);
if (!state) {
ret = -ENOMEM;
goto out_ctx;
@ -1107,7 +1107,7 @@ static int drm_client_modeset_commit_atomic(struct drm_client_dev *client, bool
if (ret == -EDEADLK)
goto backoff;
drm_atomic_state_put(state);
drm_atomic_commit_put(state);
out_ctx:
drm_modeset_drop_locks(&ctx);
drm_modeset_acquire_fini(&ctx);
@ -1115,7 +1115,7 @@ static int drm_client_modeset_commit_atomic(struct drm_client_dev *client, bool
return ret;
backoff:
drm_atomic_state_clear(state);
drm_atomic_commit_clear(state);
drm_modeset_backoff(&ctx);
goto retry;

6
drivers/gpu/drm/drm_color_mgmt.c
View File

@ -280,7 +280,7 @@ static int drm_crtc_legacy_gamma_set(struct drm_crtc *crtc,
struct drm_modeset_acquire_ctx *ctx)
{
struct drm_device *dev = crtc->dev;
struct drm_atomic_state *state;
struct drm_atomic_commit *state;
struct drm_crtc_state *crtc_state;
struct drm_property_blob *blob;
struct drm_color_lut *blob_data;
@ -300,7 +300,7 @@ static int drm_crtc_legacy_gamma_set(struct drm_crtc *crtc,
else
return -ENODEV;
state = drm_atomic_state_alloc(crtc->dev);
state = drm_atomic_commit_alloc(crtc->dev);
if (!state)
return -ENOMEM;
@ -339,7 +339,7 @@ static int drm_crtc_legacy_gamma_set(struct drm_crtc *crtc,
ret = drm_atomic_commit(state);
fail:
drm_atomic_state_put(state);
drm_atomic_commit_put(state);
drm_property_blob_put(blob);
return ret;
}

2
drivers/gpu/drm/drm_crtc_helper.c
View File

@ -446,7 +446,7 @@ EXPORT_SYMBOL(drm_crtc_helper_set_mode);
* RETURNS:
* Zero on success, or an errno code otherwise.
*/
int drm_crtc_helper_atomic_check(struct drm_crtc *crtc, struct drm_atomic_state *state)
int drm_crtc_helper_atomic_check(struct drm_crtc *crtc, struct drm_atomic_commit *state)
{
struct drm_crtc_state *new_crtc_state = drm_atomic_get_new_crtc_state(state, crtc);

10
drivers/gpu/drm/drm_crtc_internal.h
View File

@ -44,7 +44,7 @@ enum drm_connector_force;
enum drm_mode_status;
struct cea_sad;
struct drm_atomic_state;
struct drm_atomic_commit;
struct drm_bridge;
struct drm_connector;
struct drm_crtc;
@ -248,16 +248,16 @@ void drm_atomic_debugfs_init(struct drm_device *dev);
int __drm_atomic_helper_disable_plane(struct drm_plane *plane,
struct drm_plane_state *plane_state);
int __drm_atomic_helper_set_config(struct drm_mode_set *set,
struct drm_atomic_state *state);
struct drm_atomic_commit *state);
void drm_atomic_print_new_state(const struct drm_atomic_state *state,
void drm_atomic_print_new_state(const struct drm_atomic_commit *state,
struct drm_printer *p);
/* drm_atomic_uapi.c */
int drm_atomic_connector_commit_dpms(struct drm_atomic_state *state,
int drm_atomic_connector_commit_dpms(struct drm_atomic_commit *state,
struct drm_connector *connector,
int mode);
int drm_atomic_set_property(struct drm_atomic_state *state,
int drm_atomic_set_property(struct drm_atomic_commit *state,
struct drm_file *file_priv,
struct drm_mode_object *obj,
struct drm_property *prop,

10
drivers/gpu/drm/drm_damage_helper.c
View File

@ -66,7 +66,7 @@ static void convert_clip_rect_to_rect(const struct drm_clip_rect *src,
* full plane update should happen. It also ensure helper iterator will return
* &drm_plane_state.src as damage.
*/
void drm_atomic_helper_check_plane_damage(struct drm_atomic_state *state,
void drm_atomic_helper_check_plane_damage(struct drm_atomic_commit *state,
struct drm_plane_state *plane_state)
{
struct drm_crtc_state *crtc_state;
@ -114,7 +114,7 @@ int drm_atomic_helper_dirtyfb(struct drm_framebuffer *fb,
struct drm_modeset_acquire_ctx ctx;
struct drm_property_blob *damage = NULL;
struct drm_mode_rect *rects = NULL;
struct drm_atomic_state *state;
struct drm_atomic_commit *state;
struct drm_plane *plane;
int ret = 0;
@ -125,7 +125,7 @@ int drm_atomic_helper_dirtyfb(struct drm_framebuffer *fb,
drm_modeset_acquire_init(&ctx,
file_priv ? DRM_MODESET_ACQUIRE_INTERRUPTIBLE : 0);
state = drm_atomic_state_alloc(fb->dev);
state = drm_atomic_commit_alloc(fb->dev);
if (!state) {
ret = -ENOMEM;
goto out_drop_locks;
@ -184,7 +184,7 @@ int drm_atomic_helper_dirtyfb(struct drm_framebuffer *fb,
out:
if (ret == -EDEADLK) {
drm_atomic_state_clear(state);
drm_atomic_commit_clear(state);
ret = drm_modeset_backoff(&ctx);
if (!ret)
goto retry;
@ -192,7 +192,7 @@ int drm_atomic_helper_dirtyfb(struct drm_framebuffer *fb,
drm_property_blob_put(damage);
kfree(rects);
drm_atomic_state_put(state);
drm_atomic_commit_put(state);
out_drop_locks:
drm_modeset_drop_locks(&ctx);

8
drivers/gpu/drm/drm_fb_helper.c
View File

@ -763,7 +763,7 @@ static int setcmap_atomic(struct fb_cmap *cmap, struct fb_info *info)
struct drm_property_blob *gamma_lut = NULL;
struct drm_modeset_acquire_ctx ctx;
struct drm_crtc_state *crtc_state;
struct drm_atomic_state *state;
struct drm_atomic_commit *state;
struct drm_mode_set *modeset;
struct drm_crtc *crtc;
u16 *r, *g, *b;
@ -772,7 +772,7 @@ static int setcmap_atomic(struct fb_cmap *cmap, struct fb_info *info)
drm_modeset_acquire_init(&ctx, 0);
state = drm_atomic_state_alloc(dev);
state = drm_atomic_commit_alloc(dev);
if (!state) {
ret = -ENOMEM;
goto out_ctx;
@ -831,7 +831,7 @@ static int setcmap_atomic(struct fb_cmap *cmap, struct fb_info *info)
goto backoff;
drm_property_blob_put(gamma_lut);
drm_atomic_state_put(state);
drm_atomic_commit_put(state);
out_ctx:
drm_modeset_drop_locks(&ctx);
drm_modeset_acquire_fini(&ctx);
@ -839,7 +839,7 @@ static int setcmap_atomic(struct fb_cmap *cmap, struct fb_info *info)
return ret;
backoff:
drm_atomic_state_clear(state);
drm_atomic_commit_clear(state);
drm_modeset_backoff(&ctx);
goto retry;
}

8
drivers/gpu/drm/drm_framebuffer.c
View File

@ -1000,7 +1000,7 @@ static int atomic_remove_fb(struct drm_framebuffer *fb)
{
struct drm_modeset_acquire_ctx ctx;
struct drm_device *dev = fb->dev;
struct drm_atomic_state *state;
struct drm_atomic_commit *state;
struct drm_plane *plane;
struct drm_connector *conn __maybe_unused;
struct drm_connector_state *conn_state;
@ -1011,7 +1011,7 @@ static int atomic_remove_fb(struct drm_framebuffer *fb)
retry_disable:
drm_modeset_acquire_init(&ctx, 0);
state = drm_atomic_state_alloc(dev);
state = drm_atomic_commit_alloc(dev);
if (!state) {
ret = -ENOMEM;
goto out;
@ -1081,12 +1081,12 @@ static int atomic_remove_fb(struct drm_framebuffer *fb)
unlock:
if (ret == -EDEADLK) {
drm_atomic_state_clear(state);
drm_atomic_commit_clear(state);
drm_modeset_backoff(&ctx);
goto retry;
}
drm_atomic_state_put(state);
drm_atomic_commit_put(state);
out:
drm_modeset_drop_locks(&ctx);

8
drivers/gpu/drm/drm_mipi_dbi.c
View File

@ -344,7 +344,7 @@ EXPORT_SYMBOL(drm_mipi_dbi_crtc_helper_mode_valid);
* 0 on success, or a negative errno code otherwise.
*/
int drm_mipi_dbi_plane_helper_atomic_check(struct drm_plane *plane,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state, plane);
struct drm_crtc_state *new_crtc_state = NULL;
@ -375,7 +375,7 @@ EXPORT_SYMBOL(drm_mipi_dbi_plane_helper_atomic_check);
* this as their struct &drm_plane_helper_funcs.atomic_update callback.
*/
void drm_mipi_dbi_plane_helper_atomic_update(struct drm_plane *plane,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_plane_state *plane_state = plane->state;
struct drm_shadow_plane_state *shadow_plane_state = to_drm_shadow_plane_state(plane_state);
@ -434,7 +434,7 @@ static void mipi_dbi_blank(struct mipi_dbi_dev *dbidev)
* Returns:
* 0 on success, or a negative errno code otherwise.
*/
int drm_mipi_dbi_crtc_helper_atomic_check(struct drm_crtc *crtc, struct drm_atomic_state *state)
int drm_mipi_dbi_crtc_helper_atomic_check(struct drm_crtc *crtc, struct drm_atomic_commit *state)
{
struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
int ret;
@ -461,7 +461,7 @@ EXPORT_SYMBOL(drm_mipi_dbi_crtc_helper_atomic_check);
* struct &drm_crtc_helper_funcs.atomic_disable callback.
*/
void drm_mipi_dbi_crtc_helper_atomic_disable(struct drm_crtc *crtc,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct mipi_dbi_dev *dbidev = drm_to_mipi_dbi_dev(crtc->dev);

8
drivers/gpu/drm/drm_mode_object.c
View File

@ -561,11 +561,11 @@ static int set_property_atomic(struct drm_mode_object *obj,
uint64_t prop_value)
{
struct drm_device *dev = prop->dev;
struct drm_atomic_state *state;
struct drm_atomic_commit *state;
struct drm_modeset_acquire_ctx ctx;
int ret;
state = drm_atomic_state_alloc(dev);
state = drm_atomic_commit_alloc(dev);
if (!state)
return -ENOMEM;
@ -590,12 +590,12 @@ static int set_property_atomic(struct drm_mode_object *obj,
}
out:
if (ret == -EDEADLK) {
drm_atomic_state_clear(state);
drm_atomic_commit_clear(state);
drm_modeset_backoff(&ctx);
goto retry;
}
drm_atomic_state_put(state);
drm_atomic_commit_put(state);
drm_modeset_drop_locks(&ctx);
drm_modeset_acquire_fini(&ctx);

2
drivers/gpu/drm/drm_modeset_helper.c
View File

@ -190,7 +190,7 @@ EXPORT_SYMBOL(drm_crtc_init);
*/
int drm_mode_config_helper_suspend(struct drm_device *dev)
{
struct drm_atomic_state *state;
struct drm_atomic_commit *state;
if (!dev)
return 0;

12
drivers/gpu/drm/drm_self_refresh_helper.c
View File

@ -73,7 +73,7 @@ static void drm_self_refresh_helper_entry_work(struct work_struct *work)
struct drm_crtc *crtc = sr_data->crtc;
struct drm_device *dev = crtc->dev;
struct drm_modeset_acquire_ctx ctx;
struct drm_atomic_state *state;
struct drm_atomic_commit *state;
struct drm_connector *conn;
struct drm_connector_state *conn_state;
struct drm_crtc_state *crtc_state;
@ -81,7 +81,7 @@ static void drm_self_refresh_helper_entry_work(struct work_struct *work)
drm_modeset_acquire_init(&ctx, 0);
state = drm_atomic_state_alloc(dev);
state = drm_atomic_commit_alloc(dev);
if (!state) {
ret = -ENOMEM;
goto out_drop_locks;
@ -117,13 +117,13 @@ static void drm_self_refresh_helper_entry_work(struct work_struct *work)
out:
if (ret == -EDEADLK) {
drm_atomic_state_clear(state);
drm_atomic_commit_clear(state);
ret = drm_modeset_backoff(&ctx);
if (!ret)
goto retry;
}
drm_atomic_state_put(state);
drm_atomic_commit_put(state);
out_drop_locks:
drm_modeset_drop_locks(&ctx);
@ -143,7 +143,7 @@ static void drm_self_refresh_helper_entry_work(struct work_struct *work)
* entering self refresh mode after activity.
*/
void
drm_self_refresh_helper_update_avg_times(struct drm_atomic_state *state,
drm_self_refresh_helper_update_avg_times(struct drm_atomic_commit *state,
unsigned int commit_time_ms,
unsigned int new_self_refresh_mask)
{
@ -185,7 +185,7 @@ EXPORT_SYMBOL(drm_self_refresh_helper_update_avg_times);
* At the end, we queue up the self refresh entry work so we can enter PSR after
* the desired delay.
*/
void drm_self_refresh_helper_alter_state(struct drm_atomic_state *state)
void drm_self_refresh_helper_alter_state(struct drm_atomic_commit *state)
{
struct drm_crtc *crtc;
struct drm_crtc_state *crtc_state;

10
drivers/gpu/drm/drm_simple_kms_helper.c
View File

@ -53,7 +53,7 @@ drm_simple_kms_crtc_mode_valid(struct drm_crtc *crtc,
}
static int drm_simple_kms_crtc_check(struct drm_crtc *crtc,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
int ret;
@ -70,7 +70,7 @@ static int drm_simple_kms_crtc_check(struct drm_crtc *crtc,
}
static void drm_simple_kms_crtc_enable(struct drm_crtc *crtc,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_plane *plane;
struct drm_simple_display_pipe *pipe;
@ -84,7 +84,7 @@ static void drm_simple_kms_crtc_enable(struct drm_crtc *crtc,
}
static void drm_simple_kms_crtc_disable(struct drm_crtc *crtc,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_simple_display_pipe *pipe;
@ -169,7 +169,7 @@ static const struct drm_crtc_funcs drm_simple_kms_crtc_funcs = {
};
static int drm_simple_kms_plane_atomic_check(struct drm_plane *plane,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_plane_state *plane_state = drm_atomic_get_new_plane_state(state,
plane);
@ -198,7 +198,7 @@ static int drm_simple_kms_plane_atomic_check(struct drm_plane *plane,
}
static void drm_simple_kms_plane_atomic_update(struct drm_plane *plane,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_plane_state *old_pstate = drm_atomic_get_old_plane_state(state,
plane);

6
drivers/gpu/drm/drm_vblank_helper.c
View File

@ -49,7 +49,7 @@
* See also struct &drm_crtc_helper_funcs.atomic_flush.
*/
void drm_crtc_vblank_atomic_flush(struct drm_crtc *crtc,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_device *dev = crtc->dev;
struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
@ -82,7 +82,7 @@ EXPORT_SYMBOL(drm_crtc_vblank_atomic_flush);
* See also struct &drm_crtc_helper_funcs.atomic_enable.
*/
void drm_crtc_vblank_atomic_enable(struct drm_crtc *crtc,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
drm_crtc_vblank_on(crtc);
}
@ -99,7 +99,7 @@ EXPORT_SYMBOL(drm_crtc_vblank_atomic_enable);
* See also struct &drm_crtc_funcs.atomic_disable.
*/
void drm_crtc_vblank_atomic_disable(struct drm_crtc *crtc,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
drm_crtc_vblank_off(crtc);
}

10
drivers/gpu/drm/exynos/exynos_drm_crtc.c
View File

@ -19,7 +19,7 @@
#include "exynos_drm_plane.h"
static void exynos_drm_crtc_atomic_enable(struct drm_crtc *crtc,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);
@ -30,7 +30,7 @@ static void exynos_drm_crtc_atomic_enable(struct drm_crtc *crtc,
}
static void exynos_drm_crtc_atomic_disable(struct drm_crtc *crtc,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);
@ -48,7 +48,7 @@ static void exynos_drm_crtc_atomic_disable(struct drm_crtc *crtc,
}
static int exynos_crtc_atomic_check(struct drm_crtc *crtc,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,
crtc);
@ -64,7 +64,7 @@ static int exynos_crtc_atomic_check(struct drm_crtc *crtc,
}
static void exynos_crtc_atomic_begin(struct drm_crtc *crtc,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);
@ -73,7 +73,7 @@ static void exynos_crtc_atomic_begin(struct drm_crtc *crtc,
}
static void exynos_crtc_atomic_flush(struct drm_crtc *crtc,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);

6
drivers/gpu/drm/exynos/exynos_drm_plane.c
View File

@ -230,7 +230,7 @@ exynos_drm_plane_check_size(const struct exynos_drm_plane_config *config,
}
static int exynos_plane_atomic_check(struct drm_plane *plane,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state,
plane);
@ -254,7 +254,7 @@ static int exynos_plane_atomic_check(struct drm_plane *plane,
}
static void exynos_plane_atomic_update(struct drm_plane *plane,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_plane_state *new_state = drm_atomic_get_new_plane_state(state,
plane);
@ -269,7 +269,7 @@ static void exynos_plane_atomic_update(struct drm_plane *plane,
}
static void exynos_plane_atomic_disable(struct drm_plane *plane,
struct drm_atomic_state *state)
struct drm_atomic_commit *state)
{
struct drm_plane_state *old_state = drm_atomic_get_old_plane_state(state, plane);
struct exynos_drm_plane *exynos_plane = to_exynos_plane(plane);

Some files were not shown because too many files have changed in this diff Show More