Message ID | 20200728045129.21065-1-airlied@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | drm/ttm: drop unusued function declaration | expand |
Am 28.07.20 um 06:51 schrieb Dave Airlie: > From: Dave Airlie <airlied@redhat.com> > > This was removed in > f5a9a9383f279de9da63296cb623a6418a66196b drm/ttm: remove TTM_MEMTYPE_FLAG_CMA > > but the the declaration was left dangling. > > Signed-off-by: Dave Airlie <airlied@redhat.com> Reviewed-by: Christian König <christian.koenig@amd.com> > --- > include/drm/ttm/ttm_bo_driver.h | 11 ----------- > 1 file changed, 11 deletions(-) > > diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h > index 71b195e78c7c..5a37f1cc057e 100644 > --- a/include/drm/ttm/ttm_bo_driver.h > +++ b/include/drm/ttm/ttm_bo_driver.h > @@ -525,17 +525,6 @@ ttm_flag_masked(uint32_t *old, uint32_t new, uint32_t mask) > * ttm_bo.c > */ > > -/** > - * ttm_mem_reg_is_pci > - * > - * @bdev: Pointer to a struct ttm_bo_device. > - * @mem: A valid struct ttm_mem_reg. > - * > - * Returns true if the memory described by @mem is PCI memory, > - * false otherwise. > - */ > -bool ttm_mem_reg_is_pci(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem); > - > /** > * ttm_bo_mem_space > *
On Tue, 28 Jul 2020 at 17:49, Christian König <christian.koenig@amd.com> wrote: > > Am 28.07.20 um 06:51 schrieb Dave Airlie: > > From: Dave Airlie <airlied@redhat.com> > > > > This was removed in > > f5a9a9383f279de9da63296cb623a6418a66196b drm/ttm: remove TTM_MEMTYPE_FLAG_CMA > > > > but the the declaration was left dangling. > > > > Signed-off-by: Dave Airlie <airlied@redhat.com> > > Reviewed-by: Christian König <christian.koenig@amd.com> I've just pushed this, the unbind and swapout all to drm-next. Though we should probably in future just have you merge them via misc. Dave.
diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h index 71b195e78c7c..5a37f1cc057e 100644 --- a/include/drm/ttm/ttm_bo_driver.h +++ b/include/drm/ttm/ttm_bo_driver.h @@ -525,17 +525,6 @@ ttm_flag_masked(uint32_t *old, uint32_t new, uint32_t mask) * ttm_bo.c */ -/** - * ttm_mem_reg_is_pci - * - * @bdev: Pointer to a struct ttm_bo_device. - * @mem: A valid struct ttm_mem_reg. - * - * Returns true if the memory described by @mem is PCI memory, - * false otherwise. - */ -bool ttm_mem_reg_is_pci(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem); - /** * ttm_bo_mem_space *