Commit 67e71a4b authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/display: add intel_bo_describe() and use it 



Add an interface based on struct drm_gem_object, and use it.

This lets us delete the compat i915_debugfs.h header.

Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Acked-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/66bcaaba9899a2bceb7ce4bd3be56ff60c5c9b09.1726589119.git.jani.nikula@intel.com
parent b0394008

drivers/gpu/drm/i915/display/intel_bo.c

+6 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include "gem/i915_gem_mman.h"

#include "gem/i915_gem_object.h"

#include "gem/i915_gem_object_frontbuffer.h"

#include "i915_debugfs.h"

#include "intel_bo.h"



bool intel_bo_is_tiled(struct drm_gem_object *obj)
@@ -51,3 +52,8 @@ struct intel_frontbuffer *intel_bo_set_frontbuffer(struct drm_gem_object *obj, 
{

	return i915_gem_object_set_frontbuffer(to_intel_bo(obj), front);

}



void intel_bo_describe(struct seq_file *m, struct drm_gem_object *obj)

{

	i915_debugfs_describe_obj(m, to_intel_bo(obj));

}

drivers/gpu/drm/i915/display/intel_bo.h

+3 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/types.h>



struct drm_gem_object;

struct seq_file;

struct vm_area_struct;



bool intel_bo_is_tiled(struct drm_gem_object *obj);
@@ -21,4 +22,6 @@ struct intel_frontbuffer *intel_bo_get_frontbuffer(struct drm_gem_object *obj); 
struct intel_frontbuffer *intel_bo_set_frontbuffer(struct drm_gem_object *obj,

						   struct intel_frontbuffer *front);



void intel_bo_describe(struct seq_file *m, struct drm_gem_object *obj);



#endif /* __INTEL_BO__ */

drivers/gpu/drm/i915/display/intel_display_debugfs.c

+3 −3
Original line number Diff line number Diff line
@@ -11,10 +11,10 @@ 
#include <drm/drm_fourcc.h>



#include "hsw_ips.h"

#include "i915_debugfs.h"

#include "i915_irq.h"

#include "i915_reg.h"

#include "intel_alpm.h"

#include "intel_bo.h"

#include "intel_crtc.h"

#include "intel_crtc_state_dump.h"

#include "intel_de.h"
@@ -125,7 +125,7 @@ static int i915_gem_framebuffer_info(struct seq_file *m, void *data) 
			   fbdev_fb->base.format->cpp[0] * 8,

			   fbdev_fb->base.modifier,

			   drm_framebuffer_read_refcount(&fbdev_fb->base));

		i915_debugfs_describe_obj(m, intel_fb_obj(&fbdev_fb->base));

		intel_bo_describe(m, intel_fb_bo(&fbdev_fb->base));

		seq_putc(m, '\n');

	}

#endif
@@ -143,7 +143,7 @@ static int i915_gem_framebuffer_info(struct seq_file *m, void *data) 
			   fb->base.format->cpp[0] * 8,

			   fb->base.modifier,

			   drm_framebuffer_read_refcount(&fb->base));

		i915_debugfs_describe_obj(m, intel_fb_obj(&fb->base));

		intel_bo_describe(m, intel_fb_bo(&fb->base));

		seq_putc(m, '\n');

	}

	mutex_unlock(&dev_priv->drm.mode_config.fb_lock);

drivers/gpu/drm/xe/compat-i915-headers/i915_debugfs.h

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: MIT */

/*

 * Copyright © 2023 Intel Corporation

 */



#ifndef __I915_DEBUGFS_H__

#define __I915_DEBUGFS_H__



struct drm_i915_gem_object;

struct seq_file;



static inline void i915_debugfs_describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) {}



#endif /* __I915_DEBUGFS_H__ */

drivers/gpu/drm/xe/display/intel_bo.c

+5 −0
Original line number Diff line number Diff line
@@ -77,3 +77,8 @@ struct intel_frontbuffer *intel_bo_set_frontbuffer(struct drm_gem_object *obj, 
{

	return front;

}



void intel_bo_describe(struct seq_file *m, struct drm_gem_object *obj)

{

	/* FIXME */

}