Commit c245cb9e authored by Michael Witten's avatar Michael Witten Committed by Dave Airlie
Browse files

DRM: bug: RADEON_DEBUGFS_MAX_{NUM_FILES => COMPONENTS} 



The value of RADEON_DEBUGFS_MAX_NUM_FILES has been used to
specify the size of an array, each element of which looks
like this:

  struct radeon_debugfs {
          struct drm_info_list    *files;
          unsigned                num_files;
  };

Consequently, the number of debugfs files may be much greater
than RADEON_DEBUGFS_MAX_NUM_FILES, something that the current
code ignores:

  if ((_radeon_debugfs_count + nfiles) > RADEON_DEBUGFS_MAX_NUM_FILES) {
          DRM_ERROR("Reached maximum number of debugfs files.\n");
          DRM_ERROR("Report so we increase RADEON_DEBUGFS_MAX_NUM_FILES.\n");
          return -EINVAL;
  }

This commit fixes this make, and accordingly renames:

  RADEON_DEBUGFS_MAX_NUM_FILES

to:

  RADEON_DEBUGFS_MAX_COMPONENTS

Signed-off-by: default avatarMichael Witten <mfwitten@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent d0d0a225

drivers/gpu/drm/radeon/radeon.h

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ extern int radeon_pcie_gen2; 
#define RADEON_FENCE_JIFFIES_TIMEOUT	(HZ / 2)

/* RADEON_IB_POOL_SIZE must be a power of 2 */

#define RADEON_IB_POOL_SIZE		16

#define RADEON_DEBUGFS_MAX_NUM_FILES	32

#define RADEON_DEBUGFS_MAX_COMPONENTS	32

#define RADEONFB_CONN_LIMIT		4

#define RADEON_BIOS_NUM_SCRATCH		8

drivers/gpu/drm/radeon/radeon_device.c

+8 −5
Original line number Diff line number Diff line
@@ -981,7 +981,7 @@ struct radeon_debugfs { 
	struct drm_info_list	*files;

	unsigned		num_files;

};

static struct radeon_debugfs _radeon_debugfs[RADEON_DEBUGFS_MAX_NUM_FILES];

static struct radeon_debugfs _radeon_debugfs[RADEON_DEBUGFS_MAX_COMPONENTS];

static unsigned _radeon_debugfs_count = 0;



int radeon_debugfs_add_files(struct radeon_device *rdev,
@@ -996,14 +996,17 @@ int radeon_debugfs_add_files(struct radeon_device *rdev, 
			return 0;

		}

	}

	if ((_radeon_debugfs_count + nfiles) > RADEON_DEBUGFS_MAX_NUM_FILES) {

		DRM_ERROR("Reached maximum number of debugfs files.\n");

		DRM_ERROR("Report so we increase RADEON_DEBUGFS_MAX_NUM_FILES.\n");



	i = _radeon_debugfs_count + 1;

	if (i > RADEON_DEBUGFS_MAX_COMPONENTS) {

		DRM_ERROR("Reached maximum number of debugfs components.\n");

		DRM_ERROR("Report so we increase "

		          "RADEON_DEBUGFS_MAX_COMPONENTS.\n");

		return -EINVAL;

	}

	_radeon_debugfs[_radeon_debugfs_count].files = files;

	_radeon_debugfs[_radeon_debugfs_count].num_files = nfiles;

	_radeon_debugfs_count++;

	_radeon_debugfs_count = i;

#if defined(CONFIG_DEBUG_FS)

	drm_debugfs_create_files(files, nfiles,

				 rdev->ddev->control->debugfs_root,

CRA Git | Maintained and supported by SUSTech CRA and CCSE