mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-12 13:55:32 +00:00
Code Issues Releases Wiki Activity

drm/i915: Pass intel_connector to intel_panel_{init,fini}()

Browse source 
All the other intel_panel functions take struct intel_connector,
so might as well make init()/fini() take one as well.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220323182935.4701-2-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
Ville Syrjälä 2022-03-23 20:29:27 +02:00
parent d13dde4495
commit 5d2fd49db9
9 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/gpu/drm/i915/display/icl_dsi.c
View file

@ -2057,7 +2057,7 @@ void icl_dsi_init(struct drm_i915_private *dev_priv)
goto err; goto err;
} }
intel_panel_init(&intel_connector->panel, fixed_mode, NULL); intel_panel_init(intel_connector, fixed_mode, NULL);
intel_backlight_setup(intel_connector, INVALID_PIPE); intel_backlight_setup(intel_connector, INVALID_PIPE);
if (dev_priv->vbt.dsi.config->dual_link) if (dev_priv->vbt.dsi.config->dual_link)

2
drivers/gpu/drm/i915/display/intel_connector.c
View file

@ -102,7 +102,7 @@ void intel_connector_destroy(struct drm_connector *connector)
if (!IS_ERR_OR_NULL(intel_connector->edid)) if (!IS_ERR_OR_NULL(intel_connector->edid))
kfree(intel_connector->edid); kfree(intel_connector->edid);
intel_panel_fini(&intel_connector->panel); intel_panel_fini(intel_connector);
drm_connector_cleanup(connector); drm_connector_cleanup(connector);

2
drivers/gpu/drm/i915/display/intel_dp.c
View file

@ -5053,7 +5053,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
pipe_name(pipe)); pipe_name(pipe));
} }
intel_panel_init(&intel_connector->panel, fixed_mode, downclock_mode); intel_panel_init(intel_connector, fixed_mode, downclock_mode);
if (!(dev_priv->quirks & QUIRK_NO_PPS_BACKLIGHT_POWER_HOOK)) if (!(dev_priv->quirks & QUIRK_NO_PPS_BACKLIGHT_POWER_HOOK))
intel_connector->panel.backlight.power = intel_pps_backlight_power; intel_connector->panel.backlight.power = intel_pps_backlight_power;
intel_backlight_setup(intel_connector, pipe); intel_backlight_setup(intel_connector, pipe);

2
drivers/gpu/drm/i915/display/intel_dvo.c
View file

@ -549,7 +549,7 @@ void intel_dvo_init(struct drm_i915_private *dev_priv)
* headers, likely), so for now, just get the current * headers, likely), so for now, just get the current
* mode being output through DVO. * mode being output through DVO.
*/ */
intel_panel_init(&intel_connector->panel, intel_panel_init(intel_connector,
intel_dvo_get_current_mode(intel_encoder), intel_dvo_get_current_mode(intel_encoder),
NULL); NULL);
intel_dvo->panel_wants_dither = true; intel_dvo->panel_wants_dither = true;

2
drivers/gpu/drm/i915/display/intel_lvds.c
View file

@ -996,7 +996,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)
out: out:
mutex_unlock(&dev->mode_config.mutex); mutex_unlock(&dev->mode_config.mutex);
intel_panel_init(&intel_connector->panel, fixed_mode, downclock_mode); intel_panel_init(intel_connector, fixed_mode, downclock_mode);
intel_backlight_setup(intel_connector, INVALID_PIPE); intel_backlight_setup(intel_connector, INVALID_PIPE);
lvds_encoder->is_dual_link = compute_is_dual_link_lvds(lvds_encoder, fixed_mode); lvds_encoder->is_dual_link = compute_is_dual_link_lvds(lvds_encoder, fixed_mode);

11
drivers/gpu/drm/i915/display/intel_panel.c
View file

@ -599,10 +599,12 @@ intel_panel_mode_valid(struct intel_connector *connector,
return MODE_OK; return MODE_OK;
} }
int intel_panel_init(struct intel_panel *panel, int intel_panel_init(struct intel_connector *connector,
struct drm_display_mode *fixed_mode, struct drm_display_mode *fixed_mode,
struct drm_display_mode *downclock_mode) struct drm_display_mode *downclock_mode)
{ {
struct intel_panel *panel = &connector->panel;
intel_backlight_init_funcs(panel); intel_backlight_init_funcs(panel);
if (fixed_mode) if (fixed_mode)
@ -613,16 +615,15 @@ int intel_panel_init(struct intel_panel *panel,
return 0; return 0;
} }
void intel_panel_fini(struct intel_panel *panel) void intel_panel_fini(struct intel_connector *connector)
{ {
struct intel_connector *intel_connector = struct intel_panel *panel = &connector->panel;
container_of(panel, struct intel_connector, panel);
struct drm_display_mode *fixed_mode, *next; struct drm_display_mode *fixed_mode, *next;
intel_backlight_destroy(panel); intel_backlight_destroy(panel);
list_for_each_entry_safe(fixed_mode, next, &panel->fixed_modes, head) { list_for_each_entry_safe(fixed_mode, next, &panel->fixed_modes, head) {
list_del(&fixed_mode->head); list_del(&fixed_mode->head);
drm_mode_destroy(intel_connector->base.dev, fixed_mode); drm_mode_destroy(connector->base.dev, fixed_mode);
} }
} }

5
drivers/gpu/drm/i915/display/intel_panel.h
View file

@ -16,12 +16,11 @@ struct drm_display_mode;
struct drm_i915_private; struct drm_i915_private;
struct intel_connector; struct intel_connector;
struct intel_crtc_state; struct intel_crtc_state;
struct intel_panel;
int intel_panel_init(struct intel_panel *panel, int intel_panel_init(struct intel_connector *connector,
struct drm_display_mode *fixed_mode, struct drm_display_mode *fixed_mode,
struct drm_display_mode *downclock_mode); struct drm_display_mode *downclock_mode);
void intel_panel_fini(struct intel_panel *panel); void intel_panel_fini(struct intel_connector *connector);
enum drm_connector_status enum drm_connector_status
intel_panel_detect(struct drm_connector *connector, bool force); intel_panel_detect(struct drm_connector *connector, bool force);
bool intel_panel_use_ssc(struct drm_i915_private *i915); bool intel_panel_use_ssc(struct drm_i915_private *i915);

2
drivers/gpu/drm/i915/display/intel_sdvo.c
View file

@ -2928,7 +2928,7 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device)
struct drm_display_mode *fixed_mode = struct drm_display_mode *fixed_mode =
drm_mode_duplicate(connector->dev, mode); drm_mode_duplicate(connector->dev, mode);
intel_panel_init(&intel_connector->panel, intel_panel_init(intel_connector,
fixed_mode, NULL); fixed_mode, NULL);
break; break;
} }

2
drivers/gpu/drm/i915/display/vlv_dsi.c
View file

@ -1987,7 +1987,7 @@ void vlv_dsi_init(struct drm_i915_private *dev_priv)
goto err_cleanup_connector; goto err_cleanup_connector;
} }
intel_panel_init(&intel_connector->panel, fixed_mode, NULL); intel_panel_init(intel_connector, fixed_mode, NULL);
intel_backlight_setup(intel_connector, INVALID_PIPE); intel_backlight_setup(intel_connector, INVALID_PIPE);
vlv_dsi_add_properties(intel_connector, fixed_mode); vlv_dsi_add_properties(intel_connector, fixed_mode);