Skip to content

Commit 4d486a5

Browse files
committed
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: Dave Airlie <airlied@redhat.com> From: Tvrtko Ursulin <tursulin@igalia.com> Link: https://lore.kernel.org/r/aNTxWfhsMkFZ3Q-a@linux
2 parents 29ecd47 + 7f97a0a commit 4d486a5

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -596,8 +596,9 @@ intel_ddi_transcoder_func_reg_val_get(struct intel_encoder *encoder,
596596
enum transcoder master;
597597

598598
master = crtc_state->mst_master_transcoder;
599-
drm_WARN_ON(display->drm,
600-
master == INVALID_TRANSCODER);
599+
if (drm_WARN_ON(display->drm,
600+
master == INVALID_TRANSCODER))
601+
master = TRANSCODER_A;
601602
temp |= TRANS_DDI_MST_TRANSPORT_SELECT(master);
602603
}
603604
} else {

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -514,6 +514,13 @@ static int __create_shmem(struct drm_i915_private *i915,
514514
if (IS_ERR(filp))
515515
return PTR_ERR(filp);
516516

517+
/*
518+
* Prevent -EFBIG by allowing large writes beyond MAX_NON_LFS on shmem
519+
* objects by setting O_LARGEFILE.
520+
*/
521+
if (force_o_largefile())
522+
filp->f_flags |= O_LARGEFILE;
523+
517524
obj->filp = filp;
518525
return 0;
519526
}

0 commit comments

Comments
 (0)