| Message ID | 20250108151916.491113-6-imre.deak@intel.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | drm/i915/dp_mst: Fix error handling/clean up pointer use | expand |
On Wed, 08 Jan 2025, Imre Deak <imre.deak@intel.com> wrote: > Use the driver's standard intel_display::platform.alderlake_p instead of > IS_ALDERLAKE_P(). > > Signed-off-by: Imre Deak <imre.deak@intel.com> Reviewed-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/display/intel_dp_mst.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c > index fbc504037a969..e422e4ee9d280 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c > +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c > @@ -1219,11 +1219,10 @@ static void mst_stream_pre_enable(struct intel_atomic_state *state, > static void enable_bs_jitter_was(const struct intel_crtc_state *crtc_state) > { > struct intel_display *display = to_intel_display(crtc_state); > - struct drm_i915_private *i915 = to_i915(crtc_state->uapi.crtc->dev); > u32 clear = 0; > u32 set = 0; > > - if (!IS_ALDERLAKE_P(i915)) > + if (!display->platform.alderlake_p) > return; > > if (!IS_DISPLAY_STEP(display, STEP_D0, STEP_FOREVER))
diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c index fbc504037a969..e422e4ee9d280 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c @@ -1219,11 +1219,10 @@ static void mst_stream_pre_enable(struct intel_atomic_state *state, static void enable_bs_jitter_was(const struct intel_crtc_state *crtc_state) { struct intel_display *display = to_intel_display(crtc_state); - struct drm_i915_private *i915 = to_i915(crtc_state->uapi.crtc->dev); u32 clear = 0; u32 set = 0; - if (!IS_ALDERLAKE_P(i915)) + if (!display->platform.alderlake_p) return; if (!IS_DISPLAY_STEP(display, STEP_D0, STEP_FOREVER))
Use the driver's standard intel_display::platform.alderlake_p instead of IS_ALDERLAKE_P(). Signed-off-by: Imre Deak <imre.deak@intel.com> --- drivers/gpu/drm/i915/display/intel_dp_mst.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)