tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

drm/nouveau: rename nouveau_drm.h to nouveau_drv.h

Fixes out-of-tree build issue where uapi/drm/nouveau_drm.h gets picked
up instead.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

Ben Skeggs 4dc28134 7c10ddf8

+50 -49
+1 -1
drivers/gpu/drm/nouveau/dispnv04/arb.c
··· 23 23 24 24 #include <drm/drmP.h> 25 25 26 - #include "nouveau_drm.h" 26 + #include "nouveau_drv.h" 27 27 #include "nouveau_reg.h" 28 28 #include "hw.h" 29 29
+2 -1
drivers/gpu/drm/nouveau/dispnv04/crtc.c
··· 28 28 #include <drm/drm_crtc_helper.h> 29 29 #include <drm/drm_plane_helper.h> 30 30 31 - #include "nouveau_drm.h" 31 + #include "nouveau_drv.h" 32 32 #include "nouveau_reg.h" 33 + #include "nouveau_ttm.h" 33 34 #include "nouveau_bo.h" 34 35 #include "nouveau_gem.h" 35 36 #include "nouveau_encoder.h"
+1 -1
drivers/gpu/drm/nouveau/dispnv04/cursor.c
··· 1 1 #include <drm/drmP.h> 2 2 #include <drm/drm_mode.h> 3 - #include "nouveau_drm.h" 3 + #include "nouveau_drv.h" 4 4 #include "nouveau_reg.h" 5 5 #include "nouveau_crtc.h" 6 6 #include "hw.h"
+1 -1
drivers/gpu/drm/nouveau/dispnv04/dac.c
··· 27 27 #include <drm/drmP.h> 28 28 #include <drm/drm_crtc_helper.h> 29 29 30 - #include "nouveau_drm.h" 30 + #include "nouveau_drv.h" 31 31 #include "nouveau_encoder.h" 32 32 #include "nouveau_connector.h" 33 33 #include "nouveau_crtc.h"
+1 -1
drivers/gpu/drm/nouveau/dispnv04/dfp.c
··· 27 27 #include <drm/drmP.h> 28 28 #include <drm/drm_crtc_helper.h> 29 29 30 - #include "nouveau_drm.h" 30 + #include "nouveau_drv.h" 31 31 #include "nouveau_reg.h" 32 32 #include "nouveau_encoder.h" 33 33 #include "nouveau_connector.h"
+1 -1
drivers/gpu/drm/nouveau/dispnv04/disp.c
··· 25 25 #include <drm/drmP.h> 26 26 #include <drm/drm_crtc_helper.h> 27 27 28 - #include "nouveau_drm.h" 28 + #include "nouveau_drv.h" 29 29 #include "nouveau_reg.h" 30 30 #include "hw.h" 31 31 #include "nouveau_encoder.h"
+1 -1
drivers/gpu/drm/nouveau/dispnv04/disp.h
··· 1 1 #ifndef __NV04_DISPLAY_H__ 2 2 #define __NV04_DISPLAY_H__ 3 - 3 + #include <subdev/bios.h> 4 4 #include <subdev/bios/pll.h> 5 5 6 6 #include "nouveau_display.h"
+1 -1
drivers/gpu/drm/nouveau/dispnv04/hw.c
··· 23 23 */ 24 24 25 25 #include <drm/drmP.h> 26 - #include "nouveau_drm.h" 26 + #include "nouveau_drv.h" 27 27 #include "hw.h" 28 28 29 29 #include <subdev/bios/pll.h>
+1 -1
drivers/gpu/drm/nouveau/dispnv04/overlay.c
··· 27 27 #include <drm/drm_crtc.h> 28 28 #include <drm/drm_fourcc.h> 29 29 30 - #include "nouveau_drm.h" 30 + #include "nouveau_drv.h" 31 31 32 32 #include "nouveau_bo.h" 33 33 #include "nouveau_connector.h"
+1 -1
drivers/gpu/drm/nouveau/dispnv04/tvmodesnv17.c
··· 26 26 27 27 #include <drm/drmP.h> 28 28 #include <drm/drm_crtc_helper.h> 29 - #include "nouveau_drm.h" 29 + #include "nouveau_drv.h" 30 30 #include "nouveau_encoder.h" 31 31 #include "nouveau_crtc.h" 32 32 #include "hw.h"
+1 -1
drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
··· 25 25 */ 26 26 27 27 #include <drm/drmP.h> 28 - #include "nouveau_drm.h" 28 + #include "nouveau_drv.h" 29 29 #include "nouveau_reg.h" 30 30 #include "nouveau_encoder.h" 31 31 #include "nouveau_connector.h"
+1 -1
drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
··· 26 26 27 27 #include <drm/drmP.h> 28 28 #include <drm/drm_crtc_helper.h> 29 - #include "nouveau_drm.h" 29 + #include "nouveau_drv.h" 30 30 #include "nouveau_reg.h" 31 31 #include "nouveau_encoder.h" 32 32 #include "nouveau_connector.h"
+1 -1
drivers/gpu/drm/nouveau/nouveau_abi16.c
··· 29 29 #include <nvif/cla06f.h> 30 30 #include <nvif/unpack.h> 31 31 32 - #include "nouveau_drm.h" 32 + #include "nouveau_drv.h" 33 33 #include "nouveau_dma.h" 34 34 #include "nouveau_gem.h" 35 35 #include "nouveau_chan.h"
+1 -1
drivers/gpu/drm/nouveau/nouveau_acpi.c
··· 6 6 #include <drm/drm_edid.h> 7 7 #include <acpi/video.h> 8 8 9 - #include "nouveau_drm.h" 9 + #include "nouveau_drv.h" 10 10 #include "nouveau_acpi.h" 11 11 12 12 #define NOUVEAU_DSM_LED 0x02
+1 -1
drivers/gpu/drm/nouveau/nouveau_backlight.c
··· 32 32 33 33 #include <linux/backlight.h> 34 34 35 - #include "nouveau_drm.h" 35 + #include "nouveau_drv.h" 36 36 #include "nouveau_reg.h" 37 37 #include "nouveau_encoder.h" 38 38
+1 -1
drivers/gpu/drm/nouveau/nouveau_bios.c
··· 24 24 25 25 #include <drm/drmP.h> 26 26 27 - #include "nouveau_drm.h" 27 + #include "nouveau_drv.h" 28 28 #include "nouveau_reg.h" 29 29 #include "dispnv04/hw.h" 30 30 #include "nouveau_encoder.h"
+1 -1
drivers/gpu/drm/nouveau/nouveau_bo.c
··· 30 30 #include <linux/dma-mapping.h> 31 31 #include <linux/swiotlb.h> 32 32 33 - #include "nouveau_drm.h" 33 + #include "nouveau_drv.h" 34 34 #include "nouveau_dma.h" 35 35 #include "nouveau_fence.h" 36 36
+1 -1
drivers/gpu/drm/nouveau/nouveau_chan.c
··· 34 34 /*XXX*/ 35 35 #include <core/client.h> 36 36 37 - #include "nouveau_drm.h" 37 + #include "nouveau_drv.h" 38 38 #include "nouveau_dma.h" 39 39 #include "nouveau_bo.h" 40 40 #include "nouveau_chan.h"
+1 -1
drivers/gpu/drm/nouveau/nouveau_connector.c
··· 34 34 #include <drm/drm_crtc_helper.h> 35 35 36 36 #include "nouveau_reg.h" 37 - #include "nouveau_drm.h" 37 + #include "nouveau_drv.h" 38 38 #include "dispnv04/hw.h" 39 39 #include "nouveau_acpi.h" 40 40
+1 -1
drivers/gpu/drm/nouveau/nouveau_debugfs.c
··· 32 32 #include <nvif/class.h> 33 33 #include <nvif/if0001.h> 34 34 #include "nouveau_debugfs.h" 35 - #include "nouveau_drm.h" 35 + #include "nouveau_drv.h" 36 36 37 37 static int 38 38 nouveau_debugfs_vbios_image(struct seq_file *m, void *data)
+1 -1
drivers/gpu/drm/nouveau/nouveau_debugfs.h
··· 5 5 6 6 #if defined(CONFIG_DEBUG_FS) 7 7 8 - #include "nouveau_drm.h" 8 + #include "nouveau_drv.h" 9 9 10 10 struct nouveau_debugfs { 11 11 struct nvif_object ctrl;
+1 -1
drivers/gpu/drm/nouveau/nouveau_display.h
··· 3 3 4 4 #include <subdev/mmu.h> 5 5 6 - #include "nouveau_drm.h" 6 + #include "nouveau_drv.h" 7 7 8 8 struct nouveau_framebuffer { 9 9 struct drm_framebuffer base;
+1 -1
drivers/gpu/drm/nouveau/nouveau_dma.c
··· 24 24 * 25 25 */ 26 26 27 - #include "nouveau_drm.h" 27 + #include "nouveau_drv.h" 28 28 #include "nouveau_dma.h" 29 29 30 30 void
+1 -1
drivers/gpu/drm/nouveau/nouveau_dp.c
··· 25 25 #include <drm/drmP.h> 26 26 #include <drm/drm_dp_helper.h> 27 27 28 - #include "nouveau_drm.h" 28 + #include "nouveau_drv.h" 29 29 #include "nouveau_connector.h" 30 30 #include "nouveau_encoder.h" 31 31 #include "nouveau_crtc.h"
+1 -1
drivers/gpu/drm/nouveau/nouveau_drm.c
··· 44 44 #include <nvif/cla06f.h> 45 45 #include <nvif/if0004.h> 46 46 47 - #include "nouveau_drm.h" 47 + #include "nouveau_drv.h" 48 48 #include "nouveau_dma.h" 49 49 #include "nouveau_ttm.h" 50 50 #include "nouveau_gem.h"
+2 -2
drivers/gpu/drm/nouveau/nouveau_drm.h drivers/gpu/drm/nouveau/nouveau_drv.h
··· 1 - #ifndef __NOUVEAU_DRMCLI_H__ 2 - #define __NOUVEAU_DRMCLI_H__ 1 + #ifndef __NOUVEAU_DRV_H__ 2 + #define __NOUVEAU_DRV_H__ 3 3 4 4 #define DRIVER_AUTHOR "Nouveau Project" 5 5 #define DRIVER_EMAIL "nouveau@lists.freedesktop.org"
+1 -1
drivers/gpu/drm/nouveau/nouveau_fbcon.c
··· 43 43 #include <drm/drm_crtc_helper.h> 44 44 #include <drm/drm_fb_helper.h> 45 45 46 - #include "nouveau_drm.h" 46 + #include "nouveau_drv.h" 47 47 #include "nouveau_gem.h" 48 48 #include "nouveau_bo.h" 49 49 #include "nouveau_fbcon.h"
+1 -1
drivers/gpu/drm/nouveau/nouveau_fence.c
··· 34 34 #include <nvif/notify.h> 35 35 #include <nvif/event.h> 36 36 37 - #include "nouveau_drm.h" 37 + #include "nouveau_drv.h" 38 38 #include "nouveau_dma.h" 39 39 #include "nouveau_fence.h" 40 40
+1 -1
drivers/gpu/drm/nouveau/nouveau_gem.c
··· 24 24 * 25 25 */ 26 26 27 - #include "nouveau_drm.h" 27 + #include "nouveau_drv.h" 28 28 #include "nouveau_dma.h" 29 29 #include "nouveau_fence.h" 30 30 #include "nouveau_abi16.h"
+1 -1
drivers/gpu/drm/nouveau/nouveau_gem.h
··· 3 3 4 4 #include <drm/drmP.h> 5 5 6 - #include "nouveau_drm.h" 6 + #include "nouveau_drv.h" 7 7 #include "nouveau_bo.h" 8 8 9 9 #define nouveau_bo_tile_layout(nvbo) \
+1 -1
drivers/gpu/drm/nouveau/nouveau_hwmon.c
··· 31 31 32 32 #include <drm/drmP.h> 33 33 34 - #include "nouveau_drm.h" 34 + #include "nouveau_drv.h" 35 35 #include "nouveau_hwmon.h" 36 36 37 37 #include <nvkm/subdev/iccsense.h>
+1 -1
drivers/gpu/drm/nouveau/nouveau_nvif.c
··· 36 36 #include <nvif/event.h> 37 37 #include <nvif/ioctl.h> 38 38 39 - #include "nouveau_drm.h" 39 + #include "nouveau_drv.h" 40 40 #include "nouveau_usif.h" 41 41 42 42 static void
+1 -1
drivers/gpu/drm/nouveau/nouveau_platform.h
··· 21 21 */ 22 22 #ifndef __NOUVEAU_PLATFORM_H__ 23 23 #define __NOUVEAU_PLATFORM_H__ 24 - #include "nouveau_drm.h" 24 + #include "nouveau_drv.h" 25 25 26 26 extern struct platform_driver nouveau_platform_driver; 27 27 #endif
+1 -1
drivers/gpu/drm/nouveau/nouveau_prime.c
··· 25 25 #include <drm/drmP.h> 26 26 #include <linux/dma-buf.h> 27 27 28 - #include "nouveau_drm.h" 28 + #include "nouveau_drv.h" 29 29 #include "nouveau_gem.h" 30 30 31 31 struct sg_table *nouveau_gem_prime_get_sg_table(struct drm_gem_object *obj)
+1 -1
drivers/gpu/drm/nouveau/nouveau_sgdma.c
··· 1 1 #include <linux/pagemap.h> 2 2 #include <linux/slab.h> 3 3 4 - #include "nouveau_drm.h" 4 + #include "nouveau_drv.h" 5 5 #include "nouveau_ttm.h" 6 6 7 7 struct nouveau_sgdma_be {
+1 -1
drivers/gpu/drm/nouveau/nouveau_ttm.c
··· 24 24 * USE OR OTHER DEALINGS IN THE SOFTWARE. 25 25 */ 26 26 27 - #include "nouveau_drm.h" 27 + #include "nouveau_drv.h" 28 28 #include "nouveau_ttm.h" 29 29 #include "nouveau_gem.h" 30 30
+1 -1
drivers/gpu/drm/nouveau/nouveau_usif.c
··· 22 22 * Authors: Ben Skeggs <bskeggs@redhat.com> 23 23 */ 24 24 25 - #include "nouveau_drm.h" 25 + #include "nouveau_drv.h" 26 26 #include "nouveau_usif.h" 27 27 #include "nouveau_abi16.h" 28 28
+1 -1
drivers/gpu/drm/nouveau/nouveau_vga.c
··· 4 4 #include <drm/drmP.h> 5 5 #include <drm/drm_crtc_helper.h> 6 6 7 - #include "nouveau_drm.h" 7 + #include "nouveau_drv.h" 8 8 #include "nouveau_acpi.h" 9 9 #include "nouveau_fbcon.h" 10 10 #include "nouveau_vga.h"
+1 -1
drivers/gpu/drm/nouveau/nv04_fbcon.c
··· 22 22 * DEALINGS IN THE SOFTWARE. 23 23 */ 24 24 25 - #include "nouveau_drm.h" 25 + #include "nouveau_drv.h" 26 26 #include "nouveau_dma.h" 27 27 #include "nouveau_fbcon.h" 28 28
+1 -1
drivers/gpu/drm/nouveau/nv04_fence.c
··· 22 22 * Authors: Ben Skeggs 23 23 */ 24 24 25 - #include "nouveau_drm.h" 25 + #include "nouveau_drv.h" 26 26 #include "nouveau_dma.h" 27 27 #include "nouveau_fence.h" 28 28
+1 -1
drivers/gpu/drm/nouveau/nv10_fence.c
··· 22 22 * Authors: Ben Skeggs <bskeggs@redhat.com> 23 23 */ 24 24 25 - #include "nouveau_drm.h" 25 + #include "nouveau_drv.h" 26 26 #include "nouveau_dma.h" 27 27 #include "nv10_fence.h" 28 28
+1 -1
drivers/gpu/drm/nouveau/nv17_fence.c
··· 26 26 #include <nvif/class.h> 27 27 #include <nvif/cl0002.h> 28 28 29 - #include "nouveau_drm.h" 29 + #include "nouveau_drv.h" 30 30 #include "nouveau_dma.h" 31 31 #include "nv10_fence.h" 32 32
+1 -1
drivers/gpu/drm/nouveau/nv50_display.c
··· 39 39 #include <nvif/cl507d.h> 40 40 #include <nvif/cl507e.h> 41 41 42 - #include "nouveau_drm.h" 42 + #include "nouveau_drv.h" 43 43 #include "nouveau_dma.h" 44 44 #include "nouveau_gem.h" 45 45 #include "nouveau_connector.h"
+1 -1
drivers/gpu/drm/nouveau/nv50_fbcon.c
··· 22 22 * Authors: Ben Skeggs 23 23 */ 24 24 25 - #include "nouveau_drm.h" 25 + #include "nouveau_drv.h" 26 26 #include "nouveau_dma.h" 27 27 #include "nouveau_fbcon.h" 28 28
+1 -1
drivers/gpu/drm/nouveau/nv50_fence.c
··· 26 26 #include <nvif/class.h> 27 27 #include <nvif/cl0002.h> 28 28 29 - #include "nouveau_drm.h" 29 + #include "nouveau_drv.h" 30 30 #include "nouveau_dma.h" 31 31 #include "nv10_fence.h" 32 32
+1 -1
drivers/gpu/drm/nouveau/nv84_fence.c
··· 22 22 * Authors: Ben Skeggs 23 23 */ 24 24 25 - #include "nouveau_drm.h" 25 + #include "nouveau_drv.h" 26 26 #include "nouveau_dma.h" 27 27 #include "nouveau_fence.h" 28 28
+1 -1
drivers/gpu/drm/nouveau/nvc0_fbcon.c
··· 22 22 * Authors: Ben Skeggs 23 23 */ 24 24 25 - #include "nouveau_drm.h" 25 + #include "nouveau_drv.h" 26 26 #include "nouveau_dma.h" 27 27 #include "nouveau_fbcon.h" 28 28
+1 -1
drivers/gpu/drm/nouveau/nvc0_fence.c
··· 22 22 * Authors: Ben Skeggs 23 23 */ 24 24 25 - #include "nouveau_drm.h" 25 + #include "nouveau_drv.h" 26 26 #include "nouveau_dma.h" 27 27 #include "nouveau_fence.h" 28 28