diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2024-02-26 14:20:50 +0100 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2024-02-26 14:20:50 +0100 |
| commit | 0475184905387dc481927f87e4abd63c3d8fa51d (patch) | |
| tree | ce348794e5d0fccacac690c0f8515101d3f09465 /drivers/gpu/drm/xe/xe_pt_walk.c | |
| parent | 89ac522d4507126d353834973ddbbf7b6acfdeef (diff) | |
| parent | f112b68f273fb0121cb64e0c3ac06adcb91e32b8 (diff) | |
Merge drm/drm-next into drm-misc-next
Backmerging to get drm-misc-next up to v6.8-rc6.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'drivers/gpu/drm/xe/xe_pt_walk.c')
| -rw-r--r-- | drivers/gpu/drm/xe/xe_pt_walk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/xe/xe_pt_walk.c b/drivers/gpu/drm/xe/xe_pt_walk.c index 8f6c8d063f39..b8b3d2aea492 100644 --- a/drivers/gpu/drm/xe/xe_pt_walk.c +++ b/drivers/gpu/drm/xe/xe_pt_walk.c @@ -74,7 +74,7 @@ int xe_pt_walk_range(struct xe_ptw *parent, unsigned int level, u64 addr, u64 end, struct xe_pt_walk *walk) { pgoff_t offset = xe_pt_offset(addr, level, walk); - struct xe_ptw **entries = parent->dir ? parent->dir->entries : NULL; + struct xe_ptw **entries = parent->children ? parent->children : NULL; const struct xe_pt_walk_ops *ops = walk->ops; enum page_walk_action action; struct xe_ptw *child; |