Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e309a997 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: fix CRC debugfs setup 



We've set up all files, but removed only those for which we have a
pipe. Which leaves the one for pipe C on machines with less than 2
pipes, breaking module reload.

v2: We can't get at the drm device this early (wtf), so just register
all the files and also remove them all again.

Reviewed-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent bcf17ab2

drivers/gpu/drm/i915/i915_debugfs.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -2772,7 +2772,6 @@ int i915_debugfs_init(struct drm_minor *minor) 




void i915_debugfs_cleanup(struct drm_minor *minor)

void i915_debugfs_cleanup(struct drm_minor *minor)

{

{

	struct drm_device *dev = minor->dev;

	int i;

	int i;





	drm_debugfs_remove_files(i915_debugfs_list,

	drm_debugfs_remove_files(i915_debugfs_list,
@@ -2781,7 +2780,7 @@ void i915_debugfs_cleanup(struct drm_minor *minor) 
	drm_debugfs_remove_files((struct drm_info_list *) &i915_forcewake_fops,

	drm_debugfs_remove_files((struct drm_info_list *) &i915_forcewake_fops,

				 1, minor);

				 1, minor);





	for (i = 0; i < INTEL_INFO(dev)->num_pipes; i++) {

	for (i = 0; i < ARRAY_SIZE(i915_pipe_crc_data); i++) {

		struct drm_info_list *info_list =

		struct drm_info_list *info_list =

			(struct drm_info_list *)&i915_pipe_crc_data[i];

			(struct drm_info_list *)&i915_pipe_crc_data[i];