| Message ID | 20210209131756.24650-1-christian.koenig@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/ttm: fix removal of bo_count sysfs file | expand |
On Tue, Feb 9, 2021 at 2:18 PM Christian König <ckoenig.leichtzumerken@gmail.com> wrote: > > Only a zombie leftover from rebasing. > > Signed-off-by: Christian König <christian.koenig@amd.com> > Fixes: 3763d635deaa ("drm/ttm: add debugfs directory v2") My drm-misc-next still uses this in places, is this just fallout from the move of the sysfs files into vmwgfx? Your Fixes: line here confuses me a lot, and on the current baseline I don't think this applies ... -Daniel > --- > drivers/gpu/drm/ttm/ttm_device.c | 2 -- > include/drm/ttm/ttm_device.h | 1 - > 2 files changed, 3 deletions(-) > > diff --git a/drivers/gpu/drm/ttm/ttm_device.c b/drivers/gpu/drm/ttm/ttm_device.c > index ac0903c9e60a..8bb61dd26437 100644 > --- a/drivers/gpu/drm/ttm/ttm_device.c > +++ b/drivers/gpu/drm/ttm/ttm_device.c > @@ -49,8 +49,6 @@ static void ttm_global_release(void) > if (--ttm_glob_use_count > 0) > goto out; > > - kobject_del(&glob->kobj); > - kobject_put(&glob->kobj); > ttm_mem_global_release(&ttm_mem_glob); > __free_page(glob->dummy_read_page); > memset(glob, 0, sizeof(*glob)); > diff --git a/include/drm/ttm/ttm_device.h b/include/drm/ttm/ttm_device.h > index 7bc8bb797161..035bbc044a3b 100644 > --- a/include/drm/ttm/ttm_device.h > +++ b/include/drm/ttm/ttm_device.h > @@ -55,7 +55,6 @@ extern struct ttm_global { > * Constant after init. > */ > > - struct kobject kobj; > struct page *dummy_read_page; > spinlock_t lru_lock; > > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
Am 09.02.21 um 14:32 schrieb Daniel Vetter: > On Tue, Feb 9, 2021 at 2:18 PM Christian König > <ckoenig.leichtzumerken@gmail.com> wrote: >> Only a zombie leftover from rebasing. >> >> Signed-off-by: Christian König <christian.koenig@amd.com> >> Fixes: 3763d635deaa ("drm/ttm: add debugfs directory v2") > My drm-misc-next still uses this in places, Hui? Where? > is this just fallout from > the move of the sysfs files into vmwgfx? Your Fixes: line here > confuses me a lot, and on the current baseline I don't think this > applies ... As far as I can see this was just an error during rebasing. Commit 3763d635deaa ("drm/ttm: add debugfs directory v2") removed the kobj, but while rebasing the ttm_device rename I accidentally brought it back. Christian. > -Daniel > >> --- >> drivers/gpu/drm/ttm/ttm_device.c | 2 -- >> include/drm/ttm/ttm_device.h | 1 - >> 2 files changed, 3 deletions(-) >> >> diff --git a/drivers/gpu/drm/ttm/ttm_device.c b/drivers/gpu/drm/ttm/ttm_device.c >> index ac0903c9e60a..8bb61dd26437 100644 >> --- a/drivers/gpu/drm/ttm/ttm_device.c >> +++ b/drivers/gpu/drm/ttm/ttm_device.c >> @@ -49,8 +49,6 @@ static void ttm_global_release(void) >> if (--ttm_glob_use_count > 0) >> goto out; >> >> - kobject_del(&glob->kobj); >> - kobject_put(&glob->kobj); >> ttm_mem_global_release(&ttm_mem_glob); >> __free_page(glob->dummy_read_page); >> memset(glob, 0, sizeof(*glob)); >> diff --git a/include/drm/ttm/ttm_device.h b/include/drm/ttm/ttm_device.h >> index 7bc8bb797161..035bbc044a3b 100644 >> --- a/include/drm/ttm/ttm_device.h >> +++ b/include/drm/ttm/ttm_device.h >> @@ -55,7 +55,6 @@ extern struct ttm_global { >> * Constant after init. >> */ >> >> - struct kobject kobj; >> struct page *dummy_read_page; >> spinlock_t lru_lock; >> >> -- >> 2.25.1 >> >> _______________________________________________ >> dri-devel mailing list >> dri-devel@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/dri-devel > >
On Tue, Feb 9, 2021 at 2:34 PM Christian König <ckoenig.leichtzumerken@gmail.com> wrote: > > > > Am 09.02.21 um 14:32 schrieb Daniel Vetter: > > On Tue, Feb 9, 2021 at 2:18 PM Christian König > > <ckoenig.leichtzumerken@gmail.com> wrote: > >> Only a zombie leftover from rebasing. > >> > >> Signed-off-by: Christian König <christian.koenig@amd.com> > >> Fixes: 3763d635deaa ("drm/ttm: add debugfs directory v2") > > My drm-misc-next still uses this in places, > > Hui? Where? Duh, I mixed up ttm_mem_global with ttm_global and didn't fitler my grep output correctly ... > > > is this just fallout from > > the move of the sysfs files into vmwgfx? Your Fixes: line here > > confuses me a lot, and on the current baseline I don't think this > > applies ... > > As far as I can see this was just an error during rebasing. > > Commit 3763d635deaa ("drm/ttm: add debugfs directory v2") removed the > kobj, but while rebasing the ttm_device rename I accidentally brought it > back. Your patch is fine. Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > > Christian. > > > -Daniel > > > >> --- > >> drivers/gpu/drm/ttm/ttm_device.c | 2 -- > >> include/drm/ttm/ttm_device.h | 1 - > >> 2 files changed, 3 deletions(-) > >> > >> diff --git a/drivers/gpu/drm/ttm/ttm_device.c b/drivers/gpu/drm/ttm/ttm_device.c > >> index ac0903c9e60a..8bb61dd26437 100644 > >> --- a/drivers/gpu/drm/ttm/ttm_device.c > >> +++ b/drivers/gpu/drm/ttm/ttm_device.c > >> @@ -49,8 +49,6 @@ static void ttm_global_release(void) > >> if (--ttm_glob_use_count > 0) > >> goto out; > >> > >> - kobject_del(&glob->kobj); > >> - kobject_put(&glob->kobj); > >> ttm_mem_global_release(&ttm_mem_glob); > >> __free_page(glob->dummy_read_page); > >> memset(glob, 0, sizeof(*glob)); > >> diff --git a/include/drm/ttm/ttm_device.h b/include/drm/ttm/ttm_device.h > >> index 7bc8bb797161..035bbc044a3b 100644 > >> --- a/include/drm/ttm/ttm_device.h > >> +++ b/include/drm/ttm/ttm_device.h > >> @@ -55,7 +55,6 @@ extern struct ttm_global { > >> * Constant after init. > >> */ > >> > >> - struct kobject kobj; > >> struct page *dummy_read_page; > >> spinlock_t lru_lock; > >> > >> -- > >> 2.25.1 > >> > >> _______________________________________________ > >> dri-devel mailing list > >> dri-devel@lists.freedesktop.org > >> https://lists.freedesktop.org/mailman/listinfo/dri-devel > > > > >
Reviewed-by: Nirmoy Das<nirmoy.das@amd.com> On 2/9/21 2:17 PM, Christian König wrote: > Only a zombie leftover from rebasing. > > Signed-off-by: Christian König <christian.koenig@amd.com> > Fixes: 3763d635deaa ("drm/ttm: add debugfs directory v2") > --- > drivers/gpu/drm/ttm/ttm_device.c | 2 -- > include/drm/ttm/ttm_device.h | 1 - > 2 files changed, 3 deletions(-) > > diff --git a/drivers/gpu/drm/ttm/ttm_device.c b/drivers/gpu/drm/ttm/ttm_device.c > index ac0903c9e60a..8bb61dd26437 100644 > --- a/drivers/gpu/drm/ttm/ttm_device.c > +++ b/drivers/gpu/drm/ttm/ttm_device.c > @@ -49,8 +49,6 @@ static void ttm_global_release(void) > if (--ttm_glob_use_count > 0) > goto out; > > - kobject_del(&glob->kobj); > - kobject_put(&glob->kobj); > ttm_mem_global_release(&ttm_mem_glob); > __free_page(glob->dummy_read_page); > memset(glob, 0, sizeof(*glob)); > diff --git a/include/drm/ttm/ttm_device.h b/include/drm/ttm/ttm_device.h > index 7bc8bb797161..035bbc044a3b 100644 > --- a/include/drm/ttm/ttm_device.h > +++ b/include/drm/ttm/ttm_device.h > @@ -55,7 +55,6 @@ extern struct ttm_global { > * Constant after init. > */ > > - struct kobject kobj; > struct page *dummy_read_page; > spinlock_t lru_lock; >
diff --git a/drivers/gpu/drm/ttm/ttm_device.c b/drivers/gpu/drm/ttm/ttm_device.c index ac0903c9e60a..8bb61dd26437 100644 --- a/drivers/gpu/drm/ttm/ttm_device.c +++ b/drivers/gpu/drm/ttm/ttm_device.c @@ -49,8 +49,6 @@ static void ttm_global_release(void) if (--ttm_glob_use_count > 0) goto out; - kobject_del(&glob->kobj); - kobject_put(&glob->kobj); ttm_mem_global_release(&ttm_mem_glob); __free_page(glob->dummy_read_page); memset(glob, 0, sizeof(*glob)); diff --git a/include/drm/ttm/ttm_device.h b/include/drm/ttm/ttm_device.h index 7bc8bb797161..035bbc044a3b 100644 --- a/include/drm/ttm/ttm_device.h +++ b/include/drm/ttm/ttm_device.h @@ -55,7 +55,6 @@ extern struct ttm_global { * Constant after init. */ - struct kobject kobj; struct page *dummy_read_page; spinlock_t lru_lock;
Only a zombie leftover from rebasing. Signed-off-by: Christian König <christian.koenig@amd.com> Fixes: 3763d635deaa ("drm/ttm: add debugfs directory v2") --- drivers/gpu/drm/ttm/ttm_device.c | 2 -- include/drm/ttm/ttm_device.h | 1 - 2 files changed, 3 deletions(-)