renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 04:34:11 +08:00
Code

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

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

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2016-05-20 09:22:55 +10:00
parent 7c10ddf874
commit 4dc28134a8
48 changed files with 50 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/nouveau/dispnv04/arb.c
View File

@ -23,7 +23,7 @@
#include <drm/drmP.h>
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_reg.h"
#include "hw.h"

3
drivers/gpu/drm/nouveau/dispnv04/crtc.c
View File

@ -28,8 +28,9 @@
#include <drm/drm_crtc_helper.h>
#include <drm/drm_plane_helper.h>
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_reg.h"
#include "nouveau_ttm.h"
#include "nouveau_bo.h"
#include "nouveau_gem.h"
#include "nouveau_encoder.h"

2
drivers/gpu/drm/nouveau/dispnv04/cursor.c
View File

@ -1,6 +1,6 @@
#include <drm/drmP.h>
#include <drm/drm_mode.h>
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_reg.h"
#include "nouveau_crtc.h"
#include "hw.h"

2
drivers/gpu/drm/nouveau/dispnv04/dac.c
View File

@ -27,7 +27,7 @@
#include <drm/drmP.h>
#include <drm/drm_crtc_helper.h>
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_encoder.h"
#include "nouveau_connector.h"
#include "nouveau_crtc.h"

2
drivers/gpu/drm/nouveau/dispnv04/dfp.c
View File

@ -27,7 +27,7 @@
#include <drm/drmP.h>
#include <drm/drm_crtc_helper.h>
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_reg.h"
#include "nouveau_encoder.h"
#include "nouveau_connector.h"

2
drivers/gpu/drm/nouveau/dispnv04/disp.c
View File

@ -25,7 +25,7 @@
#include <drm/drmP.h>
#include <drm/drm_crtc_helper.h>
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_reg.h"
#include "hw.h"
#include "nouveau_encoder.h"

2
drivers/gpu/drm/nouveau/dispnv04/disp.h
View File

@ -1,6 +1,6 @@
#ifndef __NV04_DISPLAY_H__
#define __NV04_DISPLAY_H__
#include <subdev/bios.h>
#include <subdev/bios/pll.h>
#include "nouveau_display.h"

2
drivers/gpu/drm/nouveau/dispnv04/hw.c
View File

@ -23,7 +23,7 @@
*/
#include <drm/drmP.h>
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "hw.h"
#include <subdev/bios/pll.h>

2
drivers/gpu/drm/nouveau/dispnv04/overlay.c
View File

@ -27,7 +27,7 @@
#include <drm/drm_crtc.h>
#include <drm/drm_fourcc.h>
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_bo.h"
#include "nouveau_connector.h"

2
drivers/gpu/drm/nouveau/dispnv04/tvmodesnv17.c
View File

@ -26,7 +26,7 @@
#include <drm/drmP.h>
#include <drm/drm_crtc_helper.h>
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_encoder.h"
#include "nouveau_crtc.h"
#include "hw.h"

2
drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
View File

@ -25,7 +25,7 @@
*/
#include <drm/drmP.h>
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_reg.h"
#include "nouveau_encoder.h"
#include "nouveau_connector.h"

2
drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
View File

@ -26,7 +26,7 @@
#include <drm/drmP.h>
#include <drm/drm_crtc_helper.h>
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_reg.h"
#include "nouveau_encoder.h"
#include "nouveau_connector.h"

2
drivers/gpu/drm/nouveau/nouveau_abi16.c
View File

@ -29,7 +29,7 @@
#include <nvif/cla06f.h>
#include <nvif/unpack.h>
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_dma.h"
#include "nouveau_gem.h"
#include "nouveau_chan.h"

2
drivers/gpu/drm/nouveau/nouveau_acpi.c
View File

@ -6,7 +6,7 @@
#include <drm/drm_edid.h>
#include <acpi/video.h>
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_acpi.h"
#define NOUVEAU_DSM_LED 0x02

2
drivers/gpu/drm/nouveau/nouveau_backlight.c
View File

@ -32,7 +32,7 @@
#include <linux/backlight.h>
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_reg.h"
#include "nouveau_encoder.h"

2
drivers/gpu/drm/nouveau/nouveau_bios.c
View File

