Commit c587cd6f authored by Sam Ravnborg's avatar Sam Ravnborg Committed by Ben Skeggs
Browse files

drm/nouveau: drop drmP.h from nouveau_drv.h 



Drop the deprecated drmP.h header from nouveau_drv.h.
Fix fallout in other parts of the driver.

Build tested using allmodconfig and allyesconfig.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: nouveau@lists.freedesktop.org
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 977b7e81

drivers/gpu/drm/nouveau/dispnv50/base507c.c

+2 −0
Original line number Diff line number Diff line
@@ -25,7 +25,9 @@ 
#include <nvif/event.h>



#include <drm/drm_atomic_helper.h>

#include <drm/drm_fourcc.h>

#include <drm/drm_plane_helper.h>



#include "nouveau_bo.h"



void

drivers/gpu/drm/nouveau/dispnv50/ovly507e.c

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include "atom.h"



#include <drm/drm_atomic_helper.h>

#include <drm/drm_fourcc.h>

#include <drm/drm_plane_helper.h>



#include <nvif/cl507e.h>

drivers/gpu/drm/nouveau/dispnv50/wndw.c

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
#include <nvif/cl0002.h>



#include <drm/drm_atomic_helper.h>

#include <drm/drm_fourcc.h>



#include "nouveau_bo.h"



static void

drivers/gpu/drm/nouveau/nouveau_display.h

+4 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: MIT */

#ifndef __NOUVEAU_DISPLAY_H__

#define __NOUVEAU_DISPLAY_H__



#include "nouveau_drv.h"



#include <nvif/disp.h>



#include <drm/drm_framebuffer.h>



struct nouveau_framebuffer {

	struct drm_framebuffer base;

	struct nouveau_bo *nvbo;

drivers/gpu/drm/nouveau/nouveau_drv.h

+4 −1
Original line number Diff line number Diff line
@@ -46,7 +46,10 @@ 
#include <nvif/mmu.h>

#include <nvif/vmm.h>



#include <drm/drmP.h>

#include <drm/drm_connector.h>

#include <drm/drm_device.h>

#include <drm/drm_drv.h>

#include <drm/drm_file.h>



#include <drm/ttm/ttm_bo_api.h>

#include <drm/ttm/ttm_bo_driver.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE