Unverified Commit 9c2c8d4c authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15423 [openEuler-24.03-LTS][linux-6.6.y sync] Backport 6.6.69-6.6.70 LTS Additional Patches 

Merge Pull Request from: @wenzhiwei11 
 
V6.6.69-6.6.70 Remaining patch submission 
 
Link:https://gitee.com/openeuler/kernel/pulls/15423

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 0e68a81f b219a6b0

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

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,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 ]



  ports:

    description:

arch/arc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
KBUILD_DEFCONFIG := haps_hs_smp_defconfig



ifeq ($(CROSS_COMPILE),)

CROSS_COMPILE := $(call cc-cross-prefix, arc-linux- arceb-linux-)

CROSS_COMPILE := $(call cc-cross-prefix, arc-linux- arceb-linux- arc-linux-gnu-)

endif



cflags-y	+= -fno-common -pipe -fno-builtin -mmedium-calls -D__linux__

arch/powerpc/kernel/setup-common.c

+0 −1
Original line number Diff line number Diff line
@@ -601,7 +601,6 @@ struct seq_buf ppc_hw_desc __initdata = { 
	.buffer = ppc_hw_desc_buf,

	.size = sizeof(ppc_hw_desc_buf),

	.len = 0,

	.readpos = 0,

};



static __init void probe_machine(void)

drivers/gpu/drm/amd/amdkfd/kfd_migrate.c

+2 −2
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ svm_migrate_copy_to_vram(struct kfd_node *node, struct svm_range *prange, 
		spage = migrate_pfn_to_page(migrate->src[i]);

		if (spage && !is_zone_device_page(spage)) {

			src[i] = dma_map_page(dev, spage, 0, PAGE_SIZE,

					      DMA_TO_DEVICE);

					      DMA_BIDIRECTIONAL);

			r = dma_mapping_error(dev, src[i]);

			if (r) {

				dev_err(dev, "%s: fail %d dma_map_page\n",
@@ -634,7 +634,7 @@ svm_migrate_copy_to_ram(struct amdgpu_device *adev, struct svm_range *prange, 
			goto out_oom;

		}



		dst[i] = dma_map_page(dev, dpage, 0, PAGE_SIZE, DMA_FROM_DEVICE);

		dst[i] = dma_map_page(dev, dpage, 0, PAGE_SIZE, DMA_BIDIRECTIONAL);

		r = dma_mapping_error(dev, dst[i]);

		if (r) {

			dev_err(adev->dev, "%s: fail %d dma_map_page\n", __func__, r);

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,