Commit c8a74954 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2025-03-13' of... 

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: default avatarDave Airlie <airlied@redhat.com>

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/Z9MG4fH-6Q8dTHE1@intel.com
parents d703575a a8045e46

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

+2 −3
Original line number Diff line number Diff line
@@ -7830,9 +7830,6 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) 


	intel_program_dpkgc_latency(state);



	if (state->modeset)

		intel_set_cdclk_post_plane_update(state);



	intel_wait_for_vblank_workers(state);



	/* 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) 
		intel_verify_planes(state);



	intel_sagv_post_plane_update(state);

	if (state->modeset)

		intel_set_cdclk_post_plane_update(state);

	intel_pmdemand_post_plane_update(state);



	drm_atomic_helper_commit_hw_done(&state->base);

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

+4 −1
Original line number Diff line number Diff line
@@ -164,6 +164,9 @@ static unsigned int tile_row_pages(const struct drm_i915_gem_object *obj) 
 * 4 - Support multiple fault handlers per object depending on object's

 *     backing storage (a.k.a. MMAP_OFFSET).

 *

 * 5 - Support multiple partial mmaps(mmap part of BO + unmap a offset, multiple

 *     times with different size and offset).

 *

 * Restrictions:

 *

 *  * 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) 
 */

int i915_gem_mmap_gtt_version(void)

{

	return 4;

	return 5;

}



static inline struct i915_gtt_view