Commit 92c3bb3d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2025-01-03' of https://gitlab.freedesktop.org/drm/kernel 

Pull drm fixes from Dave Airlie:
 "Happy New Year.

  It was fairly quiet for holidays period, certainly nothing that worth
  getting off the couch before I needed to, this is for the past two
  weeks, i915, xe and some adv7511, I expect we will see some amdgpu etc
  happening next week, but otherwise all quiet.

  i915:
   - Fix C10 pll programming sequence [cx0_phy]
   - Fix power gate sequence. [dg1]

  xe:
   - uapi: Revert some devcoredump file format changes breaking a mesa
     debug tool
   - Fixes around waits when moving to system
   - Fix a typo when checking for LMEM provisioning
   - Fix a fault on fd close after unbind
   - A couple of OA fixes squashed for stable backporting

  adv7511:
   - fix UAF
   - drop single lane support
   - audio infoframe fix"

* tag 'drm-fixes-2025-01-03' of https://gitlab.freedesktop.org/drm/kernel:
  xe/oa: Fix query mode of operation for OAR/OAC
  drm/i915/dg1: Fix power gate sequence.
  drm/i915/cx0_phy: Fix C10 pll programming sequence
  drm/xe: Fix fault on fd close after unbind
  drm/xe/pf: Use correct function to check LMEM provisioning
  drm/xe: Wait for migration job before unmapping pages
  drm/xe: Use non-interruptible wait when moving BO to system
  drm/xe: Revert some changes that break a mesa debug tool
  drm: adv7511: Drop dsi single lane support
  dt-bindings: display: adi,adv7533: Drop single lane support
  drm: adv7511: Fix use-after-free in adv7533_attach_dsi()
  drm/bridge: adv7511_audio: Update Audio InfoFrame properly
parents e30dd219 273b3eb6

Documentation/devicetree/bindings/display/bridge/adi,adv7533.yaml

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ properties: 
  adi,dsi-lanes:

    description: Number of DSI data lanes connected to the DSI host.

    $ref: /schemas/types.yaml#/definitions/uint32

    enum: [ 1, 2, 3, 4 ]

    enum: [ 2, 3, 4 ]



  "#sound-dai-cells":

    const: 0

drivers/gpu/drm/bridge/adv7511/adv7511_audio.c

