Skip to content

Commit c8a7495

Browse files
committed
Merge tag 'drm-intel-fixes-2025-03-13' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-fixes
- Do cdclk post plane programming later (Ville) - Bump MMAP_GTT_VERSION: missing indication of partial mmaps support (Jose) Signed-off-by: Dave Airlie <airlied@redhat.com> From: Rodrigo Vivi <rodrigo.vivi@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/Z9MG4fH-6Q8dTHE1@intel.com
2 parents d703575 + a8045e4 commit c8a7495

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7830,9 +7830,6 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)
78307830

78317831
intel_program_dpkgc_latency(state);
78327832

7833-
if (state->modeset)
7834-
intel_set_cdclk_post_plane_update(state);
7835-
78367833
intel_wait_for_vblank_workers(state);
78377834

78387835
/* FIXME: We should call drm_atomic_helper_commit_hw_done() here
@@ -7906,6 +7903,8 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)
79067903
intel_verify_planes(state);
79077904

79087905
intel_sagv_post_plane_update(state);
7906+
if (state->modeset)
7907+
intel_set_cdclk_post_plane_update(state);
79097908
intel_pmdemand_post_plane_update(state);
79107909

79117910
drm_atomic_helper_commit_hw_done(&state->base);

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,9 @@ static unsigned int tile_row_pages(const struct drm_i915_gem_object *obj)
164164
* 4 - Support multiple fault handlers per object depending on object's
165165
* backing storage (a.k.a. MMAP_OFFSET).
166166
*
167+
* 5 - Support multiple partial mmaps(mmap part of BO + unmap a offset, multiple
168+
* times with different size and offset).
169+
*
167170
* Restrictions:
168171
*
169172
* * snoopable objects cannot be accessed via the GTT. It can cause machine
@@ -191,7 +194,7 @@ static unsigned int tile_row_pages(const struct drm_i915_gem_object *obj)
191194
*/
192195
int i915_gem_mmap_gtt_version(void)
193196
{
194-
return 4;
197+
return 5;
195198
}
196199

197200
static inline struct i915_gtt_view

0 commit comments

Comments
 (0)