Commit 1a6330df authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/display: convert display device identification to struct intel_display 



Convert intel_display_device.[ch] to struct intel_display, including
callers, but excluding intel_display_device_probe() which will be
handled in follow-up.

v2: fix display->drm = display->drm goof-up

Reviewed-by: default avatarVinod Govindapillai <vinod.govindapillai@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/865b27b66f599e707081d46fca9f679e19a4e8aa.1731321183.git.jani.nikula@intel.com


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

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

+1 −1
Original line number Diff line number Diff line
@@ -867,7 +867,7 @@ intel_crt_detect(struct drm_connector *connector, 
		    connector->base.id, connector->name,

		    force);



	if (!intel_display_device_enabled(dev_priv))

	if (!intel_display_device_enabled(display))

		return connector_status_disconnected;



	if (!intel_display_driver_check_access(dev_priv))

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

+79 −77
Original line number Diff line number Diff line
@@ -1432,9 +1432,9 @@ static const struct { 
};



static const struct intel_display_device_info *

probe_gmdid_display(struct drm_i915_private *i915, struct intel_display_ip_ver *ip_ver)

probe_gmdid_display(struct intel_display *display, struct intel_display_ip_ver *ip_ver)

{

	struct pci_dev *pdev = to_pci_dev(i915->drm.dev);

	struct pci_dev *pdev = to_pci_dev(display->drm->dev);

	struct intel_display_ip_ver gmd_id;

	void __iomem *addr;

	u32 val;
@@ -1442,7 +1442,8 @@ probe_gmdid_display(struct drm_i915_private *i915, struct intel_display_ip_ver * 


	addr = pci_iomap_range(pdev, 0, i915_mmio_reg_offset(GMD_ID_DISPLAY), sizeof(u32));

	if (!addr) {

		drm_err(&i915->drm, "Cannot map MMIO BAR to read display GMD_ID\n");

		drm_err(display->drm,

			"Cannot map MMIO BAR to read display GMD_ID\n");

		return NULL;

	}
@@ -1450,7 +1451,7 @@ probe_gmdid_display(struct drm_i915_private *i915, struct intel_display_ip_ver * 
	pci_iounmap(pdev, addr);



	if (val == 0) {

		drm_dbg_kms(&i915->drm, "Device doesn't have display\n");

		drm_dbg_kms(display->drm, "Device doesn't have display\n");

		return NULL;

	}
@@ -1466,7 +1467,8 @@ probe_gmdid_display(struct drm_i915_private *i915, struct intel_display_ip_ver * 
		}

	}



	drm_err(&i915->drm, "Unrecognized display IP version %d.%02d; disabling display.\n",

	drm_err(display->drm,

		"Unrecognized display IP version %d.%02d; disabling display.\n",

		gmd_id.ver, gmd_id.rel);

	return NULL;

}
@@ -1578,55 +1580,56 @@ void intel_display_device_probe(struct drm_i915_private *i915) 
	enum intel_step step;



	/* Add drm device backpointer as early as possible. */

	i915->display.drm = &i915->drm;

	display->drm = pci_get_drvdata(pdev);



	intel_display_params_copy(&i915->display.params);

	intel_display_params_copy(&display->params);



	if (has_no_display(pdev)) {

		drm_dbg_kms(&i915->drm, "Device doesn't have display\n");

		drm_dbg_kms(display->drm, "Device doesn't have display\n");

		goto no_display;

	}



	desc = find_platform_desc(pdev);

	if (!desc) {

		drm_dbg_kms(&i915->drm, "Unknown device ID %04x; disabling display.\n",

		drm_dbg_kms(display->drm,

			    "Unknown device ID %04x; disabling display.\n",

			    pdev->device);

		goto no_display;

	}



	info = desc->info;

	if (!info)

		info = probe_gmdid_display(i915, &ip_ver);

		info = probe_gmdid_display(display, &ip_ver);

	if (!info)

		goto no_display;



	DISPLAY_INFO(i915) = info;

	DISPLAY_INFO(display) = info;



	memcpy(DISPLAY_RUNTIME_INFO(i915),

	       &DISPLAY_INFO(i915)->__runtime_defaults,

	       sizeof(*DISPLAY_RUNTIME_INFO(i915)));

	memcpy(DISPLAY_RUNTIME_INFO(display),

	       &DISPLAY_INFO(display)->__runtime_defaults,

	       sizeof(*DISPLAY_RUNTIME_INFO(display)));



	drm_WARN_ON(&i915->drm, !desc->name ||

	drm_WARN_ON(display->drm, !desc->name ||

		    !display_platforms_weight(&desc->platforms));



	display->platform = desc->platforms;



	subdesc = find_subplatform_desc(pdev, desc);

	if (subdesc) {

		drm_WARN_ON(&i915->drm, !subdesc->name ||

		drm_WARN_ON(display->drm, !subdesc->name ||

			    !display_platforms_weight(&subdesc->platforms));



		display_platforms_or(&display->platform, &subdesc->platforms);



		/* Ensure platform and subplatform are distinct */

		drm_WARN_ON(&i915->drm,

		drm_WARN_ON(display->drm,

			    display_platforms_weight(&display->platform) !=

			    display_platforms_weight(&desc->platforms) +

			    display_platforms_weight(&subdesc->platforms));

	}



	if (ip_ver.ver || ip_ver.rel || ip_ver.step) {

		DISPLAY_RUNTIME_INFO(i915)->ip = ip_ver;

		DISPLAY_RUNTIME_INFO(display)->ip = ip_ver;

		step = STEP_A0 + ip_ver.step;

		if (step > STEP_FUTURE) {

			drm_dbg_kms(display->drm, "Using future display stepping\n");
@@ -1637,30 +1640,30 @@ void intel_display_device_probe(struct drm_i915_private *i915) 
					  subdesc ? &subdesc->step_info : NULL);

	}



	DISPLAY_RUNTIME_INFO(i915)->step = step;

	DISPLAY_RUNTIME_INFO(display)->step = step;



	drm_info(&i915->drm, "Found %s%s%s (device ID %04x) %s display version %u.%02u stepping %s\n",

	drm_info(display->drm, "Found %s%s%s (device ID %04x) %s display version %u.%02u stepping %s\n",

		 desc->name, subdesc ? "/" : "", subdesc ? subdesc->name : "",

		 pdev->device, display->platform.dgfx ? "discrete" : "integrated",

		 DISPLAY_RUNTIME_INFO(i915)->ip.ver,

		 DISPLAY_RUNTIME_INFO(i915)->ip.rel,

		 DISPLAY_RUNTIME_INFO(display)->ip.ver,

		 DISPLAY_RUNTIME_INFO(display)->ip.rel,

		 step != STEP_NONE ? intel_step_name(step) : "N/A");



	return;



no_display:

	DISPLAY_INFO(i915) = &no_display;

	DISPLAY_INFO(display) = &no_display;

}



void intel_display_device_remove(struct drm_i915_private *i915)

void intel_display_device_remove(struct intel_display *display)

{

	intel_display_params_free(&i915->display.params);

	intel_display_params_free(&display->params);

}



static void __intel_display_device_info_runtime_init(struct drm_i915_private *i915)

static void __intel_display_device_info_runtime_init(struct intel_display *display)

{

	struct intel_display *display = &i915->display;

	struct intel_display_runtime_info *display_runtime = DISPLAY_RUNTIME_INFO(i915);

	struct drm_i915_private *i915 = to_i915(display->drm);

	struct intel_display_runtime_info *display_runtime = DISPLAY_RUNTIME_INFO(display);

	enum pipe pipe;



	BUILD_BUG_ON(BITS_PER_TYPE(display_runtime->pipe_mask) < I915_MAX_PIPES);
@@ -1668,35 +1671,35 @@ static void __intel_display_device_info_runtime_init(struct drm_i915_private *i9 
	BUILD_BUG_ON(BITS_PER_TYPE(display_runtime->port_mask) < I915_MAX_PORTS);



	/* This covers both ULT and ULX */

	if (IS_HASWELL_ULT(i915) || IS_BROADWELL_ULT(i915))

	if (display->platform.haswell_ult || display->platform.broadwell_ult)

		display_runtime->port_mask &= ~BIT(PORT_D);



	if (IS_ICL_WITH_PORT_F(i915))

	if (display->platform.icelake_port_f)

		display_runtime->port_mask |= BIT(PORT_F);



	/* Wa_14011765242: adl-s A0,A1 */

	if (IS_ALDERLAKE_S(i915) && IS_DISPLAY_STEP(i915, STEP_A0, STEP_A2))

		for_each_pipe(i915, pipe)

	if (display->platform.alderlake_s && IS_DISPLAY_STEP(display, STEP_A0, STEP_A2))

		for_each_pipe(display, pipe)

			display_runtime->num_scalers[pipe] = 0;

	else if (DISPLAY_VER(i915) >= 11) {

		for_each_pipe(i915, pipe)

	else if (DISPLAY_VER(display) >= 11) {

		for_each_pipe(display, pipe)

			display_runtime->num_scalers[pipe] = 2;

	} else if (DISPLAY_VER(i915) >= 9) {

	} else if (DISPLAY_VER(display) >= 9) {

		display_runtime->num_scalers[PIPE_A] = 2;

		display_runtime->num_scalers[PIPE_B] = 2;

		display_runtime->num_scalers[PIPE_C] = 1;

	}



	if (DISPLAY_VER(i915) >= 13 || HAS_D12_PLANE_MINIMIZATION(display))

		for_each_pipe(i915, pipe)

	if (DISPLAY_VER(display) >= 13 || HAS_D12_PLANE_MINIMIZATION(display))

		for_each_pipe(display, pipe)

			display_runtime->num_sprites[pipe] = 4;

	else if (DISPLAY_VER(i915) >= 11)

		for_each_pipe(i915, pipe)

	else if (DISPLAY_VER(display) >= 11)

		for_each_pipe(display, pipe)

			display_runtime->num_sprites[pipe] = 6;

	else if (DISPLAY_VER(i915) == 10)

		for_each_pipe(i915, pipe)

	else if (DISPLAY_VER(display) == 10)

		for_each_pipe(display, pipe)

			display_runtime->num_sprites[pipe] = 3;

	else if (IS_BROXTON(i915)) {

	else if (display->platform.broxton) {

		/*

		 * Skylake and Broxton currently don't expose the topmost plane as its

		 * use is exclusive with the legacy cursor and we only want to expose
@@ -1709,23 +1712,23 @@ static void __intel_display_device_info_runtime_init(struct drm_i915_private *i9 
		display_runtime->num_sprites[PIPE_A] = 2;

		display_runtime->num_sprites[PIPE_B] = 2;

		display_runtime->num_sprites[PIPE_C] = 1;

	} else if (IS_VALLEYVIEW(i915) || IS_CHERRYVIEW(i915)) {

		for_each_pipe(i915, pipe)

	} else if (display->platform.valleyview || display->platform.cherryview) {

		for_each_pipe(display, pipe)

			display_runtime->num_sprites[pipe] = 2;

	} else if (DISPLAY_VER(i915) >= 5 || IS_G4X(i915)) {

		for_each_pipe(i915, pipe)

	} else if (DISPLAY_VER(display) >= 5 || display->platform.g4x) {

		for_each_pipe(display, pipe)

			display_runtime->num_sprites[pipe] = 1;

	}



	if ((IS_DGFX(i915) || DISPLAY_VER(i915) >= 14) &&

	    !(intel_de_read(i915, GU_CNTL_PROTECTED) & DEPRESENT)) {

		drm_info(&i915->drm, "Display not present, disabling\n");

	if ((display->platform.dgfx || DISPLAY_VER(display) >= 14) &&

	    !(intel_de_read(display, GU_CNTL_PROTECTED) & DEPRESENT)) {

		drm_info(display->drm, "Display not present, disabling\n");

		goto display_fused_off;

	}



	if (IS_DISPLAY_VER(i915, 7, 8) && HAS_PCH_SPLIT(i915)) {

		u32 fuse_strap = intel_de_read(i915, FUSE_STRAP);

		u32 sfuse_strap = intel_de_read(i915, SFUSE_STRAP);

	if (IS_DISPLAY_VER(display, 7, 8) && HAS_PCH_SPLIT(i915)) {

		u32 fuse_strap = intel_de_read(display, FUSE_STRAP);

		u32 sfuse_strap = intel_de_read(display, SFUSE_STRAP);



		/*

		 * SFUSE_STRAP is supposed to have a bit signalling the display
@@ -1740,16 +1743,16 @@ static void __intel_display_device_info_runtime_init(struct drm_i915_private *i9 
		    sfuse_strap & SFUSE_STRAP_DISPLAY_DISABLED ||

		    (HAS_PCH_CPT(i915) &&

		     !(sfuse_strap & SFUSE_STRAP_FUSE_LOCK))) {

			drm_info(&i915->drm,

			drm_info(display->drm,

				 "Display fused off, disabling\n");

			goto display_fused_off;

		} else if (fuse_strap & IVB_PIPE_C_DISABLE) {

			drm_info(&i915->drm, "PipeC fused off\n");

			drm_info(display->drm, "PipeC fused off\n");

			display_runtime->pipe_mask &= ~BIT(PIPE_C);

			display_runtime->cpu_transcoder_mask &= ~BIT(TRANSCODER_C);

		}

	} else if (DISPLAY_VER(i915) >= 9) {

		u32 dfsm = intel_de_read(i915, SKL_DFSM);

	} else if (DISPLAY_VER(display) >= 9) {

		u32 dfsm = intel_de_read(display, SKL_DFSM);



		if (dfsm & SKL_DFSM_PIPE_A_DISABLE) {

			display_runtime->pipe_mask &= ~BIT(PIPE_A);
@@ -1767,7 +1770,7 @@ static void __intel_display_device_info_runtime_init(struct drm_i915_private *i9 
			display_runtime->fbc_mask &= ~BIT(INTEL_FBC_C);

		}



		if (DISPLAY_VER(i915) >= 12 &&

		if (DISPLAY_VER(display) >= 12 &&

		    (dfsm & TGL_DFSM_PIPE_D_DISABLE)) {

			display_runtime->pipe_mask &= ~BIT(PIPE_D);

			display_runtime->cpu_transcoder_mask &= ~BIT(TRANSCODER_D);
@@ -1780,15 +1783,15 @@ static void __intel_display_device_info_runtime_init(struct drm_i915_private *i9 
		if (dfsm & SKL_DFSM_DISPLAY_HDCP_DISABLE)

			display_runtime->has_hdcp = 0;



		if (IS_DG2(i915) || DISPLAY_VER(i915) < 13) {

		if (display->platform.dg2 || DISPLAY_VER(display) < 13) {

			if (dfsm & SKL_DFSM_DISPLAY_PM_DISABLE)

				display_runtime->fbc_mask = 0;

		}



		if (DISPLAY_VER(i915) >= 11 && (dfsm & ICL_DFSM_DMC_DISABLE))

		if (DISPLAY_VER(display) >= 11 && (dfsm & ICL_DFSM_DMC_DISABLE))

			display_runtime->has_dmc = 0;



		if (IS_DISPLAY_VER(i915, 10, 12) &&

		if (IS_DISPLAY_VER(display, 10, 12) &&

		    (dfsm & GLK_DFSM_DISPLAY_DSC_DISABLE))

			display_runtime->has_dsc = 0;
@@ -1797,8 +1800,8 @@ static void __intel_display_device_info_runtime_init(struct drm_i915_private *i9 
			display_runtime->has_dbuf_overlap_detection = false;

	}



	if (DISPLAY_VER(i915) >= 20) {

		u32 cap = intel_de_read(i915, XE2LPD_DE_CAP);

	if (DISPLAY_VER(display) >= 20) {

		u32 cap = intel_de_read(display, XE2LPD_DE_CAP);



		if (REG_FIELD_GET(XE2LPD_DE_CAP_DSC_MASK, cap) ==

		    XE2LPD_DE_CAP_DSC_REMOVED)
@@ -1806,18 +1809,19 @@ static void __intel_display_device_info_runtime_init(struct drm_i915_private *i9 


		if (REG_FIELD_GET(XE2LPD_DE_CAP_SCALER_MASK, cap) ==

		    XE2LPD_DE_CAP_SCALER_SINGLE) {

			for_each_pipe(i915, pipe)

			for_each_pipe(display, pipe)

				if (display_runtime->num_scalers[pipe])

					display_runtime->num_scalers[pipe] = 1;

		}

	}



	if (DISPLAY_VER(i915) >= 30)

	if (DISPLAY_VER(display) >= 30)

		display_runtime->edp_typec_support =

			intel_de_read(display, PICA_PHY_CONFIG_CONTROL) & EDP_ON_TYPEC;



	display_runtime->rawclk_freq = intel_read_rawclk(display);

	drm_dbg_kms(&i915->drm, "rawclk rate: %d kHz\n", display_runtime->rawclk_freq);

	drm_dbg_kms(display->drm, "rawclk rate: %d kHz\n",

		    display_runtime->rawclk_freq);



	return;
@@ -1825,21 +1829,21 @@ static void __intel_display_device_info_runtime_init(struct drm_i915_private *i9 
	memset(display_runtime, 0, sizeof(*display_runtime));

}



void intel_display_device_info_runtime_init(struct drm_i915_private *i915)

void intel_display_device_info_runtime_init(struct intel_display *display)

{

	if (HAS_DISPLAY(i915))

		__intel_display_device_info_runtime_init(i915);

	if (HAS_DISPLAY(display))

		__intel_display_device_info_runtime_init(display);



	/* Display may have been disabled by runtime init */

	if (!HAS_DISPLAY(i915)) {

		i915->drm.driver_features &= ~(DRIVER_MODESET | DRIVER_ATOMIC);

		i915->display.info.__device_info = &no_display;

	if (!HAS_DISPLAY(display)) {

		display->drm->driver_features &= ~(DRIVER_MODESET | DRIVER_ATOMIC);

		display->info.__device_info = &no_display;

	}



	/* Disable nuclear pageflip by default on pre-g4x */

	if (!i915->display.params.nuclear_pageflip &&

	    DISPLAY_VER(i915) < 5 && !IS_G4X(i915))

		i915->drm.driver_features &= ~DRIVER_ATOMIC;

	if (!display->params.nuclear_pageflip &&

	    DISPLAY_VER(display) < 5 && !display->platform.g4x)

		display->drm->driver_features &= ~DRIVER_ATOMIC;

}



void intel_display_device_info_print(const struct intel_display_device_info *info,
@@ -1876,10 +1880,8 @@ void intel_display_device_info_print(const struct intel_display_device_info *inf 
 * Disabling display means taking over the display hardware, putting it to

 * sleep, and preventing connectors from being connected via any means.

 */

bool intel_display_device_enabled(struct drm_i915_private *i915)

bool intel_display_device_enabled(struct intel_display *display)

{

	struct intel_display *display = &i915->display;



	/* Only valid when HAS_DISPLAY() is true */

	drm_WARN_ON(display->drm, !HAS_DISPLAY(display));

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

+4 −3
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


struct drm_i915_private;

struct drm_printer;

struct intel_display;



/*

 * Display platforms and subplatforms. Keep platforms in display version based
@@ -288,10 +289,10 @@ struct intel_display_device_info { 
	} color;

};



bool intel_display_device_enabled(struct drm_i915_private *i915);

bool intel_display_device_enabled(struct intel_display *display);

void intel_display_device_probe(struct drm_i915_private *i915);

void intel_display_device_remove(struct drm_i915_private *i915);

void intel_display_device_info_runtime_init(struct drm_i915_private *i915);

void intel_display_device_remove(struct intel_display *display);

void intel_display_device_info_runtime_init(struct intel_display *display);



void intel_display_device_info_print(const struct intel_display_device_info *info,

				     const struct intel_display_runtime_info *runtime,

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

+2 −1
Original line number Diff line number Diff line
@@ -5633,6 +5633,7 @@ intel_dp_detect(struct drm_connector *connector, 
		struct drm_modeset_acquire_ctx *ctx,

		bool force)

{

	struct intel_display *display = to_intel_display(connector->dev);

	struct drm_i915_private *dev_priv = to_i915(connector->dev);

	struct intel_connector *intel_connector =

		to_intel_connector(connector);
@@ -5647,7 +5648,7 @@ intel_dp_detect(struct drm_connector *connector, 
	drm_WARN_ON(&dev_priv->drm,

		    !drm_modeset_is_locked(&dev_priv->drm.mode_config.connection_mutex));



	if (!intel_display_device_enabled(dev_priv))

	if (!intel_display_device_enabled(display))

		return connector_status_disconnected;



	if (!intel_display_driver_check_access(dev_priv))

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

+2 −1
Original line number Diff line number Diff line
@@ -1563,11 +1563,12 @@ static int 
intel_dp_mst_detect(struct drm_connector *connector,

		    struct drm_modeset_acquire_ctx *ctx, bool force)

{

	struct intel_display *display = to_intel_display(connector->dev);

	struct drm_i915_private *i915 = to_i915(connector->dev);

	struct intel_connector *intel_connector = to_intel_connector(connector);

	struct intel_dp *intel_dp = intel_connector->mst_port;



	if (!intel_display_device_enabled(i915))

	if (!intel_display_device_enabled(display))

		return connector_status_disconnected;



	if (drm_connector_is_unregistered(connector))