From: "Jouni Högander" <jouni.hogander@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: "Jouni Högander" <jouni.hogander@intel.com>
Subject: [Intel-xe] [PATCH v5 1/9] Revert "FIXME: drm/i915: xe intel_fb.c framebuffer init and destroy xe changes"
Date: Thu, 7 Dec 2023 07:22:44 +0200 [thread overview]
Message-ID: <20231207052252.2092191-2-jouni.hogander@intel.com> (raw)
In-Reply-To: <20231207052252.2092191-1-jouni.hogander@intel.com>
This reverts commit 14d1d786caacdb3438d07ab86fabf2e36c8151cc.
Revert this as we are about to introduce implementation without any
ifdefs.
Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
---
drivers/gpu/drm/i915/display/intel_fb.c | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
index 16c37a508552..f7675284907f 100644
--- a/drivers/gpu/drm/i915/display/intel_fb.c
+++ b/drivers/gpu/drm/i915/display/intel_fb.c
@@ -1891,17 +1891,6 @@ static void intel_user_framebuffer_destroy_vm(struct drm_framebuffer *fb)
if (intel_fb_uses_dpt(fb))
intel_dpt_destroy(intel_fb->dpt_vm);
-#ifndef I915
- if (intel_fb_obj(fb)->flags & XE_BO_CREATE_PINNED_BIT) {
- struct xe_bo *bo = intel_fb_obj(fb);
-
- /* Unpin our kernel fb first */
- xe_bo_lock(bo, false);
- xe_bo_unpin(bo);
- xe_bo_unlock(bo);
- }
- xe_bo_put(intel_fb_obj(fb));
-#endif
}
static void intel_user_framebuffer_destroy(struct drm_framebuffer *fb)
@@ -2174,10 +2163,6 @@ int intel_framebuffer_init(struct intel_framebuffer *intel_fb,
intel_fb->dpt_vm = vm;
}
-#ifndef I915
- /* Hold a reference to object while fb is alive */
- xe_bo_get(obj);
-#endif
ret = drm_framebuffer_init(&dev_priv->drm, fb, &intel_fb_funcs);
if (ret) {
--
2.34.1
next prev parent reply other threads:[~2023-12-07 5:23 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-07 5:22 [Intel-xe] [PATCH v5 0/9] Intel_fb.c refactoring Jouni Högander
2023-12-07 5:22 ` Jouni Högander [this message]
2023-12-07 5:22 ` [Intel-xe] [PATCH v5 2/9] fixup! FIXME: drm/i915/display: Remaining changes to make xe compile Jouni Högander
2023-12-07 5:22 ` [Intel-xe] [PATCH v5 3/9] drm/i915/display: use intel_bo_to_drm_bo in intel_fb.c Jouni Högander
2023-12-07 5:22 ` [Intel-xe] [PATCH v5 4/9] drm/i915/display: Convert intel_fb_modifier_to_tiling as non-static Jouni Högander
2023-12-07 5:22 ` [Intel-xe] [PATCH v5 5/9] drm/i915/display: Handle invalid fb_modifier in intel_fb_modifier_to_tiling Jouni Högander
2023-12-07 5:22 ` [Intel-xe] [PATCH v5 6/9] drm/i915/display: Split i915 specific code away from intel_fb.c Jouni Högander
2023-12-07 5:22 ` [Intel-xe] [PATCH v5 7/9] drm/i915/display: Add intel_fb_bo_framebuffer_fini Jouni Högander
2023-12-07 5:22 ` [Intel-xe] [PATCH v5 8/9] fixup! drm/xe/display: Implement display support Jouni Högander
2023-12-07 5:22 ` [Intel-xe] [PATCH v5 9/9] " Jouni Högander
2023-12-07 5:25 ` [Intel-xe] ✓ CI.Patch_applied: success for Intel_fb.c refactoring (rev7) Patchwork
2023-12-07 5:26 ` [Intel-xe] ✗ CI.checkpatch: warning " Patchwork
2023-12-07 5:27 ` [Intel-xe] ✓ CI.KUnit: success " Patchwork
2023-12-07 5:34 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-12-07 5:35 ` [Intel-xe] ✓ CI.Hooks: " Patchwork
2023-12-07 5:36 ` [Intel-xe] ✗ CI.checksparse: warning " Patchwork
2023-12-07 6:11 ` [Intel-xe] ✓ CI.BAT: success " Patchwork
2023-12-07 15:10 ` [PATCH v5 0/9] Intel_fb.c refactoring Maarten Lankhorst
2023-12-08 6:18 ` Hogander, Jouni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231207052252.2092191-2-jouni.hogander@intel.com \
--to=jouni.hogander@intel.com \
--cc=intel-xe@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox