mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-10 06:49:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915/display: convert assert_port_valid() to struct intel_display

Browse Source 
Going forward, struct intel_display is the main display device data
pointer. Convert the assert_port_valid() helper to struct intel_display,
allowing further conversions elsewhere.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e06ef0e2cc34d42918f3208362587a17ea34e28f.1739378095.git.jani.nikula@intel.com
This commit is contained in:
Jani Nikula
2025-02-12 18:36:34 +02:00
parent 6a5c7ea5f4
commit a40249ee7e
8 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/i915/display/g4x_dp.c
View File

@@ -1286,7 +1286,7 @@ bool g4x_dp_init(struct intel_display *display,
struct drm_encoder *encoder;
struct intel_connector *intel_connector;
if (!assert_port_valid(dev_priv, port))
if (!assert_port_valid(display, port))
return false;
devdata = intel_bios_encoder_data_lookup(display, port);

2
drivers/gpu/drm/i915/display/g4x_hdmi.c
View File

@@ -691,7 +691,7 @@ bool g4x_hdmi_init(struct intel_display *display,
struct intel_encoder *intel_encoder;
struct intel_connector *intel_connector;
if (!assert_port_valid(dev_priv, port))
if (!assert_port_valid(display, port))
return false;
if (!assert_hdmi_port_valid(display, port))

2
drivers/gpu/drm/i915/display/intel_crt.c
View File

@@ -1099,7 +1099,7 @@ void intel_crt_init(struct intel_display *display)
connector->base.polled = connector->polled;
if (HAS_DDI(display)) {
assert_port_valid(dev_priv, PORT_E);
assert_port_valid(display, PORT_E);
crt->base.port = PORT_E;
crt->base.get_config = hsw_crt_get_config;

2
drivers/gpu/drm/i915/display/intel_ddi.c
View File

@@ -5128,7 +5128,7 @@ void intel_ddi_init(struct intel_display *display,
return;
}
if (!assert_port_valid(dev_priv, port))
if (!assert_port_valid(display, port))
return;
if (port_in_use(dev_priv, port)) {

4
drivers/gpu/drm/i915/display/intel_display.c
View File

@@ -8187,9 +8187,9 @@ static bool intel_ddi_crt_present(struct drm_i915_private *dev_priv)
return true;
}
bool assert_port_valid(struct drm_i915_private *i915, enum port port)
bool assert_port_valid(struct intel_display *display, enum port port)
{
return !drm_WARN(&i915->drm, !(DISPLAY_RUNTIME_INFO(i915)->port_mask & BIT(port)),
return !drm_WARN(display->drm, !(DISPLAY_RUNTIME_INFO(display)->port_mask & BIT(port)),
"Platform does not support port %c\n", port_name(port));
}

2
drivers/gpu/drm/i915/display/intel_display.h
View File

@@ -579,7 +579,7 @@ void assert_transcoder(struct intel_display *display,
#define assert_transcoder_enabled(d, t) assert_transcoder(d, t, true)
#define assert_transcoder_disabled(d, t) assert_transcoder(d, t, false)
bool assert_port_valid(struct drm_i915_private *i915, enum port port);
bool assert_port_valid(struct intel_display *display, enum port port);
/*
* Use INTEL_DISPLAY_STATE_WARN(x) (rather than WARN() and WARN_ON()) for hw

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

@@ -524,7 +524,7 @@ void intel_dvo_init(struct drm_i915_private *i915)
return;
}
assert_port_valid(i915, intel_dvo->dev.port);
assert_port_valid(display, intel_dvo->dev.port);
encoder->type = INTEL_OUTPUT_DVO;
encoder->power_domain = POWER_DOMAIN_PORT_OTHER;

3
drivers/gpu/drm/i915/display/intel_sdvo.c
View File

@@ -3386,11 +3386,12 @@ static bool assert_sdvo_port_valid(struct drm_i915_private *dev_priv,
bool intel_sdvo_init(struct drm_i915_private *dev_priv,
i915_reg_t sdvo_reg, enum port port)
{
struct intel_display *display = &dev_priv->display;
struct intel_encoder *intel_encoder;
struct intel_sdvo *intel_sdvo;
int i;
if (!assert_port_valid(dev_priv, port))
if (!assert_port_valid(display, port))
return false;
if (!assert_sdvo_port_valid(dev_priv, port))