diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2021-04-12 08:46:06 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2021-04-14 12:32:28 +0300 |
| commit | 6c51f288b41f5dfc3061ab1fd8a576513edfce6b (patch) | |
| tree | 9f7976c4728c3d436b73b5fd4db91bedfe31a8f3 | |
| parent | 543d592a73d3948737d0ae4880a407c6da28662f (diff) | |
| download | linux-stable-6c51f288b41f5dfc3061ab1fd8a576513edfce6b.tar.gz linux-stable-6c51f288b41f5dfc3061ab1fd8a576513edfce6b.tar.bz2 linux-stable-6c51f288b41f5dfc3061ab1fd8a576513edfce6b.zip | |
drm/i915: Don't use {skl, cnl}_hpd_pin() for bxt/glk
Just let bxt/glk fall back to intel_hpd_pin_default() instead
of using skl_hpd_pin() or cnl_hpd_pin(). Doesn't really matter
since both functions will end up returning the correct hpd pin
anyway, but I find it a bit less confusing when bxt/glk are
fully separated from the logic for the other platforms.
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-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/20210412054607.18133-5-ville.syrjala@linux.intel.com
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_ddi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index deef24da00b5..e208ded9a688 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -4612,9 +4612,9 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) encoder->hpd_pin = ehl_hpd_pin(dev_priv, port); else if (IS_DISPLAY_VER(dev_priv, 11)) encoder->hpd_pin = icl_hpd_pin(dev_priv, port); - else if (IS_DISPLAY_VER(dev_priv, 10)) + else if (IS_CANNONLAKE(dev_priv)) encoder->hpd_pin = cnl_hpd_pin(dev_priv, port); - else if (IS_DISPLAY_VER(dev_priv, 9)) + else if (IS_DISPLAY_VER(dev_priv, 9) && !IS_BROXTON(dev_priv)) encoder->hpd_pin = skl_hpd_pin(dev_priv, port); else encoder->hpd_pin = intel_hpd_pin_default(dev_priv, port); |