github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-04 20:46:48 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

- Do cdclk post plane programming later (Ville)

Browse Source 
- Bump MMAP_GTT_VERSION: missing indication of partial mmaps support (Jose)
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEbSBwaO7dZQkcLOKj+mJfZA7rE8oFAmfTBkIACgkQ+mJfZA7r
 E8rW1ggAhGlmBcj/QQnJYkha5l5OuRsF+O9n/pae6m8LkGeGMCEUY2mt7scxCQXw
 RJ2AYfV+kyZYFsY5GkrQWUSXhYUBfaLAgZmyd3VuSihvf/jU7Dk7X7xxTlHOC+vT
 tESLkoy8j4kPB6IbtN8sVo+TugQOJZix+ok7zLZK/l2lvU66Cd7VY8nZL8EuhGeP
 GeNXGL5xtdpx9+F0dhNu7+0spAEBjlJSW5mhT8/mYg5G397/GTUoi6hFKt+MjBwR
 XcRNy5VLMZHc1J8dexylTZ/MdPVqqSKpIfthAesGVSu2b7v/lljhFeFGOrnYuc1T
 MLrnS+MqH5Q3DFbJAM8ljD3IXt7aKA==
 =kAbt
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Dave Airlie 2025-03-14 12:30:43 +10:00
commit c8a74954cd
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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);

5
drivers/gpu/drm/i915/gem/i915_gem_mman.c
View File

@ -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