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

drm/i915/display: move color funcs under color sub-struct

Browse Source 
Move color related functions under color sub-struct of struct
intel_display.

The funcs sub-struct of struct intel_display seems unnecessary. Instead
of display->funcs.FEATURE, prefer display->FEATURE.funcs.

Reviewed-by: Nemesa Garg <nemesa.garg@intel.com>
Link: https://patch.msgid.link/77cc5dd365f3346c4cbbe7a5d883bca413138c94.1777537663.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
Jani Nikula 2026-04-30 11:28:46 +03:00
parent b784773185
commit 51da56f773
2 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
drivers/gpu/drm/i915/display/intel_color.c
View File

@ -1933,7 +1933,7 @@ void intel_color_load_luts(const struct intel_crtc_state *crtc_state)
if (crtc_state->dsb_color)
return;
display->funcs.color->load_luts(crtc_state);
display->color.funcs->load_luts(crtc_state);
}
void intel_color_commit_noarm(struct intel_dsb *dsb,
@ -1941,8 +1941,8 @@ void intel_color_commit_noarm(struct intel_dsb *dsb,
{
struct intel_display *display = to_intel_display(crtc_state);
if (display->funcs.color->color_commit_noarm)
display->funcs.color->color_commit_noarm(dsb, crtc_state);
if (display->color.funcs->color_commit_noarm)
display->color.funcs->color_commit_noarm(dsb, crtc_state);
}
void intel_color_commit_arm(struct intel_dsb *dsb,
@ -1950,15 +1950,15 @@ void intel_color_commit_arm(struct intel_dsb *dsb,
{
struct intel_display *display = to_intel_display(crtc_state);
display->funcs.color->color_commit_arm(dsb, crtc_state);
display->color.funcs->color_commit_arm(dsb, crtc_state);
}
void intel_color_post_update(const struct intel_crtc_state *crtc_state)
{
struct intel_display *display = to_intel_display(crtc_state);
if (display->funcs.color->color_post_update)
display->funcs.color->color_post_update(crtc_state);
if (display->color.funcs->color_post_update)
display->color.funcs->color_post_update(crtc_state);
}
void intel_color_modeset(const struct intel_crtc_state *crtc_state)
@ -2022,7 +2022,7 @@ void intel_color_prepare_commit(struct intel_atomic_state *state,
if (!intel_color_uses_dsb(crtc_state))
return;
display->funcs.color->load_luts(crtc_state);
display->color.funcs->load_luts(crtc_state);
if (crtc_state->use_dsb && intel_color_uses_chained_dsb(crtc_state)) {
intel_vrr_send_push(crtc_state->dsb_color, crtc_state);
@ -2113,19 +2113,19 @@ int intel_color_check(struct intel_atomic_state *state,
if (!intel_crtc_needs_color_update(new_crtc_state))
return 0;
return display->funcs.color->color_check(state, crtc);
return display->color.funcs->color_check(state, crtc);
}
void intel_color_get_config(struct intel_crtc_state *crtc_state)
{
struct intel_display *display = to_intel_display(crtc_state);
display->funcs.color->get_config(crtc_state);
display->color.funcs->get_config(crtc_state);
display->funcs.color->read_luts(crtc_state);
display->color.funcs->read_luts(crtc_state);
if (display->funcs.color->read_csc)
display->funcs.color->read_csc(crtc_state);
if (display->color.funcs->read_csc)
display->color.funcs->read_csc(crtc_state);
}
bool intel_color_lut_equal(const struct intel_crtc_state *crtc_state,
@ -2142,7 +2142,7 @@ bool intel_color_lut_equal(const struct intel_crtc_state *crtc_state,
if (!is_pre_csc_lut && crtc_state->c8_planes)
return true;
return display->funcs.color->lut_equal(crtc_state, blob1, blob2,
return display->color.funcs->lut_equal(crtc_state, blob1, blob2,
is_pre_csc_lut);
}
@ -4253,8 +4253,8 @@ intel_color_load_plane_csc_matrix(struct intel_dsb *dsb,
{
struct intel_display *display = to_intel_display(plane_state);
if (display->funcs.color->load_plane_csc_matrix)
display->funcs.color->load_plane_csc_matrix(dsb, plane_state);
if (display->color.funcs->load_plane_csc_matrix)
display->color.funcs->load_plane_csc_matrix(dsb, plane_state);
}
static void
@ -4263,8 +4263,8 @@ intel_color_load_plane_luts(struct intel_dsb *dsb,
{
struct intel_display *display = to_intel_display(plane_state);
if (display->funcs.color->load_plane_luts)
display->funcs.color->load_plane_luts(dsb, plane_state);
if (display->color.funcs->load_plane_luts)
display->color.funcs->load_plane_luts(dsb, plane_state);
}
bool
@ -4346,29 +4346,29 @@ void intel_color_init_hooks(struct intel_display *display)
{
if (HAS_GMCH(display)) {
if (display->platform.cherryview)
display->funcs.color = &chv_color_funcs;
display->color.funcs = &chv_color_funcs;
else if (display->platform.valleyview)
display->funcs.color = &vlv_color_funcs;
display->color.funcs = &vlv_color_funcs;
else if (DISPLAY_VER(display) >= 4)
display->funcs.color = &i965_color_funcs;
display->color.funcs = &i965_color_funcs;
else
display->funcs.color = &i9xx_color_funcs;
display->color.funcs = &i9xx_color_funcs;
} else {
if (DISPLAY_VER(display) >= 12)
display->funcs.color = &tgl_color_funcs;
display->color.funcs = &tgl_color_funcs;
else if (DISPLAY_VER(display) == 11)
display->funcs.color = &icl_color_funcs;
display->color.funcs = &icl_color_funcs;
else if (DISPLAY_VER(display) == 10)
display->funcs.color = &glk_color_funcs;
display->color.funcs = &glk_color_funcs;
else if (DISPLAY_VER(display) == 9)
display->funcs.color = &skl_color_funcs;
display->color.funcs = &skl_color_funcs;
else if (DISPLAY_VER(display) == 8)
display->funcs.color = &bdw_color_funcs;
display->color.funcs = &bdw_color_funcs;
else if (display->platform.haswell)
display->funcs.color = &hsw_color_funcs;
display->color.funcs = &hsw_color_funcs;
else if (DISPLAY_VER(display) == 7)
display->funcs.color = &ivb_color_funcs;
display->color.funcs = &ivb_color_funcs;
else
display->funcs.color = &ilk_color_funcs;
display->color.funcs = &ilk_color_funcs;
}
}

6
drivers/gpu/drm/i915/display/intel_display_core.h
View File

@ -319,9 +319,6 @@ struct intel_display {
/* fdi display functions */
const struct intel_fdi_funcs *fdi;
/* Display internal color functions */
const struct intel_color_funcs *color;
} funcs;
struct {
@ -365,6 +362,9 @@ struct intel_display {
} cdclk;
struct {
/* internal color functions */
const struct intel_color_funcs *funcs;
struct drm_property_blob *glk_linear_degamma_lut;
} color;