diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-01-31 17:31:09 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-01-31 17:31:09 -0500 |
| commit | 012bbe28c0e3a479ec7ba6f311710cf8409647d4 (patch) | |
| tree | 9cfe299e0cfa72a078faa73d5c0a9263d2ebe8a2 /drivers/gpu/drm/amd/amdgpu | |
| parent | bb7e98334157de206d7b1283377fdb4ea9e2e8c6 (diff) | |
| parent | 55d6616585363ff2aa9430bfe1ff1345bdc0599a (diff) | |
Merge tag 'drm-misc-next-2017-01-30' of git://anongit.freedesktop.org/git/drm-misc into drm-next
Another round of -misc stuff:
- Noralf debugfs cleanup cleanup (not yet everything, some more driver
patches awaiting acks).
- More doc work.
- edid/infoframe fixes from Ville.
- misc 1-patch fixes all over, as usual
Noralf needs this for his tinydrm pull request.
* tag 'drm-misc-next-2017-01-30' of git://anongit.freedesktop.org/git/drm-misc: (48 commits)
drm/vc4: Remove vc4_debugfs_cleanup()
dma/fence: Export enable-signaling tracepoint for emission by drivers
drm/tilcdc: Remove tilcdc_debugfs_cleanup()
drm/tegra: Remove tegra_debugfs_cleanup()
drm/sti: Remove drm_debugfs_remove_files() calls
drm/radeon: Remove drm_debugfs_remove_files() call
drm/omap: Remove omap_debugfs_cleanup()
drm/hdlcd: Remove hdlcd_debugfs_cleanup()
drm/etnaviv: Remove etnaviv_debugfs_cleanup()
drm/etnaviv: allow build with COMPILE_TEST
drm/amd/amdgpu: Remove drm_debugfs_remove_files() call
drm/prime: Clarify DMA-BUF/GEM Object lifetime
drm/ttm: Make sure BOs being swapped out are cacheable
drm/atomic: Remove drm_atomic_debugfs_cleanup()
drm: drm_minor_register(): Clean up debugfs on failure
drm: debugfs: Remove all files automatically on cleanup
drm/fourcc: add vivante tiled layout format modifiers
drm/edid: Set YQ bits in the AVI infoframe according to CEA-861-F
drm/edid: Set AVI infoframe Q even when QS=0
drm/edid: Introduce drm_hdmi_avi_infoframe_quant_range()
...
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 20 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 |
3 files changed, 0 insertions, 23 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index f4f371fbce16..73863d465f98 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
| @@ -1133,7 +1133,6 @@ int amdgpu_debugfs_fence_init(struct amdgpu_device *adev); | |||
| 1133 | 1133 | ||
| 1134 | #if defined(CONFIG_DEBUG_FS) | 1134 | #if defined(CONFIG_DEBUG_FS) |
| 1135 | int amdgpu_debugfs_init(struct drm_minor *minor); | 1135 | int amdgpu_debugfs_init(struct drm_minor *minor); |
| 1136 | void amdgpu_debugfs_cleanup(struct drm_minor *minor); | ||
| 1137 | #endif | 1136 | #endif |
| 1138 | 1137 | ||
| 1139 | int amdgpu_debugfs_firmware_init(struct amdgpu_device *adev); | 1138 | int amdgpu_debugfs_firmware_init(struct amdgpu_device *adev); |
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index fe3bb94fe58d..2201303b9262 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |||
| @@ -1852,8 +1852,6 @@ failed: | |||
| 1852 | return r; | 1852 | return r; |
| 1853 | } | 1853 | } |
| 1854 | 1854 | ||
| 1855 | static void amdgpu_debugfs_remove_files(struct amdgpu_device *adev); | ||
| 1856 | |||
| 1857 | /** | 1855 | /** |
| 1858 | * amdgpu_device_fini - tear down the driver | 1856 | * amdgpu_device_fini - tear down the driver |
| 1859 | * | 1857 | * |
| @@ -1893,7 +1891,6 @@ void amdgpu_device_fini(struct amdgpu_device *adev) | |||
| 1893 | if (adev->asic_type >= CHIP_BONAIRE) | 1891 | if (adev->asic_type >= CHIP_BONAIRE) |
| 1894 | amdgpu_doorbell_fini(adev); | 1892 | amdgpu_doorbell_fini(adev); |
| 1895 | amdgpu_debugfs_regs_cleanup(adev); | 1893 | amdgpu_debugfs_regs_cleanup(adev); |
| 1896 | amdgpu_debugfs_remove_files(adev); | ||
| 1897 | } | 1894 | } |
| 1898 | 1895 | ||
| 1899 | 1896 | ||
| @@ -2507,19 +2504,6 @@ int amdgpu_debugfs_add_files(struct amdgpu_device *adev, | |||
| 2507 | return 0; | 2504 | return 0; |
| 2508 | } | 2505 | } |
| 2509 | 2506 | ||
| 2510 | static void amdgpu_debugfs_remove_files(struct amdgpu_device *adev) | ||
| 2511 | { | ||
| 2512 | #if defined(CONFIG_DEBUG_FS) | ||
| 2513 | unsigned i; | ||
| 2514 | |||
| 2515 | for (i = 0; i < adev->debugfs_count; i++) { | ||
| 2516 | drm_debugfs_remove_files(adev->debugfs[i].files, | ||
| 2517 | adev->debugfs[i].num_files, | ||
| 2518 | adev->ddev->primary); | ||
| 2519 | } | ||
| 2520 | #endif | ||
| 2521 | } | ||
| 2522 | |||
| 2523 | #if defined(CONFIG_DEBUG_FS) | 2507 | #if defined(CONFIG_DEBUG_FS) |
| 2524 | 2508 | ||
| 2525 | static ssize_t amdgpu_debugfs_regs_read(struct file *f, char __user *buf, | 2509 | static ssize_t amdgpu_debugfs_regs_read(struct file *f, char __user *buf, |
| @@ -3153,10 +3137,6 @@ int amdgpu_debugfs_init(struct drm_minor *minor) | |||
| 3153 | { | 3137 | { |
| 3154 | return 0; | 3138 | return 0; |
| 3155 | } | 3139 | } |
| 3156 | |||
| 3157 | void amdgpu_debugfs_cleanup(struct drm_minor *minor) | ||
| 3158 | { | ||
| 3159 | } | ||
| 3160 | #else | 3140 | #else |
| 3161 | static int amdgpu_debugfs_regs_init(struct amdgpu_device *adev) | 3141 | static int amdgpu_debugfs_regs_init(struct amdgpu_device *adev) |
| 3162 | { | 3142 | { |
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index 2534adaebe30..ba2816b3cd07 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | |||
| @@ -686,7 +686,6 @@ static struct drm_driver kms_driver = { | |||
| 686 | DRIVER_USE_AGP | | 686 | DRIVER_USE_AGP | |
| 687 | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM | | 687 | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM | |
| 688 | DRIVER_PRIME | DRIVER_RENDER | DRIVER_MODESET, | 688 | DRIVER_PRIME | DRIVER_RENDER | DRIVER_MODESET, |
| 689 | .dev_priv_size = 0, | ||
| 690 | .load = amdgpu_driver_load_kms, | 689 | .load = amdgpu_driver_load_kms, |
| 691 | .open = amdgpu_driver_open_kms, | 690 | .open = amdgpu_driver_open_kms, |
| 692 | .preclose = amdgpu_driver_preclose_kms, | 691 | .preclose = amdgpu_driver_preclose_kms, |
| @@ -701,7 +700,6 @@ static struct drm_driver kms_driver = { | |||
| 701 | .get_scanout_position = amdgpu_get_crtc_scanoutpos, | 700 | .get_scanout_position = amdgpu_get_crtc_scanoutpos, |
| 702 | #if defined(CONFIG_DEBUG_FS) | 701 | #if defined(CONFIG_DEBUG_FS) |
| 703 | .debugfs_init = amdgpu_debugfs_init, | 702 | .debugfs_init = amdgpu_debugfs_init, |
| 704 | .debugfs_cleanup = amdgpu_debugfs_cleanup, | ||
| 705 | #endif | 703 | #endif |
| 706 | .irq_preinstall = amdgpu_irq_preinstall, | 704 | .irq_preinstall = amdgpu_irq_preinstall, |
| 707 | .irq_postinstall = amdgpu_irq_postinstall, | 705 | .irq_postinstall = amdgpu_irq_postinstall, |
