Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Dave Airlie 2025-09-26 13:56:21 +10:00
parent 29ecd47927 7f97a0a871
commit 4d486a5177
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/i915/display/intel_ddi.c
View File

@ -596,8 +596,9 @@ intel_ddi_transcoder_func_reg_val_get(struct intel_encoder *encoder,
enum transcoder master; enum transcoder master;
master = crtc_state->mst_master_transcoder; master = crtc_state->mst_master_transcoder;
drm_WARN_ON(display->drm, if (drm_WARN_ON(display->drm,
master == INVALID_TRANSCODER); master == INVALID_TRANSCODER))
master = TRANSCODER_A;
temp |= TRANS_DDI_MST_TRANSPORT_SELECT(master); temp |= TRANS_DDI_MST_TRANSPORT_SELECT(master);
} }
} else { } else {

7
drivers/gpu/drm/i915/gem/i915_gem_shmem.c
View File

@ -514,6 +514,13 @@ static int __create_shmem(struct drm_i915_private *i915,
if (IS_ERR(filp)) if (IS_ERR(filp))
return PTR_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; obj->filp = filp;
return 0; return 0;
} }