+12 −2
Original line number Diff line number Diff line
@@ -153,7 +153,16 @@ static int adv7511_hdmi_hw_params(struct device *dev, void *data, 
			   ADV7511_AUDIO_CFG3_LEN_MASK, len);

	regmap_update_bits(adv7511->regmap, ADV7511_REG_I2C_FREQ_ID_CFG,

			   ADV7511_I2C_FREQ_ID_CFG_RATE_MASK, rate << 4);

	regmap_write(adv7511->regmap, 0x73, 0x1);



	/* send current Audio infoframe values while updating */

	regmap_update_bits(adv7511->regmap, ADV7511_REG_INFOFRAME_UPDATE,

			   BIT(5), BIT(5));



	regmap_write(adv7511->regmap, ADV7511_REG_AUDIO_INFOFRAME(0), 0x1);



	/* use Audio infoframe updated info */

	regmap_update_bits(adv7511->regmap, ADV7511_REG_INFOFRAME_UPDATE,

			   BIT(5), 0);



	return 0;

}
@@ -184,8 +193,9 @@ static int audio_startup(struct device *dev, void *data) 
	regmap_update_bits(adv7511->regmap, ADV7511_REG_GC(0),

				BIT(7) | BIT(6), BIT(7));

	/* use Audio infoframe updated info */

	regmap_update_bits(adv7511->regmap, ADV7511_REG_GC(1),

	regmap_update_bits(adv7511->regmap, ADV7511_REG_INFOFRAME_UPDATE,

				BIT(5), 0);



	/* enable SPDIF receiver */

	if (adv7511->audio_source == ADV7511_AUDIO_SOURCE_SPDIF)

		regmap_update_bits(adv7511->regmap, ADV7511_REG_AUDIO_CONFIG,

drivers/gpu/drm/bridge/adv7511/adv7511_drv.c

+8 −2
Original line number Diff line number Diff line
@@ -1241,8 +1241,10 @@ static int adv7511_probe(struct i2c_client *i2c) 
		return ret;



	ret = adv7511_init_regulators(adv7511);

	if (ret)

		return dev_err_probe(dev, ret, "failed to init regulators\n");

	if (ret) {

		dev_err_probe(dev, ret, "failed to init regulators\n");

		goto err_of_node_put;

	}



	/*

	 * The power down GPIO is optional. If present, toggle it from active to
@@ -1363,6 +1365,8 @@ static int adv7511_probe(struct i2c_client *i2c) 
	i2c_unregister_device(adv7511->i2c_edid);

uninit_regulators:

	adv7511_uninit_regulators(adv7511);

err_of_node_put:

	of_node_put(adv7511->host_node);



	return ret;

}
@@ -1371,6 +1375,8 @@ static void adv7511_remove(struct i2c_client *i2c) 
{

	struct adv7511 *adv7511 = i2c_get_clientdata(i2c);



	of_node_put(adv7511->host_node);



	adv7511_uninit_regulators(adv7511);



	drm_bridge_remove(&adv7511->bridge);

drivers/gpu/drm/bridge/adv7511/adv7533.c

+1 −3
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ int adv7533_parse_dt(struct device_node *np, struct adv7511 *adv) 


	of_property_read_u32(np, "adi,dsi-lanes", &num_lanes);



	if (num_lanes < 1 || num_lanes > 4)

	if (num_lanes < 2 || num_lanes > 4)

		return -EINVAL;



	adv->num_dsi_lanes = num_lanes;
@@ -181,8 +181,6 @@ int adv7533_parse_dt(struct device_node *np, struct adv7511 *adv) 
	if (!adv->host_node)

		return -ENODEV;



	of_node_put(adv->host_node);



	adv->use_timing_gen = !of_property_read_bool(np,

						"adi,disable-timing-generator");

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

+4 −8
Original line number Diff line number Diff line
@@ -2115,14 +2115,6 @@ static void intel_c10_pll_program(struct intel_display *display, 
		      0, C10_VDR_CTRL_MSGBUS_ACCESS,

		      MB_WRITE_COMMITTED);



	/* Custom width needs to be programmed to 0 for both the phy lanes */

	intel_cx0_rmw(encoder, INTEL_CX0_BOTH_LANES, PHY_C10_VDR_CUSTOM_WIDTH,

		      C10_VDR_CUSTOM_WIDTH_MASK, C10_VDR_CUSTOM_WIDTH_8_10,

		      MB_WRITE_COMMITTED);

	intel_cx0_rmw(encoder, INTEL_CX0_BOTH_LANES, PHY_C10_VDR_CONTROL(1),

		      0, C10_VDR_CTRL_UPDATE_CFG,

		      MB_WRITE_COMMITTED);



	/* Program the pll values only for the master lane */

	for (i = 0; i < ARRAY_SIZE(pll_state->pll); i++)

		intel_cx0_write(encoder, INTEL_CX0_LANE0, PHY_C10_VDR_PLL(i),
@@ -2132,6 +2124,10 @@ static void intel_c10_pll_program(struct intel_display *display, 
	intel_cx0_write(encoder, INTEL_CX0_LANE0, PHY_C10_VDR_CMN(0), pll_state->cmn, MB_WRITE_COMMITTED);

	intel_cx0_write(encoder, INTEL_CX0_LANE0, PHY_C10_VDR_TX(0), pll_state->tx, MB_WRITE_COMMITTED);



	/* Custom width needs to be programmed to 0 for both the phy lanes */

	intel_cx0_rmw(encoder, INTEL_CX0_BOTH_LANES, PHY_C10_VDR_CUSTOM_WIDTH,

		      C10_VDR_CUSTOM_WIDTH_MASK, C10_VDR_CUSTOM_WIDTH_8_10,

		      MB_WRITE_COMMITTED);

	intel_cx0_rmw(encoder, INTEL_CX0_LANE0, PHY_C10_VDR_CONTROL(1),

		      0, C10_VDR_CTRL_MASTER_LANE | C10_VDR_CTRL_UPDATE_CFG,

		      MB_WRITE_COMMITTED);