drm/i915: add INTEL_NUM_PIPES() and use it (24977870) · Commits · 戴 / test

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -7190,7 +7190,7 @@ static int ironlake_check_fdi_lanes(struct drm_device *dev, enum pipe pipe,
		}
		}

		if (INTEL_INFO(dev_priv)->num_pipes == 2)
		if (INTEL_NUM_PIPES(dev_priv) == 2)
		return 0;

		/* Ivybridge 3 pipe is really complicated */
		@@ -9574,7 +9574,7 @@ static void ironlake_compute_dpll(struct intel_crtc *crtc,
		* clear if it''s a win or loss power wise. No point in doing
		* this on ILK at all since it has a fixed DPLL<->pipe mapping.
		*/
		if (INTEL_INFO(dev_priv)->num_pipes == 3 &&
		if (INTEL_NUM_PIPES(dev_priv) == 3 &&
		intel_crtc_has_type(crtc_state, INTEL_OUTPUT_ANALOG))
		dpll \|= DPLL_SDVO_HIGH_SPEED;

		@@ -13899,7 +13899,7 @@ static void skl_commit_modeset_enables(struct intel_atomic_state *state)

		if (skl_ddb_allocation_overlaps(&new_crtc_state->wm.skl.ddb,
		entries,
		INTEL_INFO(dev_priv)->num_pipes, i))
		INTEL_NUM_PIPES(dev_priv), i))
		continue;

		updated \|= cmask;
		@@ -16258,8 +16258,8 @@ int intel_modeset_init(struct drm_device *dev)
		}

		DRM_DEBUG_KMS("%d display pipe%s available.\n",
		INTEL_INFO(dev_priv)->num_pipes,
		INTEL_INFO(dev_priv)->num_pipes > 1 ? "s" : "");
		INTEL_NUM_PIPES(dev_priv),
		INTEL_NUM_PIPES(dev_priv) > 1 ? "s" : "");

		for_each_pipe(dev_priv, pipe) {
		ret = intel_crtc_init(dev_priv, pipe);
		@@ -17352,7 +17352,7 @@ intel_display_print_error_state(struct drm_i915_error_state_buf *m,
		if (!error)
		return;

		err_printf(m, "Num Pipes: %d\n", INTEL_INFO(dev_priv)->num_pipes);
		err_printf(m, "Num Pipes: %d\n", INTEL_NUM_PIPES(dev_priv));
		if (IS_HASWELL(dev_priv) \|\| IS_BROADWELL(dev_priv))
		err_printf(m, "PWR_WELL_CTL2: %08x\n",
		error->power_well_driver);

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -307,10 +307,10 @@ enum phy_fia {
		};

		#define for_each_pipe(__dev_priv, __p) \
		for ((__p) = 0; (__p) < INTEL_INFO(__dev_priv)->num_pipes; (__p)++)
		for ((__p) = 0; (__p) < INTEL_NUM_PIPES(__dev_priv); (__p)++)

		#define for_each_pipe_masked(__dev_priv, __p, __mask) \
		for ((__p) = 0; (__p) < INTEL_INFO(__dev_priv)->num_pipes; (__p)++) \
		for ((__p) = 0; (__p) < INTEL_NUM_PIPES(__dev_priv); (__p)++) \
		for_each_if((__mask) & BIT(__p))

		#define for_each_cpu_transcoder_masked(__dev_priv, __t, __mask) \

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -114,7 +114,7 @@ lpe_audio_platdev_create(struct drm_i915_private *dev_priv)
		pinfo.size_data = sizeof(*pdata);
		pinfo.dma_mask = DMA_BIT_MASK(32);

		pdata->num_pipes = INTEL_INFO(dev_priv)->num_pipes;
		pdata->num_pipes = INTEL_NUM_PIPES(dev_priv);
		pdata->num_ports = IS_CHERRYVIEW(dev_priv) ? 3 : 2; /* B,C,D or B,C */
		pdata->port[0].pipe = -1;
		pdata->port[1].pipe = -1;

drivers/gpu/drm/i915/i915_drv.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -340,7 +340,7 @@ static int i915_driver_modeset_probe(struct drm_device *dev)

		if (HAS_DISPLAY(dev_priv)) {
		ret = drm_vblank_init(&dev_priv->drm,
		INTEL_INFO(dev_priv)->num_pipes);
		INTEL_NUM_PIPES(dev_priv));
		if (ret)
		goto out;
		}

drivers/gpu/drm/i915/i915_drv.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -2188,7 +2188,9 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
		#define GT_FREQUENCY_MULTIPLIER 50
		#define GEN9_FREQ_SCALER 3

		#define HAS_DISPLAY(dev_priv) (INTEL_INFO(dev_priv)->num_pipes > 0)
		#define INTEL_NUM_PIPES(dev_priv) (INTEL_INFO(dev_priv)->num_pipes)

		#define HAS_DISPLAY(dev_priv) (INTEL_NUM_PIPES(dev_priv) > 0)

		static inline bool intel_vtd_active(void)
		{

Admin message