Commit 1562a536 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Extract intel_connector_cancel_modeset_retry_work() 



Hide the implementation details of the modeset retry work
better.

v2: Include prototype and sort includes correctly (Jani)

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250213150220.13580-4-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 78ecd904

drivers/gpu/drm/i915/display/intel_connector.c

+6 −0
Original line number Diff line number Diff line
@@ -70,6 +70,12 @@ void intel_connector_queue_modeset_retry_work(struct intel_connector *connector) 
		drm_connector_put(&connector->base);

}



void intel_connector_cancel_modeset_retry_work(struct intel_connector *connector)

{

	if (cancel_work_sync(&connector->modeset_retry_work))

		drm_connector_put(&connector->base);

}



int intel_connector_init(struct intel_connector *connector)

{

	struct intel_digital_connector_state *conn_state;

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

+1 −0
Original line number Diff line number Diff line
@@ -34,5 +34,6 @@ void intel_attach_hdmi_colorspace_property(struct drm_connector *connector); 
void intel_attach_dp_colorspace_property(struct drm_connector *connector);

void intel_attach_scaling_mode_property(struct drm_connector *connector);

void intel_connector_queue_modeset_retry_work(struct intel_connector *connector);

void intel_connector_cancel_modeset_retry_work(struct intel_connector *connector);



#endif /* __INTEL_CONNECTOR_H__ */

drivers/gpu/drm/i915/display/intel_display.c

+2 −2
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ 
#include "intel_cdclk.h"

#include "intel_clock_gating.h"

#include "intel_color.h"

#include "intel_connector.h"

#include "intel_crt.h"

#include "intel_crtc.h"

#include "intel_crtc_state_dump.h"
@@ -8544,8 +8545,7 @@ void intel_hpd_poll_fini(struct drm_i915_private *i915) 
	/* Kill all the work that may have been queued by hpd. */

	drm_connector_list_iter_begin(&i915->drm, &conn_iter);

	for_each_intel_connector_iter(connector, &conn_iter) {

		if (cancel_work_sync(&connector->modeset_retry_work))

			drm_connector_put(&connector->base);

		intel_connector_cancel_modeset_retry_work(connector);

		if (connector->hdcp.shim) {

			cancel_delayed_work_sync(&connector->hdcp.check_work);

			cancel_work_sync(&connector->hdcp.prop_work);