archives/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-03-08 01:04:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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: cfc27680ee ("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: Alex Hung <alex.hung@amd.com>
Link: https://patch.msgid.link/20251219114939.1069851-1-jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
Jani Nikula 2025-12-19 13:49:39 +02:00
parent 50c26c301c
commit e05b08d7d0
7 changed files with 47 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

3
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
View file

@ -23,6 +23,9 @@
* Authors: AMD
*
*/
#include <drm/drm_colorop.h>
#include "amdgpu.h"
#include "amdgpu_mode.h"
#include "amdgpu_dm.h"

32
drivers/gpu/drm/drm_atomic.c
View file

@ -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)

1
drivers/gpu/drm/drm_atomic_helper.c
View file

@ -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>

1
drivers/gpu/drm/i915/display/intel_display_types.h
View file

@ -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>

1
drivers/gpu/drm/vkms/vkms_composer.c
View file

@ -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>

1
drivers/gpu/drm/vkms/vkms_drv.c
View file

@ -17,6 +17,7 @@
#include <drm/drm_gem.h>
#include <drm/drm_atomic.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_colorop.h>
#include <drm/drm_drv.h>
#include <drm/drm_fbdev_shmem.h>
#include <drm/drm_file.h>

39
include/drm/drm_atomic.h
View file

@ -30,7 +30,6 @@
#include <drm/drm_crtc.h>
#include <drm/drm_util.h>
#include <drm/drm_colorop.h>
/**
* struct drm_crtc_commit - track modeset commits on a CRTC
@ -712,6 +711,14 @@ drm_atomic_get_plane_state(struct drm_atomic_state *state,
struct drm_colorop_state *
drm_atomic_get_colorop_state(struct drm_atomic_state *state,
struct drm_colorop *colorop);
struct drm_colorop_state *
drm_atomic_get_old_colorop_state(struct drm_atomic_state *state,
struct drm_colorop *colorop);
struct drm_colorop_state *
drm_atomic_get_new_colorop_state(struct drm_atomic_state *state,
struct drm_colorop *colorop);
struct drm_connector_state * __must_check
drm_atomic_get_connector_state(struct drm_atomic_state *state,
struct drm_connector *connector);
@ -808,36 +815,6 @@ drm_atomic_get_new_plane_state(const struct drm_atomic_state *state,
return state->planes[drm_plane_index(plane)].new_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.
*/
static inline 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;
}
/**
* 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.
*/
static inline 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;
}
/**
* drm_atomic_get_old_connector_state - get connector state, if it exists
* @state: global atomic state object