Skip to contentSkip to conversation

drm/hisilicon/hibmc: Remove hibmc_ttm.c

PATCH In review Thomas Zimmermann 2 participants 4 messages Jan 13, 2021 – Jan 16, 2021

Subsystems (3)
lore
Share & tools
lore

Thomas Zimmermann

author maintainer
#0 lore raw

PATCH 1/1 drm/hisilicon/hibmc: Remove hibmc_ttm.c

The file is not in use. It got re-added by a rebased patch. Removing it.

Fixes 4d4dad21cc7b ("drm/hibmc: Remove references to struct drm_device.pdev")
Cc Sam Ravnborg <[email protected]>
Cc Xinliang Liu <[email protected]>
Cc Tian Tao <[email protected]>
Cc John Stultz <[email protected]>
Cc Xinwei Kong <[email protected]>
Cc Chen Feng <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Gong junjie <[email protected]>
---
 drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 61 ---------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c deleted +0 -61
deleted file mode 100644
index 77f075075db2..000000000000
@@ -1,61 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/* Hisilicon Hibmc SoC drm driver
- *
- * Based on the bochs drm driver.
- *
- * Copyright (c) 2016 Huawei Limited.
- *
- * Author:
- *	Rongrong Zou <[email protected]>
- *	Rongrong Zou <[email protected]>
- *	Jianhua Li <[email protected]>
- */
-
-#include <linux/pci.h>
-
-#include <drm/drm_atomic_helper.h>
-#include <drm/drm_gem.h>
-#include <drm/drm_gem_framebuffer_helper.h>
-#include <drm/drm_gem_vram_helper.h>
-#include <drm/drm_print.h>
-
-#include "hibmc_drm_drv.h"
-
-int hibmc_mm_init(struct hibmc_drm_private *hibmc)
-{
-	struct drm_vram_mm *vmm;
-	int ret;
-	struct drm_device *dev = hibmc->dev;
-	struct pci_dev *pdev = to_pci_dev(dev->dev);
-
-	vmm = drm_vram_helper_alloc_mm(dev, pci_resource_start(pdev, 0),
-				       hibmc->fb_size);
-	if (IS_ERR(vmm)) {
-		ret = PTR_ERR(vmm);
-		drm_err(dev, "Error initializing VRAM MM; %d\n", ret);
-		return ret;
-	}
-
-	return 0;
-}
-
-void hibmc_mm_fini(struct hibmc_drm_private *hibmc)
-{
-	if (!hibmc->dev->vram_mm)
-		return;
-
-	drm_vram_helper_release_mm(hibmc->dev);
-}
-
-int hibmc_dumb_create(struct drm_file *file, struct drm_device *dev,
-		      struct drm_mode_create_dumb *args)
-{
-	return drm_gem_vram_fill_create_dumb(file, dev, 0, 128, args);
-}
-
-const struct drm_mode_config_funcs hibmc_mode_funcs = {
-	.mode_valid = drm_vram_helper_mode_valid,
-	.atomic_check = drm_atomic_helper_check,
-	.atomic_commit = drm_atomic_helper_commit,
-	.fb_create = drm_gem_fb_create,
-};
Signature · 6 lines
2.29.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
author maintainer
#1 lore raw

ping for review

Am 13.01.21 um 12:31 schrieb Thomas Zimmermann:

Quoted 87 lines

The file is not in use. It got re-added by a rebased patch. Removing it.

Fixes 4d4dad21cc7b ("drm/hibmc: Remove references to struct drm_device.pdev")
Cc Sam Ravnborg <[email protected]>
Cc Xinliang Liu <[email protected]>
Cc Tian Tao <[email protected]>
Cc John Stultz <[email protected]>
Cc Xinwei Kong <[email protected]>
Cc Chen Feng <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Gong junjie <[email protected]>
---
  drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 61 ---------------------
  1 file changed, 61 deletions(-)

delete mode 100644 drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c

drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c deleted +0 -61
deleted file mode 100644
index 77f075075db2..000000000000
@@ -1,61 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/* Hisilicon Hibmc SoC drm driver
- *
- * Based on the bochs drm driver.
- *
- * Copyright (c) 2016 Huawei Limited.
- *
- * Author:
- *	Rongrong Zou <[email protected]>
- *	Rongrong Zou <[email protected]>
- *	Jianhua Li <[email protected]>
- */
-
-#include <linux/pci.h>
-
-#include <drm/drm_atomic_helper.h>
-#include <drm/drm_gem.h>
-#include <drm/drm_gem_framebuffer_helper.h>
-#include <drm/drm_gem_vram_helper.h>
-#include <drm/drm_print.h>
-
-#include "hibmc_drm_drv.h"
-
-int hibmc_mm_init(struct hibmc_drm_private *hibmc)
-{
-	struct drm_vram_mm *vmm;
-	int ret;
-	struct drm_device *dev = hibmc->dev;
-	struct pci_dev *pdev = to_pci_dev(dev->dev);
-
-	vmm = drm_vram_helper_alloc_mm(dev, pci_resource_start(pdev, 0),
-				       hibmc->fb_size);
-	if (IS_ERR(vmm)) {
-		ret = PTR_ERR(vmm);
-		drm_err(dev, "Error initializing VRAM MM; %d\n", ret);
-		return ret;
-	}
-
-	return 0;
-}
-
-void hibmc_mm_fini(struct hibmc_drm_private *hibmc)
-{
-	if (!hibmc->dev->vram_mm)
-		return;
-
-	drm_vram_helper_release_mm(hibmc->dev);
-}
-
-int hibmc_dumb_create(struct drm_file *file, struct drm_device *dev,
-		      struct drm_mode_create_dumb *args)
-{
-	return drm_gem_vram_fill_create_dumb(file, dev, 0, 128, args);
-}
-
-const struct drm_mode_config_funcs hibmc_mode_funcs = {
-	.mode_valid = drm_vram_helper_mode_valid,
-	.atomic_check = drm_atomic_helper_check,
-	.atomic_commit = drm_atomic_helper_commit,
-	.fb_create = drm_gem_fb_create,
-};
Signature · 6 lines
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#2 lore raw
Quoted 6 lines · Thomas Zimmermann

ping for review

Am 13.01.21 um 12:31 schrieb Thomas Zimmermann:

Quoted 3 lines

The file is not in use. It got re-added by a rebased patch. Removing it.

Reviewed-by Tian Tao <[email protected]>

Quoted 76 lines
Quoted 76 lines
Fixes 4d4dad21cc7b ("drm/hibmc: Remove references to struct drm_device.pdev")
Cc Sam Ravnborg <[email protected]>
Cc Xinliang Liu <[email protected]>
Cc Tian Tao  <[email protected]>
Cc John Stultz <[email protected]>
Cc Xinwei Kong <[email protected]>
Cc Chen Feng <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Gong junjie <[email protected]>

---
  drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 61 ---------------------

  1 file changed, 61 deletions(-)

  delete mode 100644 drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c

drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c deleted +0 -54
deleted file mode 100644
index 77f075075db2..000000000000
@@ -1,61 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/* Hisilicon Hibmc SoC drm driver
- *
- * Based on the bochs drm driver.
- *
- * Copyright (c) 2016 Huawei Limited.
- *
- * Author:
- *    Rongrong Zou <[email protected]>
- *    Rongrong Zou <[email protected]>
- *    Jianhua Li <[email protected]>
- */
-
-#include <linux/pci.h>
-
-#include <drm/drm_atomic_helper.h>
-#include <drm/drm_gem.h>
-#include <drm/drm_gem_framebuffer_helper.h>
-#include <drm/drm_gem_vram_helper.h>
-#include <drm/drm_print.h>
-
-#include "hibmc_drm_drv.h"
-
-int hibmc_mm_init(struct hibmc_drm_private *hibmc)
-{
-    struct drm_vram_mm *vmm;
-    int ret;
-    struct drm_device *dev = hibmc->dev;
-    struct pci_dev *pdev = to_pci_dev(dev->dev);
-
-    vmm = drm_vram_helper_alloc_mm(dev, pci_resource_start(pdev, 0),
-                       hibmc->fb_size);
-    if (IS_ERR(vmm)) {
-        ret = PTR_ERR(vmm);
-        drm_err(dev, "Error initializing VRAM MM; %d\n", ret);
-        return ret;
-    }
-
-    return 0;
-}
-
-void hibmc_mm_fini(struct hibmc_drm_private *hibmc)
-{
-    if (!hibmc->dev->vram_mm)
-        return;
-
-    drm_vram_helper_release_mm(hibmc->dev);
-}
-
-int hibmc_dumb_create(struct drm_file *file, struct drm_device *dev,
-              struct drm_mode_create_dumb *args)
-{
-    return drm_gem_vram_fill_create_dumb(file, dev, 0, 128, args);
-}
Quoted 9 lines

drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c line 61

Quoted 8 lines
drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c deleted +0 -7
-
-const struct drm_mode_config_funcs hibmc_mode_funcs = {
-    .mode_valid = drm_vram_helper_mode_valid,
-    .atomic_check = drm_atomic_helper_check,
-    .atomic_commit = drm_atomic_helper_commit,
-    .fb_create = drm_gem_fb_create,
-};

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

author maintainer
#3 lore raw

Hi

Am 15.01.21 um 09:50 schrieb tiantao (H):

Quoted 9 lines · Thomas Zimmermann
Quoted 6 lines

ping for review

Am 13.01.21 um 12:31 schrieb Thomas Zimmermann:

Quoted 3 lines

The file is not in use. It got re-added by a rebased patch. Removing it.

Reviewed-by Tian Tao <[email protected]>

Thanks a lot. Pushed to -misc-next.

Best regards
Thomas

Quoted 86 lines
Quoted 85 lines
Quoted 84 lines
Fixes 4d4dad21cc7b ("drm/hibmc: Remove references to struct drm_device.pdev")
Cc Sam Ravnborg <[email protected]>
Cc Xinliang Liu <[email protected]>
Cc Tian Tao  <[email protected]>
Cc John Stultz <[email protected]>
Cc Xinwei Kong <[email protected]>
Cc Chen Feng <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Gong junjie <[email protected]>

---
  drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 61 ---------------------

  1 file changed, 61 deletions(-)

  delete mode 100644 drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c

drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c deleted +0 -61
deleted file mode 100644
index 77f075075db2..000000000000
@@ -1,61 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/* Hisilicon Hibmc SoC drm driver
- *
- * Based on the bochs drm driver.
- *
- * Copyright (c) 2016 Huawei Limited.
- *
- * Author:
- *    Rongrong Zou <[email protected]>
- *    Rongrong Zou <[email protected]>
- *    Jianhua Li <[email protected]>
- */
-
-#include <linux/pci.h>
-
-#include <drm/drm_atomic_helper.h>
-#include <drm/drm_gem.h>
-#include <drm/drm_gem_framebuffer_helper.h>
-#include <drm/drm_gem_vram_helper.h>
-#include <drm/drm_print.h>
-
-#include "hibmc_drm_drv.h"
-
-int hibmc_mm_init(struct hibmc_drm_private *hibmc)
-{
-    struct drm_vram_mm *vmm;
-    int ret;
-    struct drm_device *dev = hibmc->dev;
-    struct pci_dev *pdev = to_pci_dev(dev->dev);
-
-    vmm = drm_vram_helper_alloc_mm(dev, pci_resource_start(pdev, 0),
-                       hibmc->fb_size);
-    if (IS_ERR(vmm)) {
-        ret = PTR_ERR(vmm);
-        drm_err(dev, "Error initializing VRAM MM; %d\n", ret);
-        return ret;
-    }
-
-    return 0;
-}
-
-void hibmc_mm_fini(struct hibmc_drm_private *hibmc)
-{
-    if (!hibmc->dev->vram_mm)
-        return;
-
-    drm_vram_helper_release_mm(hibmc->dev);
-}
-
-int hibmc_dumb_create(struct drm_file *file, struct drm_device *dev,
-              struct drm_mode_create_dumb *args)
-{
-    return drm_gem_vram_fill_create_dumb(file, dev, 0, 128, args);
-}
-
-const struct drm_mode_config_funcs hibmc_mode_funcs = {
-    .mode_valid = drm_vram_helper_mode_valid,
-    .atomic_check = drm_atomic_helper_check,
-    .atomic_commit = drm_atomic_helper_commit,
-    .fb_create = drm_gem_fb_create,
-};
Signature · 6 lines
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel