Commit 4d486a51 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2025-09-25' of... 

Merge tag 'drm-intel-fixes-2025-09-25' of https://gitlab.freedesktop.org/drm/i915/kernel

 into drm-fixes

- Set O_LARGEFILE in __create_shmem() (Taotao Chen)
- Guard reg_val against a INVALID_TRANSCODER [ddi] (Suraj Kandpal)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Tvrtko Ursulin <tursulin@igalia.com>
Link: https://lore.kernel.org/r/aNTxWfhsMkFZ3Q-a@linux
parents 29ecd479 7f97a0a8

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

+3 −2
Original line number Diff line number Diff line
@@ -596,8 +596,9 @@ intel_ddi_transcoder_func_reg_val_get(struct intel_encoder *encoder, 
			enum transcoder master;



			master = crtc_state->mst_master_transcoder;

			drm_WARN_ON(display->drm,

				    master == INVALID_TRANSCODER);

			if (drm_WARN_ON(display->drm,

					master == INVALID_TRANSCODER))

				master = TRANSCODER_A;

			temp |= TRANS_DDI_MST_TRANSPORT_SELECT(master);

		}

	} else {

drivers/gpu/drm/i915/gem/i915_gem_shmem.c

+7 −0
Original line number Diff line number Diff line
@@ -514,6 +514,13 @@ static int __create_shmem(struct drm_i915_private *i915, 
	if (IS_ERR(filp))

		return PTR_ERR(filp);



	/*

	 * Prevent -EFBIG by allowing large writes beyond MAX_NON_LFS on shmem

	 * objects by setting O_LARGEFILE.

	 */

	if (force_o_largefile())

		filp->f_flags |= O_LARGEFILE;



	obj->filp = filp;

	return 0;

}