Skip to content

Commit 22512c3

Browse files
committed
Merge tag 'drm-intel-next-fixes-2024-09-26' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-next
- Fix colorimetry detection for DP Signed-off-by: Dave Airlie <airlied@redhat.com> From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/ZvURJYm5lo-XIzbY@jlahtine-mobl.ger.corp.intel.com
2 parents d7126c0 + e860513 commit 22512c3

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

drivers/gpu/drm/i915/display/intel_dp.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4067,6 +4067,9 @@ intel_edp_init_dpcd(struct intel_dp *intel_dp, struct intel_connector *connector
40674067
drm_dp_is_branch(intel_dp->dpcd));
40684068
intel_init_dpcd_quirks(intel_dp, &intel_dp->desc.ident);
40694069

4070+
intel_dp->colorimetry_support =
4071+
intel_dp_get_colorimetry_status(intel_dp);
4072+
40704073
/*
40714074
* Read the eDP display control registers.
40724075
*
@@ -4180,6 +4183,9 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp)
41804183

41814184
intel_init_dpcd_quirks(intel_dp, &intel_dp->desc.ident);
41824185

4186+
intel_dp->colorimetry_support =
4187+
intel_dp_get_colorimetry_status(intel_dp);
4188+
41834189
intel_dp_update_sink_caps(intel_dp);
41844190
}
41854191

@@ -6931,9 +6937,6 @@ intel_dp_init_connector(struct intel_digital_port *dig_port,
69316937
"HDCP init failed, skipping.\n");
69326938
}
69336939

6934-
intel_dp->colorimetry_support =
6935-
intel_dp_get_colorimetry_status(intel_dp);
6936-
69376940
intel_dp->frl.is_trained = false;
69386941
intel_dp->frl.trained_rate_gbps = 0;
69396942

0 commit comments

Comments
 (0)