From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ilija Hadzic Subject: Re: [PATCH] DRM: bug: RADEON_DEBUGFS_MAX_{NUM_FILES => COMPONENTS} Date: Mon, 24 Oct 2011 20:35:26 -0500 (CDT) Message-ID: References: <0fe01c9fdc43414da59dfc11820d8873-mfwitten@gmail.com> Mime-Version: 1.0 Content-Type: MULTIPART/MIXED; BOUNDARY="-559023410-851401618-1319506526=:5650" Return-path: Received: from ihemail2.lucent.com (ihemail2.lucent.com [135.245.0.35]) by gabe.freedesktop.org (Postfix) with ESMTP id 02F209EEDE for ; Mon, 24 Oct 2011 18:35:31 -0700 (PDT) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: Michael Witten Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. ---559023410-851401618-1319506526=:5650 Content-Type: TEXT/PLAIN; charset=utf-8; format=flowed Content-Transfer-Encoding: QUOTED-PRINTABLE Maybe you are looking at the wrong branch, but I see it in drm-next (it=20 has been there since Oct 10) http://cgit.freedesktop.org/~airlied/linux/commit/?h=3Ddrm-next&id=3Dc245cb= 9e15055ed5dcf7eaf29232badb0059fdc1 On Mon, 24 Oct 2011, Michael Witten wrote: > On Fri, Oct 7, 2011 at 19:20, Michael Witten wrote: > Date: Fri, 16 Sep 2011 20:45:30 +0000 > > 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: > > =C2=A0struct radeon_debugfs { > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0struct drm_info_list =C2=A0 =C2=A0*file= s; > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0unsigned =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0num_files; > =C2=A0}; > > Consequently, the number of debugfs files may be much greater > than RADEON_DEBUGFS_MAX_NUM_FILES, something that the current > code ignores: > > =C2=A0if ((_radeon_debugfs_count + nfiles) > RADEON_DEBUGFS_MAX_NUM_FILES= ) { > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0DRM_ERROR("Reached maximum number of de= bugfs files.\n"); > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0DRM_ERROR("Report so we increase RADEON= _DEBUGFS_MAX_NUM_FILES.\n"); > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return -EINVAL; > =C2=A0} > > This commit fixes this mistake, and accordingly renames: > > =C2=A0RADEON_DEBUGFS_MAX_NUM_FILES > > to: > > =C2=A0RADEON_DEBUGFS_MAX_COMPONENTS > > Signed-off-by: Michael Witten > --- > =C2=A0drivers/gpu/drm/radeon/radeon.h =C2=A0 =C2=A0 =C2=A0 =C2=A0| =C2=A0= =C2=A02 +- > =C2=A0drivers/gpu/drm/radeon/radeon_device.c | =C2=A0 13 ++++++++----- > =C2=A02 files changed, 9 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/rad= eon.h > index c1e056b..dd7bab9 100644 > --- a/drivers/gpu/drm/radeon/radeon.h > +++ b/drivers/gpu/drm/radeon/radeon.h > @@ -102,7 +102,7 @@ extern int radeon_pcie_gen2; > =C2=A0#define RADEON_FENCE_JIFFIES_TIMEOUT =C2=A0 (HZ / 2) > =C2=A0/* RADEON_IB_POOL_SIZE must be a power of 2 */ > =C2=A0#define RADEON_IB_POOL_SIZE =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A016 > -#define RADEON_DEBUGFS_MAX_NUM_FILES =C2=A0 32 > +#define RADEON_DEBUGFS_MAX_COMPONENTS =C2=A032 > =C2=A0#define RADEONFB_CONN_LIMIT =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A04 > =C2=A0#define RADEON_BIOS_NUM_SCRATCH =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A08 > > diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/rad= eon/radeon_device.c > index b51e157..31b1f4b 100644 > --- a/drivers/gpu/drm/radeon/radeon_device.c > +++ b/drivers/gpu/drm/radeon/radeon_device.c > @@ -981,7 +981,7 @@ struct radeon_debugfs { > =C2=A0 =C2=A0 =C2=A0 =C2=A0struct drm_info_list =C2=A0 =C2=A0*files; > =C2=A0 =C2=A0 =C2=A0 =C2=A0unsigned =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0num_files; > =C2=A0}; > -static struct radeon_debugfs _radeon_debugfs[RADEON_DEBUGFS_MAX_NUM_FILE= S]; > +static struct radeon_debugfs _radeon_debugfs[RADEON_DEBUGFS_MAX_COMPONEN= TS]; > =C2=A0static unsigned _radeon_debugfs_count =3D 0; > > =C2=A0int radeon_debugfs_add_files(struct radeon_device *rdev, > @@ -996,14 +996,17 @@ int radeon_debugfs_add_files(struct radeon_device *= rdev, > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0return 0; > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0} > =C2=A0 =C2=A0 =C2=A0 =C2=A0} > - =C2=A0 =C2=A0 =C2=A0 if ((_radeon_debugfs_count + nfiles) > RADEON_DEBU= GFS_MAX_NUM_FILES) { > - =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 DRM_ERROR("Reached max= imum number of debugfs files.\n"); > - =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 DRM_ERROR("Report so w= e increase RADEON_DEBUGFS_MAX_NUM_FILES.\n"); > + > + =C2=A0 =C2=A0 =C2=A0 i =3D _radeon_debugfs_count + 1; > + =C2=A0 =C2=A0 =C2=A0 if (i > RADEON_DEBUGFS_MAX_COMPONENTS) { > + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 DRM_ERROR("Reached max= imum number of debugfs components.\n"); > + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 DRM_ERROR("Report so w= e increase " > + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 "RADEON_DEBUGFS_MAX_COMPONENTS.\n"); > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return -EINVAL; > =C2=A0 =C2=A0 =C2=A0 =C2=A0} > =C2=A0 =C2=A0 =C2=A0 =C2=A0_radeon_debugfs[_radeon_debugfs_count].files = =3D files; > =C2=A0 =C2=A0 =C2=A0 =C2=A0_radeon_debugfs[_radeon_debugfs_count].num_fil= es =3D nfiles; > - =C2=A0 =C2=A0 =C2=A0 _radeon_debugfs_count++; > + =C2=A0 =C2=A0 =C2=A0 _radeon_debugfs_count =3D i; > =C2=A0#if defined(CONFIG_DEBUG_FS) > =C2=A0 =C2=A0 =C2=A0 =C2=A0drm_debugfs_create_files(files, nfiles, > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 rdev->ddev->control->debugfs_root, > -- > 1.7.6.409.ge7a85 > > This patch has not yet been applied. What's wrong? Sincerely, Michael Witten _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel ---559023410-851401618-1319506526=:5650 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel ---559023410-851401618-1319506526=:5650--