@ -24,7 +24,7 @@
#include <drm/drmP.h>
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_reg.h"
#include "dispnv04/hw.h"
#include "nouveau_encoder.h"

2
drivers/gpu/drm/nouveau/nouveau_bo.c
View File

@ -30,7 +30,7 @@
#include <linux/dma-mapping.h>
#include <linux/swiotlb.h>
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_dma.h"
#include "nouveau_fence.h"

2
drivers/gpu/drm/nouveau/nouveau_chan.c
View File

@ -34,7 +34,7 @@
/*XXX*/
#include <core/client.h>
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_dma.h"
#include "nouveau_bo.h"
#include "nouveau_chan.h"

2
drivers/gpu/drm/nouveau/nouveau_connector.c
View File

@ -34,7 +34,7 @@
#include <drm/drm_crtc_helper.h>
#include "nouveau_reg.h"
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "dispnv04/hw.h"
#include "nouveau_acpi.h"

2
drivers/gpu/drm/nouveau/nouveau_debugfs.c
View File

@ -32,7 +32,7 @@
#include <nvif/class.h>
#include <nvif/if0001.h>
#include "nouveau_debugfs.h"
#include "nouveau_drm.h"
#include "nouveau_drv.h"
static int
nouveau_debugfs_vbios_image(struct seq_file *m, void *data)

2
drivers/gpu/drm/nouveau/nouveau_debugfs.h
View File

@ -5,7 +5,7 @@
#if defined(CONFIG_DEBUG_FS)
#include "nouveau_drm.h"
#include "nouveau_drv.h"
struct nouveau_debugfs {
struct nvif_object ctrl;

2
drivers/gpu/drm/nouveau/nouveau_display.h
View File

@ -3,7 +3,7 @@
#include <subdev/mmu.h>
#include "nouveau_drm.h"
#include "nouveau_drv.h"
struct nouveau_framebuffer {
struct drm_framebuffer base;

2
drivers/gpu/drm/nouveau/nouveau_dma.c
View File

@ -24,7 +24,7 @@
*
*/
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_dma.h"
void

2
drivers/gpu/drm/nouveau/nouveau_dp.c
View File

@ -25,7 +25,7 @@
#include <drm/drmP.h>
#include <drm/drm_dp_helper.h>
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_connector.h"
#include "nouveau_encoder.h"
#include "nouveau_crtc.h"

2
drivers/gpu/drm/nouveau/nouveau_drm.c
View File

@ -44,7 +44,7 @@
#include <nvif/cla06f.h>
#include <nvif/if0004.h>
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_dma.h"
#include "nouveau_ttm.h"
#include "nouveau_gem.h"

4
drivers/gpu/drm/nouveau/nouveau_drm.h → drivers/gpu/drm/nouveau/nouveau_drv.h
View File

@ -1,5 +1,5 @@
#ifndef __NOUVEAU_DRMCLI_H__
#define __NOUVEAU_DRMCLI_H__
#ifndef __NOUVEAU_DRV_H__
#define __NOUVEAU_DRV_H__
#define DRIVER_AUTHOR "Nouveau Project"
#define DRIVER_EMAIL "nouveau@lists.freedesktop.org"

2
drivers/gpu/drm/nouveau/nouveau_fbcon.c
View File

@ -43,7 +43,7 @@
#include <drm/drm_crtc_helper.h>
#include <drm/drm_fb_helper.h>
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_gem.h"
#include "nouveau_bo.h"
#include "nouveau_fbcon.h"

2
drivers/gpu/drm/nouveau/nouveau_fence.c
View File

@ -34,7 +34,7 @@
#include <nvif/notify.h>
#include <nvif/event.h>
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_dma.h"
#include "nouveau_fence.h"

2
drivers/gpu/drm/nouveau/nouveau_gem.c
View File

@ -24,7 +24,7 @@
*
*/
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_dma.h"
#include "nouveau_fence.h"
#include "nouveau_abi16.h"

2
drivers/gpu/drm/nouveau/nouveau_gem.h
View File

@ -3,7 +3,7 @@
#include <drm/drmP.h>
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_bo.h"
#define nouveau_bo_tile_layout(nvbo) \

2
drivers/gpu/drm/nouveau/nouveau_hwmon.c
View File

@ -31,7 +31,7 @@
#include <drm/drmP.h>
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_hwmon.h"
#include <nvkm/subdev/iccsense.h>

2
drivers/gpu/drm/nouveau/nouveau_nvif.c
View File

@ -36,7 +36,7 @@
#include <nvif/event.h>
#include <nvif/ioctl.h>
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_usif.h"
static void

2
drivers/gpu/drm/nouveau/nouveau_platform.h
View File

@ -21,7 +21,7 @@
*/
#ifndef __NOUVEAU_PLATFORM_H__
#define __NOUVEAU_PLATFORM_H__
#include "nouveau_drm.h"
#include "nouveau_drv.h"
extern struct platform_driver nouveau_platform_driver;
#endif

2
drivers/gpu/drm/nouveau/nouveau_prime.c
View File

@ -25,7 +25,7 @@
#include <drm/drmP.h>
#include <linux/dma-buf.h>
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_gem.h"
struct sg_table *nouveau_gem_prime_get_sg_table(struct drm_gem_object *obj)

2
drivers/gpu/drm/nouveau/nouveau_sgdma.c
View File

@ -1,7 +1,7 @@
#include <linux/pagemap.h>
#include <linux/slab.h>
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_ttm.h"
struct nouveau_sgdma_be {

2
drivers/gpu/drm/nouveau/nouveau_ttm.c
View File

@ -24,7 +24,7 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_ttm.h"
#include "nouveau_gem.h"

2
drivers/gpu/drm/nouveau/nouveau_usif.c
View File

@ -22,7 +22,7 @@
* Authors: Ben Skeggs <bskeggs@redhat.com>
*/
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_usif.h"
#include "nouveau_abi16.h"

2
drivers/gpu/drm/nouveau/nouveau_vga.c
View File

@ -4,7 +4,7 @@
#include <drm/drmP.h>
#include <drm/drm_crtc_helper.h>
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_acpi.h"
#include "nouveau_fbcon.h"
#include "nouveau_vga.h"

2
drivers/gpu/drm/nouveau/nv04_fbcon.c
View File

@ -22,7 +22,7 @@
* DEALINGS IN THE SOFTWARE.
*/
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_dma.h"
#include "nouveau_fbcon.h"

2
drivers/gpu/drm/nouveau/nv04_fence.c
View File

@ -22,7 +22,7 @@
* Authors: Ben Skeggs
*/
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_dma.h"
#include "nouveau_fence.h"

2
drivers/gpu/drm/nouveau/nv10_fence.c
View File

@ -22,7 +22,7 @@
* Authors: Ben Skeggs <bskeggs@redhat.com>
*/
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_dma.h"
#include "nv10_fence.h"

2
drivers/gpu/drm/nouveau/nv17_fence.c
View File

@ -26,7 +26,7 @@
#include <nvif/class.h>
#include <nvif/cl0002.h>
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_dma.h"
#include "nv10_fence.h"

2
drivers/gpu/drm/nouveau/nv50_display.c
View File

@ -39,7 +39,7 @@
#include <nvif/cl507d.h>
#include <nvif/cl507e.h>
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_dma.h"
#include "nouveau_gem.h"
#include "nouveau_connector.h"

2
drivers/gpu/drm/nouveau/nv50_fbcon.c
View File

@ -22,7 +22,7 @@
* Authors: Ben Skeggs
*/
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_dma.h"
#include "nouveau_fbcon.h"

2
drivers/gpu/drm/nouveau/nv50_fence.c
View File

@ -26,7 +26,7 @@
#include <nvif/class.h>
#include <nvif/cl0002.h>
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_dma.h"
#include "nv10_fence.h"

2
drivers/gpu/drm/nouveau/nv84_fence.c
View File

@ -22,7 +22,7 @@
* Authors: Ben Skeggs
*/
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_dma.h"
#include "nouveau_fence.h"

2
drivers/gpu/drm/nouveau/nvc0_fbcon.c
View File

@ -22,7 +22,7 @@
* Authors: Ben Skeggs
*/
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_dma.h"
#include "nouveau_fbcon.h"

2
drivers/gpu/drm/nouveau/nvc0_fence.c
View File

@ -22,7 +22,7 @@
* Authors: Ben Skeggs
*/
#include "nouveau_drm.h"
#include "nouveau_drv.h"
#include "nouveau_dma.h"
#include "nouveau_fence.h"