display/intel_drrs.o \
display/intel_dsb.o \
display/intel_fb.o \
- display/intel_fb_bo.o \
display/intel_fb_pin.o \
display/intel_fbc.o \
display/intel_fdi.o \
if (display->parent->bo->describe)
display->parent->bo->describe(m, obj);
}
+
+int intel_bo_framebuffer_init(struct drm_gem_object *obj, struct drm_mode_fb_cmd2 *mode_cmd)
+{
+ struct intel_display *display = to_intel_display(obj->dev);
+
+ return display->parent->bo->framebuffer_init(obj, mode_cmd);
+}
+
+void intel_bo_framebuffer_fini(struct drm_gem_object *obj)
+{
+ struct intel_display *display = to_intel_display(obj->dev);
+
+ display->parent->bo->framebuffer_fini(obj);
+}
+
+struct drm_gem_object *intel_bo_framebuffer_lookup(struct intel_display *display,
+ struct drm_file *filp,
+ const struct drm_mode_fb_cmd2 *user_mode_cmd)
+{
+ return display->parent->bo->framebuffer_lookup(display->drm, filp, user_mode_cmd);
+}
#include <linux/types.h>
+struct drm_file;
struct drm_gem_object;
+struct drm_mode_fb_cmd2;
struct drm_scanout_buffer;
+struct intel_display;
struct intel_framebuffer;
struct seq_file;
struct vm_area_struct;
void intel_bo_describe(struct seq_file *m, struct drm_gem_object *obj);
+void intel_bo_framebuffer_fini(struct drm_gem_object *obj);
+int intel_bo_framebuffer_init(struct drm_gem_object *obj, struct drm_mode_fb_cmd2 *mode_cmd);
+struct drm_gem_object *intel_bo_framebuffer_lookup(struct intel_display *display,
+ struct drm_file *filp,
+ const struct drm_mode_fb_cmd2 *user_mode_cmd);
+
#endif /* __INTEL_BO__ */
#include "intel_display_types.h"
#include "intel_display_utils.h"
#include "intel_fb.h"
-#include "intel_fb_bo.h"
#include "intel_frontbuffer.h"
#include "intel_parent.h"
#include "intel_plane.h"
if (intel_fb_uses_dpt(fb))
intel_parent_dpt_destroy(display, intel_fb->dpt);
- intel_fb_bo_framebuffer_fini(intel_fb_bo(fb));
+ intel_bo_framebuffer_fini(intel_fb_bo(fb));
intel_parent_frontbuffer_put(display, intel_fb->frontbuffer);
/*
* intel_parent_frontbuffer_get() must be done before
- * intel_fb_bo_framebuffer_init() to avoid set_tiling vs. addfb race.
+ * intel_bo_framebuffer_init() to avoid set_tiling vs. addfb race.
*/
intel_fb->frontbuffer = intel_parent_frontbuffer_get(display, obj);
if (!intel_fb->frontbuffer) {
goto err_free_panic;
}
- ret = intel_fb_bo_framebuffer_init(obj, mode_cmd);
+ ret = intel_bo_framebuffer_init(obj, mode_cmd);
if (ret)
goto err_frontbuffer_put;
if (intel_fb_uses_dpt(fb))
intel_parent_dpt_destroy(display, intel_fb->dpt);
err_bo_framebuffer_fini:
- intel_fb_bo_framebuffer_fini(obj);
+ intel_bo_framebuffer_fini(obj);
err_frontbuffer_put:
intel_parent_frontbuffer_put(display, intel_fb->frontbuffer);
err_free_panic:
const struct drm_format_info *info,
const struct drm_mode_fb_cmd2 *user_mode_cmd)
{
+ struct intel_display *display = to_intel_display(dev);
struct drm_framebuffer *fb;
struct drm_gem_object *obj;
struct drm_mode_fb_cmd2 mode_cmd = *user_mode_cmd;
- obj = intel_fb_bo_lookup_valid_bo(dev, filp, &mode_cmd);
+ obj = intel_bo_framebuffer_lookup(display, filp, &mode_cmd);
if (IS_ERR(obj))
return ERR_CAST(obj);
+++ /dev/null
-/* SPDX-License-Identifier: MIT */
-/*
- * Copyright © 2021 Intel Corporation
- */
-
-#include <drm/drm_framebuffer.h>
-#include <drm/drm_print.h>
-
-#include "gem/i915_gem_object.h"
-
-#include "i915_drv.h"
-#include "intel_fb.h"
-#include "intel_fb_bo.h"
-
-void intel_fb_bo_framebuffer_fini(struct drm_gem_object *obj)
-{
- /* Nothing to do for i915 */
-}
-
-int intel_fb_bo_framebuffer_init(struct drm_gem_object *_obj,
- struct drm_mode_fb_cmd2 *mode_cmd)
-{
- struct drm_i915_gem_object *obj = to_intel_bo(_obj);
- struct drm_i915_private *i915 = to_i915(obj->base.dev);
- unsigned int tiling, stride;
-
- i915_gem_object_lock(obj, NULL);
- tiling = i915_gem_object_get_tiling(obj);
- stride = i915_gem_object_get_stride(obj);
- i915_gem_object_unlock(obj);
-
- if (mode_cmd->flags & DRM_MODE_FB_MODIFIERS) {
- /*
- * If there's a fence, enforce that
- * the fb modifier and tiling mode match.
- */
- if (tiling != I915_TILING_NONE &&
- tiling != intel_fb_modifier_to_tiling(mode_cmd->modifier[0])) {
- drm_dbg_kms(&i915->drm,
- "tiling_mode doesn't match fb modifier\n");
- return -EINVAL;
- }
- } else {
- if (tiling == I915_TILING_X) {
- mode_cmd->modifier[0] = I915_FORMAT_MOD_X_TILED;
- } else if (tiling == I915_TILING_Y) {
- drm_dbg_kms(&i915->drm,
- "No Y tiling for legacy addfb\n");
- return -EINVAL;
- }
- }
-
- /*
- * gen2/3 display engine uses the fence if present,
- * so the tiling mode must match the fb modifier exactly.
- */
- if (GRAPHICS_VER(i915) < 4 &&
- tiling != intel_fb_modifier_to_tiling(mode_cmd->modifier[0])) {
- drm_dbg_kms(&i915->drm,
- "tiling_mode must match fb modifier exactly on gen2/3\n");
- return -EINVAL;
- }
-
- /*
- * If there's a fence, enforce that
- * the fb pitch and fence stride match.
- */
- if (tiling != I915_TILING_NONE && mode_cmd->pitches[0] != stride) {
- drm_dbg_kms(&i915->drm,
- "pitch (%d) must match tiling stride (%d)\n",
- mode_cmd->pitches[0], stride);
- return -EINVAL;
- }
-
- return 0;
-}
-
-struct drm_gem_object *
-intel_fb_bo_lookup_valid_bo(struct drm_device *drm,
- struct drm_file *filp,
- const struct drm_mode_fb_cmd2 *mode_cmd)
-{
- struct drm_i915_private *i915 = to_i915(drm);
- struct drm_i915_gem_object *obj;
-
- obj = i915_gem_object_lookup(filp, mode_cmd->handles[0]);
- if (!obj)
- return ERR_PTR(-ENOENT);
-
- /* object is backed with LMEM for discrete */
- if (HAS_LMEM(i915) && !i915_gem_object_can_migrate(obj, INTEL_REGION_LMEM_0)) {
- /* object is "remote", not in local memory */
- i915_gem_object_put(obj);
- drm_dbg_kms(&i915->drm, "framebuffer must reside in local memory\n");
- return ERR_PTR(-EREMOTE);
- }
-
- return intel_bo_to_drm_bo(obj);
-}
+++ /dev/null
-/* SPDX-License-Identifier: MIT */
-/*
- * Copyright © 2021 Intel Corporation
- */
-
-#ifndef __INTEL_FB_BO_H__
-#define __INTEL_FB_BO_H__
-
-struct drm_device;
-struct drm_file;
-struct drm_framebuffer;
-struct drm_gem_object;
-struct drm_mode_fb_cmd2;
-
-void intel_fb_bo_framebuffer_fini(struct drm_gem_object *obj);
-
-int intel_fb_bo_framebuffer_init(struct drm_gem_object *obj,
- struct drm_mode_fb_cmd2 *mode_cmd);
-
-struct drm_gem_object *
-intel_fb_bo_lookup_valid_bo(struct drm_device *drm,
- struct drm_file *filp,
- const struct drm_mode_fb_cmd2 *user_mode_cmd);
-
-#endif
/* Copyright © 2024 Intel Corporation */
#include <drm/drm_panic.h>
+#include <drm/drm_print.h>
#include <drm/intel/display_parent_interface.h>
+#include "display/intel_fb.h"
#include "gem/i915_gem_mman.h"
#include "gem/i915_gem_object.h"
#include "gem/i915_gem_object_frontbuffer.h"
#include "i915_bo.h"
#include "i915_debugfs.h"
+#include "i915_drv.h"
static bool i915_bo_is_tiled(struct drm_gem_object *obj)
{
i915_debugfs_describe_obj(m, to_intel_bo(obj));
}
+static int i915_bo_framebuffer_init(struct drm_gem_object *_obj,
+ struct drm_mode_fb_cmd2 *mode_cmd)
+{
+ struct drm_i915_gem_object *obj = to_intel_bo(_obj);
+ struct drm_i915_private *i915 = to_i915(obj->base.dev);
+ unsigned int tiling, stride;
+
+ i915_gem_object_lock(obj, NULL);
+ tiling = i915_gem_object_get_tiling(obj);
+ stride = i915_gem_object_get_stride(obj);
+ i915_gem_object_unlock(obj);
+
+ if (mode_cmd->flags & DRM_MODE_FB_MODIFIERS) {
+ /*
+ * If there's a fence, enforce that
+ * the fb modifier and tiling mode match.
+ */
+ if (tiling != I915_TILING_NONE &&
+ tiling != intel_fb_modifier_to_tiling(mode_cmd->modifier[0])) {
+ drm_dbg_kms(&i915->drm,
+ "tiling_mode doesn't match fb modifier\n");
+ return -EINVAL;
+ }
+ } else {
+ if (tiling == I915_TILING_X) {
+ mode_cmd->modifier[0] = I915_FORMAT_MOD_X_TILED;
+ } else if (tiling == I915_TILING_Y) {
+ drm_dbg_kms(&i915->drm,
+ "No Y tiling for legacy addfb\n");
+ return -EINVAL;
+ }
+ }
+
+ /*
+ * gen2/3 display engine uses the fence if present,
+ * so the tiling mode must match the fb modifier exactly.
+ */
+ if (GRAPHICS_VER(i915) < 4 &&
+ tiling != intel_fb_modifier_to_tiling(mode_cmd->modifier[0])) {
+ drm_dbg_kms(&i915->drm,
+ "tiling_mode must match fb modifier exactly on gen2/3\n");
+ return -EINVAL;
+ }
+
+ /*
+ * If there's a fence, enforce that
+ * the fb pitch and fence stride match.
+ */
+ if (tiling != I915_TILING_NONE && mode_cmd->pitches[0] != stride) {
+ drm_dbg_kms(&i915->drm,
+ "pitch (%d) must match tiling stride (%d)\n",
+ mode_cmd->pitches[0], stride);
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static void i915_bo_framebuffer_fini(struct drm_gem_object *obj)
+{
+ /* Nothing to do for i915 */
+}
+
+static struct drm_gem_object *
+i915_bo_framebuffer_lookup(struct drm_device *drm,
+ struct drm_file *filp,
+ const struct drm_mode_fb_cmd2 *mode_cmd)
+{
+ struct drm_i915_private *i915 = to_i915(drm);
+ struct drm_i915_gem_object *obj;
+
+ obj = i915_gem_object_lookup(filp, mode_cmd->handles[0]);
+ if (!obj)
+ return ERR_PTR(-ENOENT);
+
+ /* object is backed with LMEM for discrete */
+ if (HAS_LMEM(i915) && !i915_gem_object_can_migrate(obj, INTEL_REGION_LMEM_0)) {
+ /* object is "remote", not in local memory */
+ i915_gem_object_put(obj);
+ drm_dbg_kms(&i915->drm, "framebuffer must reside in local memory\n");
+ return ERR_PTR(-EREMOTE);
+ }
+
+ return intel_bo_to_drm_bo(obj);
+}
+
const struct intel_display_bo_interface i915_display_bo_interface = {
.is_tiled = i915_bo_is_tiled,
.is_userptr = i915_bo_is_userptr,
.fb_mmap = i915_bo_fb_mmap,
.read_from_page = i915_bo_read_from_page,
.describe = i915_bo_describe,
+ .framebuffer_init = i915_bo_framebuffer_init,
+ .framebuffer_fini = i915_bo_framebuffer_fini,
+ .framebuffer_lookup = i915_bo_framebuffer_lookup,
};
# Display code specific to xe
xe-$(CONFIG_DRM_XE_DISPLAY) += \
- display/intel_fb_bo.o \
display/intel_fbdev_fb.o \
display/xe_display.o \
display/xe_display_bo.o \
+++ /dev/null
-/* SPDX-License-Identifier: MIT */
-/*
- * Copyright © 2021 Intel Corporation
- */
-
-#include <drm/drm_modeset_helper.h>
-#include <drm/ttm/ttm_bo.h>
-
-#include "intel_display_types.h"
-#include "intel_fb.h"
-#include "intel_fb_bo.h"
-#include "xe_bo.h"
-
-void intel_fb_bo_framebuffer_fini(struct drm_gem_object *obj)
-{
- struct xe_bo *bo = gem_to_xe_bo(obj);
-
- if (bo->flags & XE_BO_FLAG_PINNED) {
- /* Unpin our kernel fb first */
- xe_bo_lock(bo, false);
- xe_bo_unpin(bo);
- xe_bo_unlock(bo);
- }
- xe_bo_put(bo);
-}
-
-int intel_fb_bo_framebuffer_init(struct drm_gem_object *obj,
- struct drm_mode_fb_cmd2 *mode_cmd)
-{
- struct xe_bo *bo = gem_to_xe_bo(obj);
- struct xe_device *xe = to_xe_device(bo->ttm.base.dev);
- int ret;
-
- /*
- * Some modifiers require physical alignment of 64KiB VRAM pages;
- * require that the BO in those cases is created correctly.
- */
- if (XE_IOCTL_DBG(xe, intel_fb_needs_64k_phys(mode_cmd->modifier[0]) &&
- !(bo->flags & XE_BO_FLAG_NEEDS_64K)))
- return -EINVAL;
-
- xe_bo_get(bo);
-
- ret = ttm_bo_reserve(&bo->ttm, true, false, NULL);
- if (ret)
- goto err;
-
- if (!(bo->flags & XE_BO_FLAG_SCANOUT)) {
- /*
- * XE_BO_FLAG_SCANOUT should ideally be set at creation, or is
- * automatically set when creating FB. We cannot change caching
- * mode when the bo is VM_BINDed, so we can only set
- * coherency with display when unbound.
- */
- if (XE_IOCTL_DBG(xe, xe_bo_is_vm_bound(bo))) {
- ttm_bo_unreserve(&bo->ttm);
- ret = -EINVAL;
- goto err;
- }
- bo->flags |= XE_BO_FLAG_SCANOUT;
- }
- ttm_bo_unreserve(&bo->ttm);
- return 0;
-
-err:
- xe_bo_put(bo);
- return ret;
-}
-
-struct drm_gem_object *intel_fb_bo_lookup_valid_bo(struct drm_device *drm,
- struct drm_file *filp,
- const struct drm_mode_fb_cmd2 *mode_cmd)
-{
- struct xe_device *xe = to_xe_device(drm);
- struct xe_bo *bo;
- struct drm_gem_object *gem = drm_gem_object_lookup(filp, mode_cmd->handles[0]);
-
- if (!gem)
- return ERR_PTR(-ENOENT);
-
- bo = gem_to_xe_bo(gem);
- /* Require vram placement or dma-buf import */
- if (IS_DGFX(xe) &&
- !xe_bo_can_migrate(bo, XE_PL_VRAM0) &&
- bo->ttm.type != ttm_bo_type_sg) {
- drm_gem_object_put(gem);
- return ERR_PTR(-EREMOTE);
- }
-
- return gem;
-}
#include <drm/drm_gem.h>
#include <drm/intel/display_parent_interface.h>
+#include "intel_fb.h"
#include "xe_bo.h"
#include "xe_display_bo.h"
#include "xe_pxp.h"
return xe_bo_read(bo, offset, dst, size);
}
+static int xe_display_bo_framebuffer_init(struct drm_gem_object *obj,
+ struct drm_mode_fb_cmd2 *mode_cmd)
+{
+ struct xe_bo *bo = gem_to_xe_bo(obj);
+ struct xe_device *xe = to_xe_device(bo->ttm.base.dev);
+ int ret;
+
+ /*
+ * Some modifiers require physical alignment of 64KiB VRAM pages;
+ * require that the BO in those cases is created correctly.
+ */
+ if (XE_IOCTL_DBG(xe, intel_fb_needs_64k_phys(mode_cmd->modifier[0]) &&
+ !(bo->flags & XE_BO_FLAG_NEEDS_64K)))
+ return -EINVAL;
+
+ xe_bo_get(bo);
+
+ ret = ttm_bo_reserve(&bo->ttm, true, false, NULL);
+ if (ret)
+ goto err;
+
+ if (!(bo->flags & XE_BO_FLAG_SCANOUT)) {
+ /*
+ * XE_BO_FLAG_SCANOUT should ideally be set at creation, or is
+ * automatically set when creating FB. We cannot change caching
+ * mode when the bo is VM_BINDed, so we can only set
+ * coherency with display when unbound.
+ */
+ if (XE_IOCTL_DBG(xe, xe_bo_is_vm_bound(bo))) {
+ ttm_bo_unreserve(&bo->ttm);
+ ret = -EINVAL;
+ goto err;
+ }
+ bo->flags |= XE_BO_FLAG_SCANOUT;
+ }
+ ttm_bo_unreserve(&bo->ttm);
+ return 0;
+
+err:
+ xe_bo_put(bo);
+ return ret;
+}
+
+static void xe_display_bo_framebuffer_fini(struct drm_gem_object *obj)
+{
+ struct xe_bo *bo = gem_to_xe_bo(obj);
+
+ if (bo->flags & XE_BO_FLAG_PINNED) {
+ /* Unpin our kernel fb first */
+ xe_bo_lock(bo, false);
+ xe_bo_unpin(bo);
+ xe_bo_unlock(bo);
+ }
+ xe_bo_put(bo);
+}
+
+static struct drm_gem_object *
+xe_display_bo_framebuffer_lookup(struct drm_device *drm,
+ struct drm_file *filp,
+ const struct drm_mode_fb_cmd2 *mode_cmd)
+{
+ struct xe_device *xe = to_xe_device(drm);
+ struct xe_bo *bo;
+ struct drm_gem_object *gem = drm_gem_object_lookup(filp, mode_cmd->handles[0]);
+
+ if (!gem)
+ return ERR_PTR(-ENOENT);
+
+ bo = gem_to_xe_bo(gem);
+ /* Require vram placement or dma-buf import */
+ if (IS_DGFX(xe) &&
+ !xe_bo_can_migrate(bo, XE_PL_VRAM0) &&
+ bo->ttm.type != ttm_bo_type_sg) {
+ drm_gem_object_put(gem);
+ return ERR_PTR(-EREMOTE);
+ }
+
+ return gem;
+}
+
const struct intel_display_bo_interface xe_display_bo_interface = {
.is_protected = xe_display_bo_is_protected,
.key_check = xe_pxp_obj_key_check,
.fb_mmap = drm_gem_prime_mmap,
.read_from_page = xe_display_bo_read_from_page,
+ .framebuffer_init = xe_display_bo_framebuffer_init,
+ .framebuffer_fini = xe_display_bo_framebuffer_fini,
+ .framebuffer_lookup = xe_display_bo_framebuffer_lookup,
};
struct drm_file;
struct drm_framebuffer;
struct drm_gem_object;
+struct drm_mode_fb_cmd2;
struct drm_plane_state;
struct drm_scanout_buffer;
struct i915_vma;
int (*fb_mmap)(struct drm_gem_object *obj, struct vm_area_struct *vma);
int (*read_from_page)(struct drm_gem_object *obj, u64 offset, void *dst, int size);
void (*describe)(struct seq_file *m, struct drm_gem_object *obj); /* Optional */
+ int (*framebuffer_init)(struct drm_gem_object *obj, struct drm_mode_fb_cmd2 *mode_cmd);
+ void (*framebuffer_fini)(struct drm_gem_object *obj);
+ struct drm_gem_object *(*framebuffer_lookup)(struct drm_device *drm,
+ struct drm_file *filp,
+ const struct drm_mode_fb_cmd2 *user_mode_cmd);
};
struct intel_display_dpt_interface {
projects / thirdparty / kernel / linux.git / commitdiff
