| Message ID | 20241107100140.292928-4-maarten.lankhorst@linux.intel.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [1/9] drm/xe: Remove double pageflip | expand |
On Thu, Nov 07, 2024 at 11:01:35AM +0100, Maarten Lankhorst wrote: > Technically, I believe this means that xe_display_init_noirq and > xe_display_init_noaccel can be merged together now. Please use the commit message to explain what you are doing and why instead of telling what could be done next. > > Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Link: https://patchwork.freedesktop.org/patch/msgid/20241105121857.17389-4-maarten.lankhorst@linux.intel.com > Signed-off-by: Maarten Lankhorst,,, <dev@lankhorst.se> same extra commas in your signature... > --- > drivers/gpu/drm/xe/xe_device.c | 12 ++++-------- > drivers/gpu/drm/xe/xe_tile.c | 7 +++++++ > 2 files changed, 11 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c > index cef782f244e1a..b9948b2dc8d1d 100644 > --- a/drivers/gpu/drm/xe/xe_device.c > +++ b/drivers/gpu/drm/xe/xe_device.c > @@ -41,7 +41,6 @@ > #include "xe_hw_engine_group.h" > #include "xe_hwmon.h" > #include "xe_irq.h" > -#include "xe_memirq.h" > #include "xe_mmio.h" > #include "xe_module.h" > #include "xe_observation.h" > @@ -673,9 +672,6 @@ int xe_device_probe(struct xe_device *xe) > err = xe_ggtt_init_early(tile->mem.ggtt); > if (err) > return err; > - err = xe_memirq_init(&tile->memirq); > - if (err) > - return err; > } > > for_each_gt(gt, xe, id) { > @@ -695,10 +691,6 @@ int xe_device_probe(struct xe_device *xe) > if (err) > return err; > > - err = xe_irq_install(xe); > - if (err) > - goto err; > - > err = probe_has_flat_ccs(xe); > if (err) > goto err; > @@ -736,6 +728,10 @@ int xe_device_probe(struct xe_device *xe) > goto err; > } > > + err = xe_irq_install(xe); > + if (err) > + goto err; > + > for_each_gt(gt, xe, id) { > last_gt = id; > > diff --git a/drivers/gpu/drm/xe/xe_tile.c b/drivers/gpu/drm/xe/xe_tile.c > index 2825553b568f7..d07c1fba793ca 100644 > --- a/drivers/gpu/drm/xe/xe_tile.c > +++ b/drivers/gpu/drm/xe/xe_tile.c > @@ -10,6 +10,7 @@ > #include "xe_device.h" > #include "xe_ggtt.h" > #include "xe_gt.h" > +#include "xe_memirq.h" > #include "xe_migrate.h" > #include "xe_pcode.h" > #include "xe_sa.h" > @@ -179,6 +180,12 @@ int xe_tile_init_noalloc(struct xe_tile *tile) > > int xe_tile_init(struct xe_tile *tile) > { > + int err; > + > + err = xe_memirq_init(&tile->memirq); > + if (err) > + return err; > + > tile->mem.kernel_bb_pool = xe_sa_bo_manager_init(tile, SZ_1M, 16); > if (IS_ERR(tile->mem.kernel_bb_pool)) > return PTR_ERR(tile->mem.kernel_bb_pool); > -- > 2.45.2 >
diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c index cef782f244e1a..b9948b2dc8d1d 100644 --- a/drivers/gpu/drm/xe/xe_device.c +++ b/drivers/gpu/drm/xe/xe_device.c @@ -41,7 +41,6 @@ #include "xe_hw_engine_group.h" #include "xe_hwmon.h" #include "xe_irq.h" -#include "xe_memirq.h" #include "xe_mmio.h" #include "xe_module.h" #include "xe_observation.h" @@ -673,9 +672,6 @@ int xe_device_probe(struct xe_device *xe) err = xe_ggtt_init_early(tile->mem.ggtt); if (err) return err; - err = xe_memirq_init(&tile->memirq); - if (err) - return err; } for_each_gt(gt, xe, id) { @@ -695,10 +691,6 @@ int xe_device_probe(struct xe_device *xe) if (err) return err; - err = xe_irq_install(xe); - if (err) - goto err; - err = probe_has_flat_ccs(xe); if (err) goto err; @@ -736,6 +728,10 @@ int xe_device_probe(struct xe_device *xe) goto err; } + err = xe_irq_install(xe); + if (err) + goto err; + for_each_gt(gt, xe, id) { last_gt = id; diff --git a/drivers/gpu/drm/xe/xe_tile.c b/drivers/gpu/drm/xe/xe_tile.c index 2825553b568f7..d07c1fba793ca 100644 --- a/drivers/gpu/drm/xe/xe_tile.c +++ b/drivers/gpu/drm/xe/xe_tile.c @@ -10,6 +10,7 @@ #include "xe_device.h" #include "xe_ggtt.h" #include "xe_gt.h" +#include "xe_memirq.h" #include "xe_migrate.h" #include "xe_pcode.h" #include "xe_sa.h" @@ -179,6 +180,12 @@ int xe_tile_init_noalloc(struct xe_tile *tile) int xe_tile_init(struct xe_tile *tile) { + int err; + + err = xe_memirq_init(&tile->memirq); + if (err) + return err; + tile->mem.kernel_bb_pool = xe_sa_bo_manager_init(tile, SZ_1M, 16); if (IS_ERR(tile->mem.kernel_bb_pool)) return PTR_ERR(tile->mem.kernel_bb_pool);