drm/i915: Pass intel_connector to intel_attached_*()
Life is usually easier when we pass around intel_ types instead of drm_ types. In this case it might not be, but I think being consistent is a good thing anyway. Also some of this might get cleaned up a bit more later as we keep propagating the intel_ types further. @find@ identifier F =~ "^intel_attached_.*"; identifier C; @@ F(struct drm_connector *C) { ... } @@ identifier find.F; identifier find.C; @@ F( - struct drm_connector *C + struct intel_connector *connector ) { <... - C + &connector->base ...> } @@ identifier find.F; expression C; @@ - F(C) + F(to_intel_connector(C)) @@ expression C; @@ - to_intel_connector(&C->base) + C Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20191204180549.1267-3-ville.syrjala@linux.intel.com Reviewed-by: Mika Kahola <mika.kahola@intel.com>
This commit is contained in:
parent
d5848c4414
commit
43a6d19cac
@ -65,7 +65,7 @@ static struct intel_crt *intel_encoder_to_crt(struct intel_encoder *encoder)
|
||||
return container_of(encoder, struct intel_crt, base);
|
||||
}
|
||||
|
||||
static struct intel_crt *intel_attached_crt(struct drm_connector *connector)
|
||||
static struct intel_crt *intel_attached_crt(struct intel_connector *connector)
|
||||
{
|
||||
return intel_encoder_to_crt(intel_attached_encoder(connector));
|
||||
}
|
||||
@ -430,7 +430,7 @@ static int hsw_crt_compute_config(struct intel_encoder *encoder,
|
||||
static bool ilk_crt_detect_hotplug(struct drm_connector *connector)
|
||||
{
|
||||
struct drm_device *dev = connector->dev;
|
||||
struct intel_crt *crt = intel_attached_crt(connector);
|
||||
struct intel_crt *crt = intel_attached_crt(to_intel_connector(connector));
|
||||
struct drm_i915_private *dev_priv = to_i915(dev);
|
||||
u32 adpa;
|
||||
bool ret;
|
||||
@ -477,7 +477,7 @@ static bool ilk_crt_detect_hotplug(struct drm_connector *connector)
|
||||
static bool valleyview_crt_detect_hotplug(struct drm_connector *connector)
|
||||
{
|
||||
struct drm_device *dev = connector->dev;
|
||||
struct intel_crt *crt = intel_attached_crt(connector);
|
||||
struct intel_crt *crt = intel_attached_crt(to_intel_connector(connector));
|
||||
struct drm_i915_private *dev_priv = to_i915(dev);
|
||||
bool reenable_hpd;
|
||||
u32 adpa;
|
||||
@ -609,7 +609,7 @@ static int intel_crt_ddc_get_modes(struct drm_connector *connector,
|
||||
|
||||
static bool intel_crt_detect_ddc(struct drm_connector *connector)
|
||||
{
|
||||
struct intel_crt *crt = intel_attached_crt(connector);
|
||||
struct intel_crt *crt = intel_attached_crt(to_intel_connector(connector));
|
||||
struct drm_i915_private *dev_priv = to_i915(crt->base.base.dev);
|
||||
struct edid *edid;
|
||||
struct i2c_adapter *i2c;
|
||||
@ -795,7 +795,7 @@ intel_crt_detect(struct drm_connector *connector,
|
||||
bool force)
|
||||
{
|
||||
struct drm_i915_private *dev_priv = to_i915(connector->dev);
|
||||
struct intel_crt *crt = intel_attached_crt(connector);
|
||||
struct intel_crt *crt = intel_attached_crt(to_intel_connector(connector));
|
||||
struct intel_encoder *intel_encoder = &crt->base;
|
||||
intel_wakeref_t wakeref;
|
||||
int status, ret;
|
||||
@ -886,7 +886,7 @@ static int intel_crt_get_modes(struct drm_connector *connector)
|
||||
{
|
||||
struct drm_device *dev = connector->dev;
|
||||
struct drm_i915_private *dev_priv = to_i915(dev);
|
||||
struct intel_crt *crt = intel_attached_crt(connector);
|
||||
struct intel_crt *crt = intel_attached_crt(to_intel_connector(connector));
|
||||
struct intel_encoder *intel_encoder = &crt->base;
|
||||
intel_wakeref_t wakeref;
|
||||
struct i2c_adapter *i2c;
|
||||
|
@ -6547,7 +6547,7 @@ intel_connector_primary_encoder(struct intel_connector *connector)
|
||||
if (connector->mst_port)
|
||||
return &dp_to_dig_port(connector->mst_port)->base;
|
||||
|
||||
encoder = intel_attached_encoder(&connector->base);
|
||||
encoder = intel_attached_encoder(connector);
|
||||
WARN_ON(!encoder);
|
||||
|
||||
return encoder;
|
||||
@ -11688,7 +11688,7 @@ int intel_get_load_detect_pipe(struct drm_connector *connector,
|
||||
{
|
||||
struct intel_crtc *intel_crtc;
|
||||
struct intel_encoder *intel_encoder =
|
||||
intel_attached_encoder(connector);
|
||||
intel_attached_encoder(to_intel_connector(connector));
|
||||
struct drm_crtc *possible_crtc;
|
||||
struct drm_encoder *encoder = &intel_encoder->base;
|
||||
struct drm_crtc *crtc = NULL;
|
||||
@ -11842,7 +11842,7 @@ void intel_release_load_detect_pipe(struct drm_connector *connector,
|
||||
struct drm_modeset_acquire_ctx *ctx)
|
||||
{
|
||||
struct intel_encoder *intel_encoder =
|
||||
intel_attached_encoder(connector);
|
||||
intel_attached_encoder(to_intel_connector(connector));
|
||||
struct drm_encoder *encoder = &intel_encoder->base;
|
||||
struct drm_atomic_state *state = old->restore_state;
|
||||
int ret;
|
||||
@ -15029,7 +15029,7 @@ static void intel_set_dp_tp_ctl_normal(struct intel_crtc *crtc,
|
||||
if (conn_state->crtc == &crtc->base)
|
||||
break;
|
||||
}
|
||||
intel_dp = enc_to_intel_dp(&intel_attached_encoder(conn)->base);
|
||||
intel_dp = enc_to_intel_dp(&intel_attached_encoder(to_intel_connector(conn))->base);
|
||||
intel_dp_stop_link_train(intel_dp);
|
||||
}
|
||||
|
||||
|
@ -1438,9 +1438,9 @@ struct intel_load_detect_pipe {
|
||||
};
|
||||
|
||||
static inline struct intel_encoder *
|
||||
intel_attached_encoder(struct drm_connector *connector)
|
||||
intel_attached_encoder(struct intel_connector *connector)
|
||||
{
|
||||
return to_intel_connector(connector)->encoder;
|
||||
return connector->encoder;
|
||||
}
|
||||
|
||||
static inline bool intel_encoder_is_dig_port(struct intel_encoder *encoder)
|
||||
@ -1471,7 +1471,7 @@ enc_to_dig_port(struct drm_encoder *encoder)
|
||||
static inline struct intel_digital_port *
|
||||
conn_to_dig_port(struct intel_connector *connector)
|
||||
{
|
||||
return enc_to_dig_port(&intel_attached_encoder(&connector->base)->base);
|
||||
return enc_to_dig_port(&intel_attached_encoder(connector)->base);
|
||||
}
|
||||
|
||||
static inline struct intel_dp_mst_encoder *
|
||||
|
@ -146,7 +146,7 @@ bool intel_dp_is_edp(struct intel_dp *intel_dp)
|
||||
return intel_dig_port->base.type == INTEL_OUTPUT_EDP;
|
||||
}
|
||||
|
||||
static struct intel_dp *intel_attached_dp(struct drm_connector *connector)
|
||||
static struct intel_dp *intel_attached_dp(struct intel_connector *connector)
|
||||
{
|
||||
return enc_to_intel_dp(&intel_attached_encoder(connector)->base);
|
||||
}
|
||||
@ -614,7 +614,7 @@ static enum drm_mode_status
|
||||
intel_dp_mode_valid(struct drm_connector *connector,
|
||||
struct drm_display_mode *mode)
|
||||
{
|
||||
struct intel_dp *intel_dp = intel_attached_dp(connector);
|
||||
struct intel_dp *intel_dp = intel_attached_dp(to_intel_connector(connector));
|
||||
struct intel_connector *intel_connector = to_intel_connector(connector);
|
||||
struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode;
|
||||
struct drm_i915_private *dev_priv = to_i915(connector->dev);
|
||||
@ -3036,7 +3036,7 @@ void intel_edp_backlight_off(const struct drm_connector_state *old_conn_state)
|
||||
static void intel_edp_backlight_power(struct intel_connector *connector,
|
||||
bool enable)
|
||||
{
|
||||
struct intel_dp *intel_dp = intel_attached_dp(&connector->base);
|
||||
struct intel_dp *intel_dp = intel_attached_dp(connector);
|
||||
intel_wakeref_t wakeref;
|
||||
bool is_enabled;
|
||||
|
||||
@ -5651,7 +5651,7 @@ intel_dp_detect(struct drm_connector *connector,
|
||||
bool force)
|
||||
{
|
||||
struct drm_i915_private *dev_priv = to_i915(connector->dev);
|
||||
struct intel_dp *intel_dp = intel_attached_dp(connector);
|
||||
struct intel_dp *intel_dp = intel_attached_dp(to_intel_connector(connector));
|
||||
struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
|
||||
struct intel_encoder *encoder = &dig_port->base;
|
||||
enum drm_connector_status status;
|
||||
@ -5755,7 +5755,7 @@ out:
|
||||
static void
|
||||
intel_dp_force(struct drm_connector *connector)
|
||||
{
|
||||
struct intel_dp *intel_dp = intel_attached_dp(connector);
|
||||
struct intel_dp *intel_dp = intel_attached_dp(to_intel_connector(connector));
|
||||
struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
|
||||
struct intel_encoder *intel_encoder = &dig_port->base;
|
||||
struct drm_i915_private *dev_priv = to_i915(intel_encoder->base.dev);
|
||||
@ -5790,7 +5790,7 @@ static int intel_dp_get_modes(struct drm_connector *connector)
|
||||
}
|
||||
|
||||
/* if eDP has no EDID, fall back to fixed mode */
|
||||
if (intel_dp_is_edp(intel_attached_dp(connector)) &&
|
||||
if (intel_dp_is_edp(intel_attached_dp(to_intel_connector(connector))) &&
|
||||
intel_connector->panel.fixed_mode) {
|
||||
struct drm_display_mode *mode;
|
||||
|
||||
@ -5808,7 +5808,7 @@ static int intel_dp_get_modes(struct drm_connector *connector)
|
||||
static int
|
||||
intel_dp_connector_register(struct drm_connector *connector)
|
||||
{
|
||||
struct intel_dp *intel_dp = intel_attached_dp(connector);
|
||||
struct intel_dp *intel_dp = intel_attached_dp(to_intel_connector(connector));
|
||||
int ret;
|
||||
|
||||
ret = intel_connector_register(connector);
|
||||
@ -5830,7 +5830,7 @@ intel_dp_connector_register(struct drm_connector *connector)
|
||||
static void
|
||||
intel_dp_connector_unregister(struct drm_connector *connector)
|
||||
{
|
||||
struct intel_dp *intel_dp = intel_attached_dp(connector);
|
||||
struct intel_dp *intel_dp = intel_attached_dp(to_intel_connector(connector));
|
||||
|
||||
drm_dp_cec_unregister_connector(&intel_dp->aux);
|
||||
drm_dp_aux_unregister(&intel_dp->aux);
|
||||
|
@ -125,7 +125,7 @@ static struct intel_dvo *enc_to_dvo(struct intel_encoder *encoder)
|
||||
return container_of(encoder, struct intel_dvo, base);
|
||||
}
|
||||
|
||||
static struct intel_dvo *intel_attached_dvo(struct drm_connector *connector)
|
||||
static struct intel_dvo *intel_attached_dvo(struct intel_connector *connector)
|
||||
{
|
||||
return enc_to_dvo(intel_attached_encoder(connector));
|
||||
}
|
||||
@ -134,7 +134,7 @@ static bool intel_dvo_connector_get_hw_state(struct intel_connector *connector)
|
||||
{
|
||||
struct drm_device *dev = connector->base.dev;
|
||||
struct drm_i915_private *dev_priv = to_i915(dev);
|
||||
struct intel_dvo *intel_dvo = intel_attached_dvo(&connector->base);
|
||||
struct intel_dvo *intel_dvo = intel_attached_dvo(connector);
|
||||
u32 tmp;
|
||||
|
||||
tmp = I915_READ(intel_dvo->dev.dvo_reg);
|
||||
@ -220,7 +220,7 @@ static enum drm_mode_status
|
||||
intel_dvo_mode_valid(struct drm_connector *connector,
|
||||
struct drm_display_mode *mode)
|
||||
{
|
||||
struct intel_dvo *intel_dvo = intel_attached_dvo(connector);
|
||||
struct intel_dvo *intel_dvo = intel_attached_dvo(to_intel_connector(connector));
|
||||
const struct drm_display_mode *fixed_mode =
|
||||
to_intel_connector(connector)->panel.fixed_mode;
|
||||
int max_dotclk = to_i915(connector->dev)->max_dotclk_freq;
|
||||
@ -311,7 +311,7 @@ static void intel_dvo_pre_enable(struct intel_encoder *encoder,
|
||||
static enum drm_connector_status
|
||||
intel_dvo_detect(struct drm_connector *connector, bool force)
|
||||
{
|
||||
struct intel_dvo *intel_dvo = intel_attached_dvo(connector);
|
||||
struct intel_dvo *intel_dvo = intel_attached_dvo(to_intel_connector(connector));
|
||||
DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
|
||||
connector->base.id, connector->name);
|
||||
return intel_dvo->dev.dev_ops->detect(&intel_dvo->dev);
|
||||
|
@ -92,7 +92,7 @@ struct intel_hdmi *enc_to_intel_hdmi(struct drm_encoder *encoder)
|
||||
return &intel_dig_port->hdmi;
|
||||
}
|
||||
|
||||
static struct intel_hdmi *intel_attached_hdmi(struct drm_connector *connector)
|
||||
static struct intel_hdmi *intel_attached_hdmi(struct intel_connector *connector)
|
||||
{
|
||||
return enc_to_intel_hdmi(&intel_attached_encoder(connector)->base);
|
||||
}
|
||||
@ -2160,7 +2160,7 @@ static enum drm_mode_status
|
||||
intel_hdmi_mode_valid(struct drm_connector *connector,
|
||||
struct drm_display_mode *mode)
|
||||
{
|
||||
struct intel_hdmi *hdmi = intel_attached_hdmi(connector);
|
||||
struct intel_hdmi *hdmi = intel_attached_hdmi(to_intel_connector(connector));
|
||||
struct drm_device *dev = intel_hdmi_to_dev(hdmi);
|
||||
struct drm_i915_private *dev_priv = to_i915(dev);
|
||||
enum drm_mode_status status;
|
||||
@ -2496,7 +2496,7 @@ int intel_hdmi_compute_config(struct intel_encoder *encoder,
|
||||
static void
|
||||
intel_hdmi_unset_edid(struct drm_connector *connector)
|
||||
{
|
||||
struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);
|
||||
struct intel_hdmi *intel_hdmi = intel_attached_hdmi(to_intel_connector(connector));
|
||||
|
||||
intel_hdmi->has_hdmi_sink = false;
|
||||
intel_hdmi->has_audio = false;
|
||||
@ -2512,7 +2512,7 @@ static void
|
||||
intel_hdmi_dp_dual_mode_detect(struct drm_connector *connector, bool has_edid)
|
||||
{
|
||||
struct drm_i915_private *dev_priv = to_i915(connector->dev);
|
||||
struct intel_hdmi *hdmi = intel_attached_hdmi(connector);
|
||||
struct intel_hdmi *hdmi = intel_attached_hdmi(to_intel_connector(connector));
|
||||
enum port port = hdmi_to_dig_port(hdmi)->base.port;
|
||||
struct i2c_adapter *adapter =
|
||||
intel_gmbus_get_adapter(dev_priv, hdmi->ddc_bus);
|
||||
@ -2559,7 +2559,7 @@ static bool
|
||||
intel_hdmi_set_edid(struct drm_connector *connector)
|
||||
{
|
||||
struct drm_i915_private *dev_priv = to_i915(connector->dev);
|
||||
struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);
|
||||
struct intel_hdmi *intel_hdmi = intel_attached_hdmi(to_intel_connector(connector));
|
||||
intel_wakeref_t wakeref;
|
||||
struct edid *edid;
|
||||
bool connected = false;
|
||||
@ -2600,7 +2600,7 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
|
||||
{
|
||||
enum drm_connector_status status = connector_status_disconnected;
|
||||
struct drm_i915_private *dev_priv = to_i915(connector->dev);
|
||||
struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);
|
||||
struct intel_hdmi *intel_hdmi = intel_attached_hdmi(to_intel_connector(connector));
|
||||
struct intel_encoder *encoder = &hdmi_to_dig_port(intel_hdmi)->base;
|
||||
intel_wakeref_t wakeref;
|
||||
|
||||
@ -2772,7 +2772,7 @@ static struct i2c_adapter *
|
||||
intel_hdmi_get_i2c_adapter(struct drm_connector *connector)
|
||||
{
|
||||
struct drm_i915_private *dev_priv = to_i915(connector->dev);
|
||||
struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);
|
||||
struct intel_hdmi *intel_hdmi = intel_attached_hdmi(to_intel_connector(connector));
|
||||
|
||||
return intel_gmbus_get_adapter(dev_priv, intel_hdmi->ddc_bus);
|
||||
}
|
||||
@ -2816,7 +2816,7 @@ intel_hdmi_connector_register(struct drm_connector *connector)
|
||||
|
||||
static void intel_hdmi_destroy(struct drm_connector *connector)
|
||||
{
|
||||
struct cec_notifier *n = intel_attached_hdmi(connector)->cec_notifier;
|
||||
struct cec_notifier *n = intel_attached_hdmi(to_intel_connector(connector))->cec_notifier;
|
||||
|
||||
cec_notifier_conn_unregister(n);
|
||||
|
||||
|
@ -180,7 +180,7 @@ static struct intel_sdvo *to_sdvo(struct intel_encoder *encoder)
|
||||
return container_of(encoder, struct intel_sdvo, base);
|
||||
}
|
||||
|
||||
static struct intel_sdvo *intel_attached_sdvo(struct drm_connector *connector)
|
||||
static struct intel_sdvo *intel_attached_sdvo(struct intel_connector *connector)
|
||||
{
|
||||
return to_sdvo(intel_attached_encoder(connector));
|
||||
}
|
||||
@ -1551,7 +1551,7 @@ static bool intel_sdvo_connector_get_hw_state(struct intel_connector *connector)
|
||||
{
|
||||
struct intel_sdvo_connector *intel_sdvo_connector =
|
||||
to_intel_sdvo_connector(&connector->base);
|
||||
struct intel_sdvo *intel_sdvo = intel_attached_sdvo(&connector->base);
|
||||
struct intel_sdvo *intel_sdvo = intel_attached_sdvo(connector);
|
||||
u16 active_outputs = 0;
|
||||
|
||||
intel_sdvo_get_active_outputs(intel_sdvo, &active_outputs);
|
||||
@ -1823,7 +1823,7 @@ static enum drm_mode_status
|
||||
intel_sdvo_mode_valid(struct drm_connector *connector,
|
||||
struct drm_display_mode *mode)
|
||||
{
|
||||
struct intel_sdvo *intel_sdvo = intel_attached_sdvo(connector);
|
||||
struct intel_sdvo *intel_sdvo = intel_attached_sdvo(to_intel_connector(connector));
|
||||
struct intel_sdvo_connector *intel_sdvo_connector =
|
||||
to_intel_sdvo_connector(connector);
|
||||
int max_dotclk = to_i915(connector->dev)->max_dotclk_freq;
|
||||
@ -1941,7 +1941,7 @@ intel_sdvo_multifunc_encoder(struct intel_sdvo *intel_sdvo)
|
||||
static struct edid *
|
||||
intel_sdvo_get_edid(struct drm_connector *connector)
|
||||
{
|
||||
struct intel_sdvo *sdvo = intel_attached_sdvo(connector);
|
||||
struct intel_sdvo *sdvo = intel_attached_sdvo(to_intel_connector(connector));
|
||||
return drm_get_edid(connector, &sdvo->ddc);
|
||||
}
|
||||
|
||||
@ -1959,7 +1959,7 @@ intel_sdvo_get_analog_edid(struct drm_connector *connector)
|
||||
static enum drm_connector_status
|
||||
intel_sdvo_tmds_sink_detect(struct drm_connector *connector)
|
||||
{
|
||||
struct intel_sdvo *intel_sdvo = intel_attached_sdvo(connector);
|
||||
struct intel_sdvo *intel_sdvo = intel_attached_sdvo(to_intel_connector(connector));
|
||||
struct intel_sdvo_connector *intel_sdvo_connector =
|
||||
to_intel_sdvo_connector(connector);
|
||||
enum drm_connector_status status;
|
||||
@ -2028,7 +2028,7 @@ static enum drm_connector_status
|
||||
intel_sdvo_detect(struct drm_connector *connector, bool force)
|
||||
{
|
||||
u16 response;
|
||||
struct intel_sdvo *intel_sdvo = intel_attached_sdvo(connector);
|
||||
struct intel_sdvo *intel_sdvo = intel_attached_sdvo(to_intel_connector(connector));
|
||||
struct intel_sdvo_connector *intel_sdvo_connector = to_intel_sdvo_connector(connector);
|
||||
enum drm_connector_status ret;
|
||||
|
||||
@ -2175,7 +2175,7 @@ static const struct drm_display_mode sdvo_tv_modes[] = {
|
||||
|
||||
static void intel_sdvo_get_tv_modes(struct drm_connector *connector)
|
||||
{
|
||||
struct intel_sdvo *intel_sdvo = intel_attached_sdvo(connector);
|
||||
struct intel_sdvo *intel_sdvo = intel_attached_sdvo(to_intel_connector(connector));
|
||||
const struct drm_connector_state *conn_state = connector->state;
|
||||
struct intel_sdvo_sdtv_resolution_request tv_res;
|
||||
u32 reply = 0, format_map = 0;
|
||||
@ -2215,7 +2215,7 @@ static void intel_sdvo_get_tv_modes(struct drm_connector *connector)
|
||||
|
||||
static void intel_sdvo_get_lvds_modes(struct drm_connector *connector)
|
||||
{
|
||||
struct intel_sdvo *intel_sdvo = intel_attached_sdvo(connector);
|
||||
struct intel_sdvo *intel_sdvo = intel_attached_sdvo(to_intel_connector(connector));
|
||||
struct drm_i915_private *dev_priv = to_i915(connector->dev);
|
||||
struct drm_display_mode *newmode;
|
||||
|
||||
@ -2379,7 +2379,7 @@ intel_sdvo_connector_atomic_set_property(struct drm_connector *connector,
|
||||
static int
|
||||
intel_sdvo_connector_register(struct drm_connector *connector)
|
||||
{
|
||||
struct intel_sdvo *sdvo = intel_attached_sdvo(connector);
|
||||
struct intel_sdvo *sdvo = intel_attached_sdvo(to_intel_connector(connector));
|
||||
int ret;
|
||||
|
||||
ret = intel_connector_register(connector);
|
||||
@ -2394,7 +2394,7 @@ intel_sdvo_connector_register(struct drm_connector *connector)
|
||||
static void
|
||||
intel_sdvo_connector_unregister(struct drm_connector *connector)
|
||||
{
|
||||
struct intel_sdvo *sdvo = intel_attached_sdvo(connector);
|
||||
struct intel_sdvo *sdvo = intel_attached_sdvo(to_intel_connector(connector));
|
||||
|
||||
sysfs_remove_link(&connector->kdev->kobj,
|
||||
sdvo->ddc.dev.kobj.name);
|
||||
@ -2932,7 +2932,7 @@ static void intel_sdvo_output_cleanup(struct intel_sdvo *intel_sdvo)
|
||||
|
||||
list_for_each_entry_safe(connector, tmp,
|
||||
&dev->mode_config.connector_list, head) {
|
||||
if (intel_attached_encoder(connector) == &intel_sdvo->base) {
|
||||
if (intel_attached_encoder(to_intel_connector(connector)) == &intel_sdvo->base) {
|
||||
drm_connector_unregister(connector);
|
||||
intel_connector_destroy(connector);
|
||||
}
|
||||
|
@ -898,7 +898,7 @@ static struct intel_tv *enc_to_tv(struct intel_encoder *encoder)
|
||||
return container_of(encoder, struct intel_tv, base);
|
||||
}
|
||||
|
||||
static struct intel_tv *intel_attached_tv(struct drm_connector *connector)
|
||||
static struct intel_tv *intel_attached_tv(struct intel_connector *connector)
|
||||
{
|
||||
return enc_to_tv(intel_attached_encoder(connector));
|
||||
}
|
||||
@ -1662,7 +1662,7 @@ intel_tv_detect_type(struct intel_tv *intel_tv,
|
||||
*/
|
||||
static void intel_tv_find_better_format(struct drm_connector *connector)
|
||||
{
|
||||
struct intel_tv *intel_tv = intel_attached_tv(connector);
|
||||
struct intel_tv *intel_tv = intel_attached_tv(to_intel_connector(connector));
|
||||
const struct tv_mode *tv_mode = intel_tv_mode_find(connector->state);
|
||||
int i;
|
||||
|
||||
@ -1689,7 +1689,7 @@ intel_tv_detect(struct drm_connector *connector,
|
||||
struct drm_modeset_acquire_ctx *ctx,
|
||||
bool force)
|
||||
{
|
||||
struct intel_tv *intel_tv = intel_attached_tv(connector);
|
||||
struct intel_tv *intel_tv = intel_attached_tv(to_intel_connector(connector));
|
||||
enum drm_connector_status status;
|
||||
int type;
|
||||
|
||||
|
@ -1979,7 +1979,7 @@ static int i915_psr_sink_status_show(struct seq_file *m, void *data)
|
||||
struct drm_connector *connector = m->private;
|
||||
struct drm_i915_private *dev_priv = to_i915(connector->dev);
|
||||
struct intel_dp *intel_dp =
|
||||
enc_to_intel_dp(&intel_attached_encoder(connector)->base);
|
||||
enc_to_intel_dp(&intel_attached_encoder(to_intel_connector(connector))->base);
|
||||
int ret;
|
||||
|
||||
if (!CAN_PSR(dev_priv)) {
|
||||
@ -3014,7 +3014,7 @@ static int i915_dp_mst_info(struct seq_file *m, void *unused)
|
||||
if (connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort)
|
||||
continue;
|
||||
|
||||
intel_encoder = intel_attached_encoder(connector);
|
||||
intel_encoder = intel_attached_encoder(to_intel_connector(connector));
|
||||
if (!intel_encoder || intel_encoder->type == INTEL_OUTPUT_DP_MST)
|
||||
continue;
|
||||
|
||||
@ -4144,7 +4144,7 @@ static int i915_drrs_ctl_set(void *data, u64 val)
|
||||
drm_connector_mask(connector)))
|
||||
continue;
|
||||
|
||||
encoder = intel_attached_encoder(connector);
|
||||
encoder = intel_attached_encoder(to_intel_connector(connector));
|
||||
if (encoder->type != INTEL_OUTPUT_EDP)
|
||||
continue;
|
||||
|
||||
@ -4355,7 +4355,7 @@ static int i915_dpcd_show(struct seq_file *m, void *data)
|
||||
{
|
||||
struct drm_connector *connector = m->private;
|
||||
struct intel_dp *intel_dp =
|
||||
enc_to_intel_dp(&intel_attached_encoder(connector)->base);
|
||||
enc_to_intel_dp(&intel_attached_encoder(to_intel_connector(connector))->base);
|
||||
u8 buf[16];
|
||||
ssize_t err;
|
||||
int i;
|
||||
@ -4390,7 +4390,7 @@ static int i915_panel_show(struct seq_file *m, void *data)
|
||||
{
|
||||
struct drm_connector *connector = m->private;
|
||||
struct intel_dp *intel_dp =
|
||||
enc_to_intel_dp(&intel_attached_encoder(connector)->base);
|
||||
enc_to_intel_dp(&intel_attached_encoder(to_intel_connector(connector))->base);
|
||||
|
||||
if (connector->status != connector_status_connected)
|
||||
return -ENODEV;
|
||||
@ -4468,7 +4468,7 @@ static int i915_dsc_fec_support_show(struct seq_file *m, void *data)
|
||||
} else if (ret) {
|
||||
break;
|
||||
}
|
||||
intel_dp = enc_to_intel_dp(&intel_attached_encoder(connector)->base);
|
||||
intel_dp = enc_to_intel_dp(&intel_attached_encoder(to_intel_connector(connector))->base);
|
||||
crtc_state = to_intel_crtc_state(crtc->state);
|
||||
seq_printf(m, "DSC_Enabled: %s\n",
|
||||
yesno(crtc_state->dsc.compression_enable));
|
||||
@ -4495,7 +4495,7 @@ static ssize_t i915_dsc_fec_support_write(struct file *file,
|
||||
int ret;
|
||||
struct drm_connector *connector =
|
||||
((struct seq_file *)file->private_data)->private;
|
||||
struct intel_encoder *encoder = intel_attached_encoder(connector);
|
||||
struct intel_encoder *encoder = intel_attached_encoder(to_intel_connector(connector));
|
||||
struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
|
||||
|
||||
if (len == 0)
|
||||
|
Loading…
x
Reference in New Issue
Block a user