Split out most of "FIXME: drm/i915/display: Remaining changes to make xe compile"
Subsystems (5)
Maarten Lankhorst
maintainercover Split out most of "FIXME: drm/i915/display: Remaining changes to make xe compile"
A lot of the changes are reverts that are no longer useful. In some cases the compat headers provide functionality, in other cases it needs to be added.
With all reverts, the fixme patch should be mostly isolated to intel_fb.c and intel_fbdev.c
Untested.
Maarten Lankhorst (10):
revert fixme in intel_atomic_plane.c
drm/atomic: Add drm_atomic_helper_set_fence_deadline() function drm/i915: Implement fence->set_deadline.
FIXME drm/i915/display: Use fence->set_deadline to boost requests fixup xe i915_drv.h compat header
revert intel_frontbuffer changes.
Update compat headers.
more reverts
drm/i915/display: Use i915_gem_object_get_dma_address to get dma
address
revert more (fbc)
drivers/gpu/drm/drm_atomic_helper.c | 15 ++-- .../gpu/drm/i915/display/intel_atomic_plane.c | 70 ++++--------------- drivers/gpu/drm/i915/display/intel_cursor.c | 12 ++-- drivers/gpu/drm/i915/display/intel_display.c | 37 +--------- .../drm/i915/display/intel_display_types.h | 4 -- drivers/gpu/drm/i915/display/intel_fbc.c | 13 ++-- .../gpu/drm/i915/display/intel_frontbuffer.c | 7 +- .../gpu/drm/i915/display/intel_frontbuffer.h | 4 -- .../drm/i915/display/skl_universal_plane.c | 4 -- drivers/gpu/drm/i915/i915_request.c | 9 +++ .../compat-i915-headers/gem/i915_gem_lmem.h | 2 + .../compat-i915-headers/gem/i915_gem_object.h | 58 +++++++++++++++ .../gem/i915_gem_object_frontbuffer.h | 4 +- .../gpu/drm/xe/compat-i915-headers/i915_drv.h | 1 + .../xe/compat-i915-headers/i915_gem_stolen.h | 4 +- .../gpu/drm/xe/compat-i915-headers/i915_vma.h | 6 ++ include/drm/drm_atomic_helper.h | 3 +- 17 files changed, 126 insertions(+), 127 deletions(-) create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_lmem.h create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_object.h
Signature · 1 line
2.39.2
Maarten Lankhorst
maintainerPATCH 1/10 revert fixme in intel_atomic_plane.c
Revert the plane_fb changes, so we can fix it properly.
--- .../gpu/drm/i915/display/intel_atomic_plane.c | 25 +++---------------- 1 file changed, 4 insertions(+), 21 deletions(-)
drivers/gpu/drm/i915/display/intel_atomic_plane.c +4 -21
@@ -1033,11 +1033,10 @@ static int intel_prepare_plane_fb(struct drm_plane *_plane, struct drm_plane_state *_new_plane_state) { - struct intel_plane_state *new_plane_state = -to_intel_plane_state (_new_plane_state); -#ifdef I915 struct i915_sched_attr attr = { .priority = I915_PRIORITY_DISPLAY };struct intel_plane *plane =to_intel_plane (_plane); +struct intel_plane_state *new_plane_state = +to_intel_plane_state (_new_plane_state);struct intel_atomic_state *state =to_intel_atomic_state (new_plane_state->uapi.state);struct drm_i915_private *dev_priv =to_i915 (plane->base.dev);
@@ -1133,22 +1132,6 @@ intel_prepare_plane_fb(struct drm_plane *_plane,intel_plane_unpin_fb (new_plane_state);return ret; -#else -int ret; - -if (!intel_fb_obj (new_plane_state->hw.fb)) -return 0 ; - - ret =intel_plane_pin_fb (new_plane_state); -if (ret) -return ret; - - ret =drm_gem_plane_helper_prepare_fb (_plane, _new_plane_state); -if (ret) -intel_plane_unpin_fb (new_plane_state); - -return ret; -#endif }/**
@@ -1164,9 +1147,9 @@ intel_cleanup_plane_fb(struct drm_plane *plane, {struct intel_plane_state *old_plane_state =to_intel_plane_state (_old_plane_state); -__maybe_unused struct intel_atomic_state *state = +struct intel_atomic_state *state =to_intel_atomic_state (old_plane_state->uapi.state); -__maybe_unused struct drm_i915_private *dev_priv =to_i915 (plane->dev); +struct drm_i915_private *dev_priv =to_i915 (plane->dev);struct drm_i915_gem_object *obj =intel_fb_obj (old_plane_state->hw.fb);if (!obj)
Signature · 1 line
2.39.2
Maarten Lankhorst
maintainerPATCH 2/10 drm/atomic: Add drm_atomic_helper_set_fence_deadline() function
In reply to Maarten Lankhorsti915 has an i915 specific boost. Use set_fence_deadline instead.
--- drivers/gpu/drm/drm_atomic_helper.c | 15 +++++++++++---- include/drm/drm_atomic_helper.h | 3 ++- 2 files changed, 13 insertions(+), 5 deletions(-)
drivers/gpu/drm/drm_atomic_helper.c +11 -4
@@ -1520,12 +1520,16 @@ void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev, }EXPORT_SYMBOL (drm_atomic_helper_commit_modeset_enables); -/* +/** +* drm_atomic_helper_set_fence_deadline - update fence deadlines. +* @dev: DRM device +* @state: atomic state object with new state structures +* * For atomic updates which touch just a single CRTC, calculate the time of the * next vblank, and inform all the fences of the deadline. */ -static void set_fence_deadline (struct drm_device *dev, -struct drm_atomic_state *state) +void drm_atomic_helper_set_fence_deadline (struct drm_device *dev, +struct drm_atomic_state *state) {struct drm_crtc *crtc;struct drm_crtc_state *new_crtc_state;
@@ -1560,6 +1564,7 @@ static void set_fence_deadline(struct drm_device *dev,dma_fence_set_deadline (new_plane_state->fence, vbltime); } } +EXPORT_SYMBOL (drm_atomic_helper_set_fence_deadline);/** * drm_atomic_helper_wait_for_fences - wait for fences stashed in plane state
@@ -1580,6 +1585,8 @@ static void set_fence_deadline(struct drm_device *dev,* to wait **before** we do anything that can't be easily rolled back. That is * before we call drm_atomic_helper_swap_state(). * +* Calls drm_atomic_helper_set_fence_deadline(). +* * Returns zero if success or < 0 if dma_fence_wait() fails. */ int drm_atomic_helper_wait_for_fences(struct drm_device *dev,
@@ -1590,7 +1597,7 @@ int drm_atomic_helper_wait_for_fences(struct drm_device *dev,struct drm_plane_state *new_plane_state;int i, ret; -set_fence_deadline (dev, state); +drm_atomic_helper_set_fence_deadline (dev, state);for_each_new_plane_in_state (state, plane, new_plane_state, i) {if (!new_plane_state->fence)
include/drm/drm_atomic_helper.h +2 -1
@@ -72,7 +72,8 @@ int drm_atomic_helper_async_check(struct drm_device *dev, struct drm_atomic_state *state);void drm_atomic_helper_async_commit (struct drm_device *dev,struct drm_atomic_state *state); - +void drm_atomic_helper_set_fence_deadline (struct drm_device *dev, +struct drm_atomic_state *state);int drm_atomic_helper_wait_for_fences (struct drm_device *dev,struct drm_atomic_state *state,bool pre_swap);
Signature · 1 line
2.39.2
Maarten Lankhorst
maintainerPATCH 3/10 drm/i915: Implement fence->set_deadline.
In reply to Maarten LankhorstUseful when we want to start using it in display.
--- drivers/gpu/drm/i915/i915_request.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/gpu/drm/i915/i915_request.c +9 -0
@@ -105,6 +105,14 @@ static signed long i915_fence_wait(struct dma_fence *fence, timeout); } +static void i915_fence_set_deadline (struct dma_fence *fence, +ktime_t deadline) +{ +struct i915_sched_attr attr = { .priority =I915_PRIORITY_DISPLAY }; + +i915_gem_fence_wait_priority (fence, &attr); +} +struct kmem_cache *i915_request_slab_cache (void ) {return slab_requests;
@@ -177,6 +185,7 @@ const struct dma_fence_ops i915_fence_ops = { .enable_signaling = i915_fence_enable_signaling, .signaled = i915_fence_signaled, .wait = i915_fence_wait, + .set_deadline = i915_fence_set_deadline, .release = i915_fence_release, };
Signature · 1 line
2.39.2
Maarten Lankhorst
maintainerPATCH 4/10 FIXME drm/i915/display: Use fence->set_deadline to boost requests
In reply to Maarten LankhorstInstead of using a i915 specific method, use the generic helper to combine fences and set the deadline.
--- .../gpu/drm/i915/display/intel_atomic_plane.c | 47 ++++--------------- drivers/gpu/drm/i915/display/intel_display.c | 2 + 2 files changed, 11 insertions(+), 38 deletions(-)
drivers/gpu/drm/i915/display/intel_atomic_plane.c +9 -38
@@ -1033,7 +1033,6 @@ static int intel_prepare_plane_fb(struct drm_plane *_plane, struct drm_plane_state *_new_plane_state) { - struct i915_sched_attr attr = { .priority = I915_PRIORITY_DISPLAY }; struct intel_plane *plane = to_intel_plane(_plane);struct intel_plane_state *new_plane_state =to_intel_plane_state (_new_plane_state);
@@ -1072,49 +1071,20 @@ intel_prepare_plane_fb(struct drm_plane *_plane, } } -if (new_plane_state->uapi.fence) {/* explicit fencing */ -i915_gem_fence_wait_priority (new_plane_state->uapi.fence, - &attr); - ret =i915_sw_fence_await_dma_fence (&state->commit_ready, - new_plane_state->uapi.fence, -i915_fence_timeout (dev_priv), -GFP_KERNEL ); -if (ret <0 ) +if (obj) { + ret =intel_plane_pin_fb (new_plane_state); +if (ret)return ret; } -if (!obj) -return 0 ; - - - ret =intel_plane_pin_fb (new_plane_state); +/* prepare after pinning */ + ret =drm_gem_plane_helper_prepare_fb (_plane, _new_plane_state);if (ret) -return ret; + goto unpin_fb; -i915_gem_object_wait_priority (obj,0 , &attr); - -if (!new_plane_state->uapi.fence) {/* implicit fencing */ -struct dma_resv_iter cursor; -struct dma_fence *fence; - - ret =i915_sw_fence_await_reservation (&state->commit_ready, - obj->base.resv, false, -i915_fence_timeout (dev_priv), -GFP_KERNEL ); -if (ret <0 ) - goto unpin_fb; - -dma_resv_iter_begin (&cursor, obj->base.resv, -DMA_RESV_USAGE_WRITE ); -dma_resv_for_each_fence_unlocked (&cursor, fence) { -intel_display_rps_boost_after_vblank (new_plane_state->hw.crtc, - fence); - } -dma_resv_iter_end (&cursor); - }else { +if (new_plane_state->uapi.fence)intel_display_rps_boost_after_vblank (new_plane_state->hw.crtc, new_plane_state->uapi.fence); - }/* * We declare pageflips to be interactive and so merit a small bias
@@ -1124,7 +1094,8 @@ intel_prepare_plane_fb(struct drm_plane *_plane,* that are not quite steady state without resorting to forcing * maximum clocks following a vblank miss (see do_rps_boost()). */ -intel_display_rps_mark_interactive (dev_priv, state, true); +if (obj) +intel_display_rps_mark_interactive (dev_priv, state, true);return 0 ;
drivers/gpu/drm/i915/display/intel_display.c +2 -0
@@ -6599,6 +6599,8 @@ static int intel_atomic_prepare_commit(struct intel_atomic_state *state)if (ret <0 )return ret; +drm_atomic_helper_set_fence_deadline (state->base.dev, &state->base); +for_each_new_intel_crtc_in_state (state, crtc, crtc_state, i) {if (intel_crtc_needs_color_update (crtc_state))intel_color_prepare_commit (crtc_state);
Signature · 1 line
2.39.2
Re: [Intel-xe] [04/10] FIXME drm/i915/display: Use fence->set_deadline to boost requests
Hello Maarten,
We have ongoing discussion in gfx mailing list
(https://patchwork.freedesktop.org/series/125160/). I understood we have now there clear path forward. I will prepare one more addresing recent comments from Ville. That patch set which will take care of this. After getting it merged into drm-intel-next I will backport it to drm-xe-next and it will solve this.
BR,
Jouni Högander
Quoted 126 lines · Maarten Lankhorst
Instead of using a i915 specific method, use the generic helper to combine fences and set the deadline.
Signed-off-by Maarten Lankhorst <[email protected]>---
.../gpu/drm/i915/display/intel_atomic_plane.c | 47 ++++------------- --
drivers/gpu/drm/i915/display/intel_display.c | 2 +2 files changed, 11 insertions(+), 38 deletions(-)drivers/gpu/drm/i915/display/intel_atomic_plane.c +0
-1@@ -1033,7 +1033,6 @@ static int intel_prepare_plane_fb(struct drm_plane *_plane, struct drm_plane_state *_new_plane_state) { - struct i915_sched_attr attr = { .priority = I915_PRIORITY_DISPLAY }; struct intel_plane *plane = to_intel_plane(_plane);struct
intel_plane_state*new_plane_state=to_intel_plane_state(_new_plane_state);drivers/gpu/drm/i915/display/intel_atomic_plane.c +0
-0@@ -1072,49 +1071,20 @@ intel_prepare_plane_fb(struct drm_plane *_plane, } }
- if (new_plane_state->uapi.fence) { /* explicit fencing */ - i915_gem_fence_wait_priority(new_plane_state-Quoted 1 line
uapi.fence,
- &attr); - ret = i915_sw_fence_await_dma_fence(&state-
Quoted 1 line
commit_ready,- new_plane_state-
Quoted 1 line
uapi.fence,
-
i915_fence_timeout(dev_priv),
-GFP_KERNEL); - if (ret < 0)
+ if (obj) {
+ ret =intel_plane_pin_fb(new_plane_state); + if (ret)
return ret;
}
- if (!obj)
- return 0;drivers/gpu/drm/i915/display/intel_atomic_plane.c +2
-3- - - ret = intel_plane_pin_fb(new_plane_state); + /* prepare after pinning */ + ret = drm_gem_plane_helper_prepare_fb(_plane,
_new_plane_state);
if (ret)
- return ret;
+ gotounpin_fb;
- i915_gem_object_wait_priority(obj, 0, &attr);drivers/gpu/drm/i915/display/intel_atomic_plane.c +0
-6- - if (!new_plane_state->uapi.fence) { /* implicit fencing */ - struct dma_resv_iter cursor; - struct dma_fence *fence; - - ret = i915_sw_fence_await_reservation(&state-Quoted 1 line
commit_ready,-
obj->base.resv, false,
-i915_fence_timeout(dev_priv),
-GFP_KERNEL); - if (ret < 0)
- gotounpin_fb;drivers/gpu/drm/i915/display/intel_atomic_plane.c +0
-5- - dma_resv_iter_begin(&cursor, obj->base.resv, - DMA_RESV_USAGE_WRITE); - dma_resv_for_each_fence_unlocked(&cursor, fence) { -intel_display_rps_boost_after_vblank(new_plane_
state->hw.crtc,
- fence); - }
- dma_resv_iter_end(&cursor);
- } else {
+ if (new_plane_state->uapi.fence) intel_display_rps_boost_after_vblank(new_plane_state-Quoted 1 line
hw.crtc,
new_plane_state-
Quoted 1 line
uapi.fence);
- }
/*
* We declare pageflips to be interactive and so merit a small biasdrivers/gpu/drm/i915/display/intel_atomic_plane.c +0
-0@@ -1124,7 +1094,8 @@ intel_prepare_plane_fb(struct drm_plane *_plane, * that are not quite steady state without resorting toforcing
* maximum clocks following a vblank miss (seedo_rps_boost()).
*/
- intel_display_rps_mark_interactive(dev_priv, state, true); + if (obj)
+ intel_display_rps_mark_interactive(dev_priv, state, true);
return 0;drivers/gpu/drm/i915/display/intel_display.c +0
-0@@ -6599,6 +6599,8 @@ static int intel_atomic_prepare_commit(struct intel_atomic_state *state) if (ret < 0) return ret;
+ drm_atomic_helper_set_fence_deadline(state->base.dev, &state-Quoted 1 line
base);
+
for_each_new_intel_crtc_in_state(state, crtc,crtc_state, i) {
if (intel_crtc_needs_color_update(crtc_state))intel_color_prepare_commit(crtc_state);
Maarten Lankhorst
maintainerPATCH 5/10 fixup xe i915_drv.h compat header
In reply to Maarten Lankhorst--- drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h +1 -0
@@ -202,6 +202,7 @@ static inline void intel_runtime_pm_put(struct xe_runtime_pm *pm, bool wakeref)#define intel_uncore_arm_unclaimed_mmio_detection (x) do { } while (0)#define i915_sw_fence_commit (x) do { } while (0) +#define i915_sw_fence_await_reservation (...) (0)#define with_intel_runtime_pm (rpm, wf) \ for ((wf) = intel_runtime_pm_get(rpm); (wf); \
Signature · 1 line
2.39.2
Maarten Lankhorst
maintainerPATCH 6/10 revert intel_frontbuffer changes.
In reply to Maarten LankhorstNo functional change, just things removed.
--- drivers/gpu/drm/i915/display/intel_frontbuffer.c | 7 ++++--- drivers/gpu/drm/i915/display/intel_frontbuffer.h | 4 ---- 2 files changed, 4 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/display/intel_frontbuffer.c +4 -3
@@ -190,7 +190,7 @@ void __intel_fb_flush(struct intel_frontbuffer *front,enum fb_op_origin origin, unsigned int frontbuffer_bits) { - struct drm_i915_private *i915 = intel_bo_to_i915((front->obj)); + struct drm_i915_private *i915 = intel_bo_to_i915(front->obj);if (origin ==ORIGIN_CS ) {spin_lock (&i915->display.fb_tracking.lock);
@@ -259,6 +259,7 @@ static void frontbuffer_release(struct kref *ref)drm_WARN_ON (&intel_bo_to_i915 (obj)->drm,atomic_read (&front->bits));i915_ggtt_clear_scanout (obj); + ret =i915_gem_object_set_frontbuffer (obj,NULL );drm_WARN_ON (&intel_bo_to_i915 (obj)->drm, ret);spin_unlock (&intel_bo_to_i915 (obj)->display.fb_tracking.lock);
@@ -289,12 +290,12 @@ intel_frontbuffer_get(struct drm_i915_gem_object *obj) frontbuffer_retire, I915_ACTIVE_RETIRE_SLEEPS);INIT_WORK (&front->flush_work, intel_frontbuffer_flush_work); +spin_lock (&i915->display.fb_tracking.lock); cur =i915_gem_object_set_frontbuffer (obj, front);spin_unlock (&i915->display.fb_tracking.lock);if (cur != front)kfree (front); -return cur; }
@@ -337,7 +338,7 @@ void intel_frontbuffer_track(struct intel_frontbuffer *old, }if (new) { -drm_WARN_ON (&intel_bo_to_i915 (old->obj)->drm, +drm_WARN_ON (&intel_bo_to_i915 (new->obj)->drm,atomic_read (&new->bits) & frontbuffer_bits);atomic_or (frontbuffer_bits, &new->bits); }
drivers/gpu/drm/i915/display/intel_frontbuffer.h +0 -4
@@ -28,10 +28,6 @@#include <linux/bits.h> #include <linux/kref.h> -#ifndef I915 -#include "xe_bo.h" -#endif -#include "i915_active_types.h" struct drm_i915_private ;
Signature · 1 line
2.39.2
Re: [Intel-xe] [06/10] revert intel_frontbuffer changes.
Quoted 1 line · Maarten Lankhorst
No functional change, just things removed.
Hello Maarten.
Instead of introducing completely new patch I think you should change this as a fixup patch for "FIXME: drm/i915/display: Remaining changes to make xe compile"
BR,
Jouni Högander
Quoted 75 lines
Signed-off-by Maarten Lankhorst <[email protected]>---
drivers/gpu/drm/i915/display/intel_frontbuffer.c | 7 ++++---drivers/gpu/drm/i915/display/intel_frontbuffer.h| 4 ----2 files changed, 4 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/display/intel_frontbuffer.c +1
-1@@ -190,7 +190,7 @@ void __intel_fb_flush(struct intel_frontbuffer *front, enum fb_op_origin origin, unsigned int frontbuffer_bits) { - struct drm_i915_private *i915 = intel_bo_to_i915((front- >obj)); + struct drm_i915_private *i915 = intel_bo_to_i915(front->obj);
if (origin ==ORIGIN_CS) {spin_lock(&i915->display.fb_tracking.lock);drivers/gpu/drm/i915/display/intel_frontbuffer.c +0
-0@@ -259,6 +259,7 @@ static void frontbuffer_release(struct kref *ref)drm_WARN_ON(&intel_bo_to_i915(obj)->drm, atomic_read(&front-
Quoted 1 line
bits));
i915_ggtt_clear_scanout(obj);
+
ret =i915_gem_object_set_frontbuffer(obj, NULL);drm_WARN_ON(&intel_bo_to_i915(obj)->drm, ret); spin_unlock(&intel_bo_to_i915(obj)-Quoted 1 line
display.fb_tracking.lock);
drivers/gpu/drm/i915/display/intel_frontbuffer.c +1
-1@@ -289,12 +290,12 @@ intel_frontbuffer_get(struct drm_i915_gem_object *obj) frontbuffer_retire, I915_ACTIVE_RETIRE_SLEEPS); INIT_WORK(&front->flush_work, intel_frontbuffer_flush_work); + spin_lock(&i915->display.fb_tracking.lock); cur = i915_gem_object_set_frontbuffer(obj, front); spin_unlock(&i915->display.fb_tracking.lock); if (cur != front) kfree(front); - return cur; }drivers/gpu/drm/i915/display/intel_frontbuffer.c +0
-0@@ -337,7 +338,7 @@ void intel_frontbuffer_track(struct intel_frontbuffer *old, }
if (new) {
- drm_WARN_ON(&intel_bo_to_i915(old->obj)->drm, + drm_WARN_ON(&intel_bo_to_i915(new->obj)->drm,atomic_read(&new->bits)&frontbuffer_bits);
atomic_or(frontbuffer_bits,&new->bits); }drivers/gpu/drm/i915/display/intel_frontbuffer.h +0
-0@@ -28,10 +28,6 @@ #include <linux/bits.h> #include <linux/kref.h>drivers/gpu/drm/i915/display/intel_frontbuffer.h +0
-4-#ifndef I915 -#include "xe_bo.h" -#endif -#include "
i915_active_types.h"
structdrm_i915_private;
Maarten Lankhorst
maintainerPATCH 7/10 Update compat headers.
In reply to Maarten LankhorstSome naughty headers used I915_GEM_OBJECT_H instead of their own name, fix it.
Update headers to move some stuff out from the messy patch.
--- .../compat-i915-headers/gem/i915_gem_lmem.h | 2 + .../compat-i915-headers/gem/i915_gem_object.h | 58 +++++++++++++++++++ .../gem/i915_gem_object_frontbuffer.h | 4 +- .../xe/compat-i915-headers/i915_gem_stolen.h | 4 +- .../gpu/drm/xe/compat-i915-headers/i915_vma.h | 6 ++ 5 files changed, 70 insertions(+), 4 deletions(-) create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_lmem.h create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_object.h
drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_lmem.h new file +2 -0
@@ -0,0 +1,2 @@ +/* Empty */ +
drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_object.h new file +58 -0
58 lines not on this page · raw message
drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_object_frontbuffer.h +2 -2
@@ -3,8 +3,8 @@* Copyright © 2022 Intel Corporation */ -#ifndef _I915_GEM_OBJECT_H_ -#define _I915_GEM_OBJECT_H_ +#ifndef _I915_GEM_OBJECT_FB_H_ +#define _I915_GEM_OBJECT_FB_H_#define i915_gem_object_get_frontbuffer (obj) NULL#define i915_gem_object_set_frontbuffer (obj, front) (front)
drivers/gpu/drm/xe/compat-i915-headers/i915_gem_stolen.h +2 -2
@@ -1,5 +1,5 @@ -#ifndef _I915_GEM_OBJECT_H_ -#define _I915_GEM_OBJECT_H_ +#ifndef _I915_GEM_STOLEN_H_ +#define _I915_GEM_STOLEN_H_#include "xe_ttm_stolen_mgr.h" #include "xe_res_cursor.h"
drivers/gpu/drm/xe/compat-i915-headers/i915_vma.h +6 -0
@@ -19,4 +19,10 @@ struct i915_vma {#define i915_ggtt_clear_scanout (bo) do { } while (0)#define i915_vma_fence_id (vma) -1 + +static inline u32 i915_ggtt_offset (const struct i915_vma *vma) +{ +return vma->node.start; +} +#endif
Signature · 1 line
2.39.2
Maarten Lankhorst
maintainerPATCH 8/10 more reverts
In reply to Maarten Lankhorst--- drivers/gpu/drm/i915/display/intel_cursor.c | 8 ++--- drivers/gpu/drm/i915/display/intel_display.c | 35 ------------------- .../drm/i915/display/intel_display_types.h | 4 --- .../drm/i915/display/skl_universal_plane.c | 4 --- 4 files changed, 3 insertions(+), 48 deletions(-)
drivers/gpu/drm/i915/display/intel_cursor.c +3 -5
@@ -30,17 +30,15 @@ static const u32 intel_cursor_formats[] = {static u32 intel_cursor_base (const struct intel_plane_state *plane_state) { -__maybe_unused struct drm_i915_private *dev_priv = +struct drm_i915_private *dev_priv =to_i915 (plane_state->uapi.plane->dev); -__maybe_unused const struct drm_framebuffer *fb = plane_state->hw.fb; -__maybe_unused const struct drm_i915_gem_object *obj =intel_fb_obj (fb); +const struct drm_framebuffer *fb = plane_state->hw.fb; +const struct drm_i915_gem_object *obj =intel_fb_obj (fb);u32 base; -#ifdef I915 if (DISPLAY_INFO (dev_priv)->cursor_needs_physical) base =sg_dma_address (obj->mm.pages->sgl);else -#endif base =intel_plane_ggtt_offset (plane_state);return base + plane_state->view.color_plane[0 ].offset;
drivers/gpu/drm/i915/display/intel_display.c +0 -35
@@ -42,10 +42,8 @@#include <drm/drm_probe_helper.h> #include <drm/drm_rect.h> -#ifdef I915 #include "gem/i915_gem_lmem.h" #include "gem/i915_gem_object.h" -#endif #include "g4x_dp.h" #include "g4x_hdmi.h"
@@ -7121,39 +7119,6 @@ static void intel_atomic_cleanup_work(struct work_struct *work)intel_atomic_helper_free_state (i915); } -#ifndef I915 -static int i915_gem_object_read_from_page (struct xe_bo *bo, -u32 ofs,u64 *ptr,u32 size) -{ -struct ttm_bo_kmap_obj map; -void *virtual; -bool is_iomem; -int ret; - -XE_WARN_ON (size !=8 ); - - ret =xe_bo_lock (bo, true); -if (ret) -return ret; - - ret =ttm_bo_kmap (&bo->ttm, ofs >>PAGE_SHIFT ,1 , &map); -if (ret) - goto out_unlock; - - ofs &= ~PAGE_MASK ; - virtual =ttm_kmap_obj_virtual (&map, &is_iomem); -if (is_iomem) - *ptr =readq ((void __iomem *)(virtual + ofs)); -else - *ptr = *(u64 *)(virtual + ofs); - -ttm_bo_kunmap (&map); -out_unlock: -xe_bo_unlock (bo); -return ret; -} -#endif -static void intel_atomic_prepare_plane_clear_colors (struct intel_atomic_state *state) {struct drm_i915_private *i915 =to_i915 (state->base.dev);
drivers/gpu/drm/i915/display/intel_display_types.h +0 -4
@@ -2115,11 +2115,7 @@ intel_crtc_needs_color_update(const struct intel_crtc_state *crtc_state)static inline u32 intel_plane_ggtt_offset (const struct intel_plane_state *plane_state) { -#ifdef I915 return i915_ggtt_offset (plane_state->ggtt_vma); -#else -return plane_state->ggtt_vma->node.start; -#endif } static inline struct intel_frontbuffer *
drivers/gpu/drm/i915/display/skl_universal_plane.c +0 -4
@@ -2454,15 +2454,11 @@ skl_get_initial_plane_config(struct intel_crtc *crtc, fb->modifier =DRM_FORMAT_MOD_LINEAR ;break ;case PLANE_CTL_TILED_X : -#ifdef I915 plane_config->tiling =I915_TILING_X ; -#endif fb->modifier =I915_FORMAT_MOD_X_TILED ;break ;case PLANE_CTL_TILED_Y : -#ifdef I915 plane_config->tiling =I915_TILING_Y ; -#endif if (val &PLANE_CTL_RENDER_DECOMPRESSION_ENABLE )if (DISPLAY_VER (dev_priv) >=14 ) fb->modifier =I915_FORMAT_MOD_4_TILED_MTL_RC_CCS ;
Signature · 1 line
2.39.2
Maarten Lankhorst
maintainerPATCH 9/10 drm/i915/display: Use i915_gem_object_get_dma_address to get dma address
In reply to Maarten LankhorstWorks better for xe like that. obj is no longer const.
--- drivers/gpu/drm/i915/display/intel_cursor.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_cursor.c +4 -2
@@ -23,6 +23,8 @@#include "intel_psr.h" #include "skl_watermark.h" +#include "gem/i915_gem_object.h" +/* Cursor formats */ static const u32 intel_cursor_formats[] = {DRM_FORMAT_ARGB8888 ,
@@ -33,11 +35,11 @@ static u32 intel_cursor_base(const struct intel_plane_state *plane_state)struct drm_i915_private *dev_priv =to_i915 (plane_state->uapi.plane->dev);const struct drm_framebuffer *fb = plane_state->hw.fb; -const struct drm_i915_gem_object *obj =intel_fb_obj (fb); +struct drm_i915_gem_object *obj =intel_fb_obj (fb);u32 base;if (DISPLAY_INFO (dev_priv)->cursor_needs_physical) - base =sg_dma_address (obj->mm.pages->sgl); + base =i915_gem_object_get_dma_address (obj,0 );else base =intel_plane_ggtt_offset (plane_state);
Signature · 1 line
2.39.2
Maarten Lankhorst
maintainerPATCH 10/10 revert more (fbc)
In reply to Maarten LankhorstShould be a noop.
--- drivers/gpu/drm/i915/display/intel_fbc.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/display/intel_fbc.c +9 -4
@@ -453,7 +453,6 @@ static void g4x_fbc_program_cfb(struct intel_fbc *fbc)intel_de_write (i915,DPFC_CB_BASE ,i915_gem_stolen_node_offset (&fbc->compressed_fb)); - }static const struct intel_fbc_funcs g4x_fbc_funcs = {
@@ -612,8 +611,10 @@ static void ivb_fbc_activate(struct intel_fbc *fbc)else if (DISPLAY_VER (i915) ==9 )skl_fbc_program_cfb_stride (fbc); +#ifdef I915 if (intel_gt_support_legacy_fencing (to_gt (i915)))snb_fbc_program_fence (fbc); +#endif intel_de_write (i915,ILK_DPFC_CONTROL (fbc->id),DPFC_CTL_EN |ivb_dpfc_ctl (fbc));
@@ -800,7 +801,6 @@ static int intel_fbc_alloc_cfb(struct intel_fbc *fbc,drm_dbg_kms (&i915->drm,"reserved %llu bytes of contiguous stolen space for FBC, limit: %d\n" ,i915_gem_stolen_node_size (&fbc->compressed_fb), fbc->limit); -return 0 ; err_llb:
@@ -978,7 +978,7 @@ static void intel_fbc_update_state(struct intel_atomic_state *state,struct intel_crtc *crtc, struct intel_plane *plane) { - struct drm_i915_private *i915 = to_i915(state->base.dev); + __maybe_unused struct drm_i915_private *i915 = to_i915(state->base.dev);const struct intel_crtc_state *crtc_state =intel_atomic_get_new_crtc_state (state, crtc); const struct intel_plane_state *plane_state =
@@ -993,7 +993,7 @@ static void intel_fbc_update_state(struct intel_atomic_state *state,/* FBC1 compression interval: arbitrary choice of 1 second */ fbc_state->interval =drm_mode_vrefresh (&crtc_state->hw.adjusted_mode); - +#ifdef I915 fbc_state->fence_y_offset =intel_plane_fence_y_offset (plane_state); drm_WARN_ON(&i915->drm, plane_state->flags & PLANE_HAS_FENCE &&
@@ -1002,6 +1002,7 @@ static void intel_fbc_update_state(struct intel_atomic_state *state,if (plane_state->flags &PLANE_HAS_FENCE ) fbc_state->fence_id =i915_vma_fence_id (plane_state->ggtt_vma); else +#endif fbc_state->fence_id =-1 ; fbc_state->cfb_stride =intel_fbc_cfb_stride (plane_state);
@@ -1011,6 +1012,7 @@ static void intel_fbc_update_state(struct intel_atomic_state *state,static bool intel_fbc_is_fence_ok (const struct intel_plane_state *plane_state) { +#ifdef I915 struct drm_i915_private *i915 =to_i915 (plane_state->uapi.plane->dev);/*
@@ -1028,6 +1030,9 @@ static bool intel_fbc_is_fence_ok(const struct intel_plane_state *plane_state)return DISPLAY_VER (i915) >=9 || (plane_state->flags &PLANE_HAS_FENCE &&i915_vma_fence_id (plane_state->ggtt_vma) !=-1 ); +#else +return true; +#endif }static bool intel_fbc_is_cfb_ok (const struct intel_plane_state *plane_state)
Signature · 1 line
2.39.2
Re: [Intel-xe] [10/10] revert more (fbc)
Quoted 1 line · Maarten Lankhorst
Should be a noop.
Hello Maarten. I couldn't figure out for what branch this patch is prepared for? All the removed ifdefs in this patch are already removed earlier. See my (merged) patch set here:
https://patchwork.freedesktop.org/series/122905/
BR,
Jouni Högander
Quoted 101 lines
Signed-off-by Maarten Lankhorst <[email protected]>---
drivers/gpu/drm/i915/display/intel_fbc.c | 13 +++++++++----1 file changed, 9 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/display/intel_fbc.c +0
-0@@ -453,7 +453,6 @@ static void g4x_fbc_program_cfb(struct intel_fbc *fbc)
intel_de_write(i915,DPFC_CB_BASE, i915_gem_stolen_node_offset(&fbc-Quoted 1 line
compressed_fb));-
}
static const structintel_fbc_funcsg4x_fbc_funcs= {drivers/gpu/drm/i915/display/intel_fbc.c +0
-0@@ -612,8 +611,10 @@ static void ivb_fbc_activate(struct intel_fbc *fbc) else if (DISPLAY_VER(i915) == 9) skl_fbc_program_cfb_stride(fbc);
+#ifdef I915
if (intel_gt_support_legacy_fencing(to_gt(i915)))snb_fbc_program_fence(fbc); +#endif
intel_de_write(i915,ILK_DPFC_CONTROL(fbc->id),DPFC_CTL_EN|ivb_dpfc_ctl(fbc));drivers/gpu/drm/i915/display/intel_fbc.c +0
-0@@ -800,7 +801,6 @@ static int intel_fbc_alloc_cfb(struct intel_fbc *fbc, drm_dbg_kms(&i915->drm,"reserved %llu bytes of contiguous stolen space for FBC, limit: %d\n",
i915_gem_stolen_node_size(&fbc->compressed_fb),fbc->limit);
-
return 0;
err_llb:drivers/gpu/drm/i915/display/intel_fbc.c +1
-1@@ -978,7 +978,7 @@ static void intel_fbc_update_state(struct intel_atomic_state *state, struct intel_crtc *crtc, struct intel_plane *plane) { - struct drm_i915_private *i915 = to_i915(state->base.dev); + __maybe_unused struct drm_i915_private *i915 = to_i915(state- >base.dev);const struct
intel_crtc_state*crtc_state=intel_atomic_get_new_crtc_state(state, crtc); const structintel_plane_state*plane_state=drivers/gpu/drm/i915/display/intel_fbc.c +0
-0@@ -993,7 +993,7 @@ static void intel_fbc_update_state(struct intel_atomic_state *state,
/* FBC1 compression interval: arbitrary choice of 1 second */fbc_state->interval= drm_mode_vrefresh(&crtc_state-Quoted 1 line
hw.adjusted_mode);
drivers/gpu/drm/i915/display/intel_fbc.c +1
-1- +#ifdef I915 fbc_state->fence_y_offset =
intel_plane_fence_y_offset(plane_state);
drm_WARN_ON(&i915->drm,plane_state->flags&PLANE_HAS_FENCE&&drivers/gpu/drm/i915/display/intel_fbc.c +0
-0@@ -1002,6 +1002,7 @@ static void intel_fbc_update_state(struct intel_atomic_state *state, if (plane_state->flags & PLANE_HAS_FENCE)fbc_state->fence_id = i915_vma_fence_id(plane_state-
Quoted 1 line
ggtt_vma);else
+#endif
fbc_state->fence_id = -1;
fbc_state->cfb_stride =intel_fbc_cfb_stride(plane_state);drivers/gpu/drm/i915/display/intel_fbc.c +0
-0@@ -1011,6 +1012,7 @@ static void intel_fbc_update_state(struct intel_atomic_state *state,
static boolintel_fbc_is_fence_ok(const struct intel_plane_state *plane_state)
{
+#ifdef I915
structdrm_i915_private*i915 = to_i915(plane_state-Quoted 1 line
uapi.plane->dev);
/*drivers/gpu/drm/i915/display/intel_fbc.c +0
-0@@ -1028,6 +1030,9 @@ static bool intel_fbc_is_fence_ok(const struct intel_plane_state *plane_state)return
DISPLAY_VER(i915)>= 9 || (plane_state->flags&PLANE_HAS_FENCE&&i915_vma_fence_id(plane_state->ggtt_vma)!= -1);drivers/gpu/drm/i915/display/intel_fbc.c +3
-0+#else + return true; +#endif }
static boolintel_fbc_is_cfb_ok(const struct intel_plane_state *plane_state)