Commit 0467145f authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-msm-fixes-2025-04-18' of https://gitlab.freedesktop.org/drm/msm into drm-fixes 



Fixes for v6.15-rc3

Display:
- Fix to call dpu_plane_atomic_check_pipe() for both SSPPs in
  case of multi-rect
- Fix to validate plane_state pointer before using it in
  dpu_plane_virtual_atomic_check()
- Fix to make sure dereferencing dpu_encoder_phys happens after
  making sure it is valid in _dpu_encoder_trigger_start()
- Remove the remaining intr_tear_rd_ptr which we initialized
  to -1 because NO_IRQ indices start from 0 now

GPU:
- Fix IB_SIZE overflow

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Rob Clark <robdclark@gmail.com>
Link: https://lore.kernel.org/r/CAF6AEGtVKXEVdzUzFWmQE8JmK3nx_hp+ynOd-5j3vnfcU-sgOA@mail.gmail.com
parents 3748bef7 9d78f025

drivers/gpu/drm/msm/adreno/a6xx_gpu.c

+4 −4
Original line number Diff line number Diff line
@@ -242,10 +242,10 @@ static void a6xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit) 
				break;

			fallthrough;

		case MSM_SUBMIT_CMD_BUF:

			OUT_PKT7(ring, CP_INDIRECT_BUFFER_PFE, 3);

			OUT_PKT7(ring, CP_INDIRECT_BUFFER, 3);

			OUT_RING(ring, lower_32_bits(submit->cmd[i].iova));

			OUT_RING(ring, upper_32_bits(submit->cmd[i].iova));

			OUT_RING(ring, submit->cmd[i].size);

			OUT_RING(ring, A5XX_CP_INDIRECT_BUFFER_2_IB_SIZE(submit->cmd[i].size));

			ibs++;

			break;

		}
@@ -377,10 +377,10 @@ static void a7xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit) 
				break;

			fallthrough;

		case MSM_SUBMIT_CMD_BUF:

			OUT_PKT7(ring, CP_INDIRECT_BUFFER_PFE, 3);

			OUT_PKT7(ring, CP_INDIRECT_BUFFER, 3);

			OUT_RING(ring, lower_32_bits(submit->cmd[i].iova));

			OUT_RING(ring, upper_32_bits(submit->cmd[i].iova));

			OUT_RING(ring, submit->cmd[i].size);

			OUT_RING(ring, A5XX_CP_INDIRECT_BUFFER_2_IB_SIZE(submit->cmd[i].size));

			ibs++;

			break;

		}

drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_14_msm8937.h

+0 −2
Original line number Diff line number Diff line
@@ -132,7 +132,6 @@ static const struct dpu_intf_cfg msm8937_intf[] = { 
		.prog_fetch_lines_worst_case = 14,

		.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 26),

		.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 27),

		.intr_tear_rd_ptr = -1,

	}, {

		.name = "intf_2", .id = INTF_2,

		.base = 0x6b000, .len = 0x268,
@@ -141,7 +140,6 @@ static const struct dpu_intf_cfg msm8937_intf[] = { 
		.prog_fetch_lines_worst_case = 14,

		.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 28),

		.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 29),

		.intr_tear_rd_ptr = -1,

	},

};

drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_15_msm8917.h

+0 −1
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ static const struct dpu_intf_cfg msm8917_intf[] = { 
		.prog_fetch_lines_worst_case = 14,

		.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 26),

		.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 27),

		.intr_tear_rd_ptr = -1,

	},

};

drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_16_msm8953.h

+0 −3
Original line number Diff line number Diff line
@@ -131,7 +131,6 @@ static const struct dpu_intf_cfg msm8953_intf[] = { 
		.prog_fetch_lines_worst_case = 14,

		.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 24),

		.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 25),

		.intr_tear_rd_ptr = -1,

	}, {

		.name = "intf_1", .id = INTF_1,

		.base = 0x6a800, .len = 0x268,
@@ -140,7 +139,6 @@ static const struct dpu_intf_cfg msm8953_intf[] = { 
		.prog_fetch_lines_worst_case = 14,

		.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 26),

		.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 27),

		.intr_tear_rd_ptr = -1,

	}, {

		.name = "intf_2", .id = INTF_2,

		.base = 0x6b000, .len = 0x268,
@@ -149,7 +147,6 @@ static const struct dpu_intf_cfg msm8953_intf[] = { 
		.prog_fetch_lines_worst_case = 14,

		.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 28),

		.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 29),

		.intr_tear_rd_ptr = -1,

	},

};

drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_7_msm8996.h

+0 −4
Original line number Diff line number Diff line
@@ -241,7 +241,6 @@ static const struct dpu_intf_cfg msm8996_intf[] = { 
		.prog_fetch_lines_worst_case = 25,

		.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 24),

		.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 25),

		.intr_tear_rd_ptr = -1,

	}, {

		.name = "intf_1", .id = INTF_1,

		.base = 0x6a800, .len = 0x268,
@@ -250,7 +249,6 @@ static const struct dpu_intf_cfg msm8996_intf[] = { 
		.prog_fetch_lines_worst_case = 25,

		.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 26),

		.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 27),

		.intr_tear_rd_ptr = -1,

	}, {

		.name = "intf_2", .id = INTF_2,

		.base = 0x6b000, .len = 0x268,
@@ -259,7 +257,6 @@ static const struct dpu_intf_cfg msm8996_intf[] = { 
		.prog_fetch_lines_worst_case = 25,

		.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 28),

		.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 29),

		.intr_tear_rd_ptr = -1,

	}, {

		.name = "intf_3", .id = INTF_3,

		.base = 0x6b800, .len = 0x268,
@@ -267,7 +264,6 @@ static const struct dpu_intf_cfg msm8996_intf[] = { 
		.prog_fetch_lines_worst_case = 25,

		.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 30),

		.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 31),

		.intr_tear_rd_ptr = -1,

	},

};