Commit e05b08d7 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/atomic: convert drm_atomic_get_{old, new}_colorop_state() into proper functions 



There is no real reason to include drm_colorop.h from drm_atomic.h, as
drm_atomic_get_{old,new}_colorop_state() have no real reason to be
static inline.

Convert the static inlines to proper functions, and drop the include to
reduce the include dependencies and improve data hiding.

v2: Fix vkms build failures (Alex)

Fixes: cfc27680 ("drm/colorop: Introduce new drm_colorop mode object")
Cc: Simon Ser <contact@emersion.fr>
Cc: Alex Hung <alex.hung@amd.com>
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Daniel Stone <daniels@collabora.com>
Cc: Melissa Wen <mwen@igalia.com>
Cc: Sebastian Wick <sebastian.wick@redhat.com>
Cc: Alex Hung <alex.hung@amd.com>
Reviewed-by: default avatarAlex Hung <alex.hung@amd.com>
Link: https://patch.msgid.link/20251219114939.1069851-1-jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 50c26c30

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c

+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ 
 * Authors: AMD

 *

 */



#include <drm/drm_colorop.h>



#include "amdgpu.h"

#include "amdgpu_mode.h"

#include "amdgpu_dm.h"

drivers/gpu/drm/drm_atomic.c

+32 −0
Original line number Diff line number Diff line
@@ -641,6 +641,38 @@ drm_atomic_get_colorop_state(struct drm_atomic_state *state, 
}

EXPORT_SYMBOL(drm_atomic_get_colorop_state);



/**

 * drm_atomic_get_old_colorop_state - get colorop state, if it exists

 * @state: global atomic state object

 * @colorop: colorop to grab

 *

 * This function returns the old colorop state for the given colorop, or

 * 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,

				 struct drm_colorop *colorop)

{

	return state->colorops[drm_colorop_index(colorop)].old_state;

}

EXPORT_SYMBOL(drm_atomic_get_old_colorop_state);



/**

 * drm_atomic_get_new_colorop_state - get colorop state, if it exists

 * @state: global atomic state object

 * @colorop: colorop to grab

 *

 * This function returns the new colorop state for the given colorop, or

 * 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,

				 struct drm_colorop *colorop)

{

	return state->colorops[drm_colorop_index(colorop)].new_state;

}

EXPORT_SYMBOL(drm_atomic_get_new_colorop_state);



static bool

plane_switching_crtc(const struct drm_plane_state *old_plane_state,

		     const struct drm_plane_state *new_plane_state)

drivers/gpu/drm/drm_atomic_helper.c

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <drm/drm_atomic_uapi.h>

#include <drm/drm_blend.h>

#include <drm/drm_bridge.h>

#include <drm/drm_colorop.h>

#include <drm/drm_damage_helper.h>

#include <drm/drm_device.h>

#include <drm/drm_drv.h>

drivers/gpu/drm/i915/display/intel_display_types.h

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <drm/display/drm_dp_tunnel.h>

#include <drm/display/drm_dsc.h>

#include <drm/drm_atomic.h>

#include <drm/drm_colorop.h>

#include <drm/drm_crtc.h>

#include <drm/drm_encoder.h>

#include <drm/drm_framebuffer.h>

drivers/gpu/drm/vkms/vkms_composer.c

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_blend.h>

#include <drm/drm_colorop.h>

#include <drm/drm_fourcc.h>

#include <drm/drm_fixed.h>

#include <drm/drm_gem_framebuffer_helper.h>