Commit e77f8c2b authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/display: convert HAS_IPS() to struct intel_display 



Convert HAS_IPS() to struct intel_display. Do minimal drive-by
conversions to struct intel_display in the callers while at it.

Reviewed-by: default avatarVinod Govindapillai <vinod.govindapillai@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/55fd6063b30ca227483a479cff0012e5a915196d.1731321183.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 86787e55

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

+3 −1
Original line number Diff line number Diff line
@@ -185,7 +185,9 @@ void hsw_ips_post_update(struct intel_atomic_state *state, 
/* IPS only exists on ULT machines and is tied to pipe A. */

bool hsw_crtc_supports_ips(struct intel_crtc *crtc)

{

	return HAS_IPS(to_i915(crtc->base.dev)) && crtc->pipe == PIPE_A;

	struct intel_display *display = to_intel_display(crtc);



	return HAS_IPS(display) && crtc->pipe == PIPE_A;

}



static bool hsw_crtc_state_ips_capable(const struct intel_crtc_state *crtc_state)

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

+2 −1
Original line number Diff line number Diff line
@@ -4545,6 +4545,7 @@ static int hsw_compute_linetime_wm(struct intel_atomic_state *state, 
static int intel_crtc_atomic_check(struct intel_atomic_state *state,

				   struct intel_crtc *crtc)

{

	struct intel_display *display = to_intel_display(crtc);

	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);

	struct intel_crtc_state *crtc_state =

		intel_atomic_get_new_crtc_state(state, crtc);
@@ -4586,7 +4587,7 @@ static int intel_crtc_atomic_check(struct intel_atomic_state *state, 
			return ret;

	}



	if (HAS_IPS(dev_priv)) {

	if (HAS_IPS(display)) {

		ret = hsw_ips_compute_config(state, crtc);

		if (ret)

			return ret;

drivers/gpu/drm/i915/display/intel_display_device.h

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ struct intel_display_platforms { 
#define HAS_GMCH(i915)			(DISPLAY_INFO(i915)->has_gmch)

#define HAS_HW_SAGV_WM(i915)		(DISPLAY_VER(i915) >= 13 && !IS_DGFX(i915))

#define HAS_IPC(i915)			(DISPLAY_INFO(i915)->has_ipc)

#define HAS_IPS(i915)			(IS_HASWELL_ULT(i915) || IS_BROADWELL(i915))

#define HAS_IPS(__display)		((__display)->platform.haswell_ult || (__display)->platform.broadwell)

#define HAS_LRR(i915)			(DISPLAY_VER(i915) >= 12)

#define HAS_LSPCON(i915)		(IS_DISPLAY_VER(i915, 9, 10))

#define HAS_MBUS_JOINING(i915)		(IS_ALDERLAKE_P(i915) || DISPLAY_VER(i915) >= 14)