|
@@ -1297,10 +1297,10 @@ intel_dp_sink_rates(struct intel_dp *intel_dp, const int **sink_rates)
|
|
bool intel_dp_source_supports_hbr2(struct intel_dp *intel_dp)
|
|
bool intel_dp_source_supports_hbr2(struct intel_dp *intel_dp)
|
|
{
|
|
{
|
|
struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
|
|
struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
|
|
- struct drm_device *dev = dig_port->base.base.dev;
|
|
|
|
|
|
+ struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev);
|
|
|
|
|
|
- if ((IS_HASWELL(dev) && !IS_HSW_ULX(dev)) || IS_BROADWELL(dev) ||
|
|
|
|
- (INTEL_INFO(dev)->gen >= 9))
|
|
|
|
|
|
+ if ((IS_HASWELL(dev_priv) && !IS_HSW_ULX(dev_priv)) ||
|
|
|
|
+ IS_BROADWELL(dev_priv) || (INTEL_GEN(dev_priv) >= 9))
|
|
return true;
|
|
return true;
|
|
else
|
|
else
|
|
return false;
|
|
return false;
|
|
@@ -1310,13 +1310,13 @@ static int
|
|
intel_dp_source_rates(struct intel_dp *intel_dp, const int **source_rates)
|
|
intel_dp_source_rates(struct intel_dp *intel_dp, const int **source_rates)
|
|
{
|
|
{
|
|
struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
|
|
struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
|
|
- struct drm_device *dev = dig_port->base.base.dev;
|
|
|
|
|
|
+ struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev);
|
|
int size;
|
|
int size;
|
|
|
|
|
|
- if (IS_BROXTON(dev)) {
|
|
|
|
|
|
+ if (IS_BROXTON(dev_priv)) {
|
|
*source_rates = bxt_rates;
|
|
*source_rates = bxt_rates;
|
|
size = ARRAY_SIZE(bxt_rates);
|
|
size = ARRAY_SIZE(bxt_rates);
|
|
- } else if (IS_SKYLAKE(dev) || IS_KABYLAKE(dev)) {
|
|
|
|
|
|
+ } else if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) {
|
|
*source_rates = skl_rates;
|
|
*source_rates = skl_rates;
|
|
size = ARRAY_SIZE(skl_rates);
|
|
size = ARRAY_SIZE(skl_rates);
|
|
} else {
|
|
} else {
|