diff options
| author |   Ville Syrjälä <ville.syrjala@linux.intel.com> | 2019-05-17 22:31:21 +0300 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2019-06-04 16:42:53 +0300 |
| commit | 85829eb5ee1afc673befcf9ab8a4043e72df4ad2 (patch) | |
| tree | 4d799d4fd2fc68ce2ff394eaffbe6fd3c354a6ff /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: Clean up cdclk vfunc assignments (diff) | |
| download | linux-dev-85829eb5ee1afc673befcf9ab8a4043e72df4ad2.tar.xz linux-dev-85829eb5ee1afc673befcf9ab8a4043e72df4ad2.zip | |
drm/i915: Pass intel_atomic state to check_digital_port_conflicts()
Pass around intel_atomic_state rather than drm_atomic_state.
This avoids some extra casts and annoing aliasing variables.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190517193132.8140-3-ville.syrjala@linux.intel.com
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 45f01178c6b7..b628524bed5e 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -11917,9 +11917,9 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc, } } -static bool check_digital_port_conflicts(struct drm_atomic_state *state) +static bool check_digital_port_conflicts(struct intel_atomic_state *state) { - struct drm_device *dev = state->dev; + struct drm_device *dev = state->base.dev; struct drm_connector *connector; struct drm_connector_list_iter conn_iter; unsigned int used_ports = 0; @@ -11936,7 +11936,9 @@ static bool check_digital_port_conflicts(struct drm_atomic_state *state) struct drm_connector_state *connector_state; struct intel_encoder *encoder; - connector_state = drm_atomic_get_new_connector_state(state, connector); + connector_state = + drm_atomic_get_new_connector_state(&state->base, + connector); if (!connector_state) connector_state = connector->state; @@ -13235,7 +13237,7 @@ static int intel_modeset_checks(struct drm_atomic_state *state) struct drm_crtc_state *old_crtc_state, *new_crtc_state; int ret = 0, i; - if (!check_digital_port_conflicts(state)) { + if (!check_digital_port_conflicts(intel_state)) { DRM_DEBUG_KMS("rejecting conflicting digital port configuration\n"); return -EINVAL; } |