Commit 0005cbda authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

drm/via: drop use of drmP.h 



Drop use of the deprecated drmP.h header.
While touching the files divide include files in blocks
and sort the files alphabetically.

v2:
- Replace all uses of DRM_WAIT_ON() with VIA_WAIT_ON()
  and thus avoiding to pull in drm_os_linux.h

v3:
- DRM_WAIT_ON replacement moved to earlier patch (Emil)

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Reviewed-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Cc: Kevin Brace <kevinbrace@gmx.com>
Cc: Thomas Hellstrom <thellstrom@vmware.com>
Cc: "Gustavo A. R. Silva" <gustavo@embeddedor.com>
Cc: Mike Marshall <hubcap@omnibond.com>
Cc: Ira Weiny <ira.weiny@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Michel Dänzer <michel@daenzer.net>
Link: https://patchwork.freedesktop.org/patch/msgid/20190723200944.17285-5-sam@ravnborg.org
parent 2299b52d

drivers/gpu/drm/via/via_dma.c

+8 −1
Original line number Diff line number Diff line
@@ -34,8 +34,15 @@ 
 *    Thomas Hellstrom.

 */



#include <drm/drmP.h>

#include <linux/delay.h>

#include <linux/uaccess.h>



#include <drm/drm.h>

#include <drm/drm_agpsupport.h>

#include <drm/drm_device.h>

#include <drm/drm_file.h>

#include <drm/via_drm.h>



#include "via_drv.h"

#include "via_3d_reg.h"

drivers/gpu/drm/via/via_dmablit.c

+8 −5
Original line number Diff line number Diff line
@@ -34,13 +34,16 @@ 
 * the same DMA mappings?

 */



#include <drm/drmP.h>

#include <drm/via_drm.h>

#include "via_drv.h"

#include "via_dmablit.h"



#include <linux/pagemap.h>

#include <linux/slab.h>

#include <linux/vmalloc.h>



#include <drm/drm_device.h>

#include <drm/drm_pci.h>

#include <drm/via_drm.h>



#include "via_dmablit.h"

#include "via_drv.h"



#define VIA_PGDN(x)	     (((unsigned long)(x)) & PAGE_MASK)

#define VIA_PGOFF(x)	    (((unsigned long)(x)) & ~PAGE_MASK)

drivers/gpu/drm/via/via_drv.c

+5 −2
Original line number Diff line number Diff line
@@ -24,11 +24,14 @@ 


#include <linux/module.h>



#include <drm/drmP.h>

#include <drm/drm_drv.h>

#include <drm/drm_file.h>

#include <drm/drm_pci.h>

#include <drm/drm_pciids.h>

#include <drm/via_drm.h>



#include "via_drv.h"



#include <drm/drm_pciids.h>



static int via_driver_open(struct drm_device *dev, struct drm_file *file)

{

drivers/gpu/drm/via/via_irq.c

+3 −1
Original line number Diff line number Diff line
@@ -35,8 +35,10 @@ 
 * The refresh rate is also calculated for video playback sync purposes.

 */



#include <drm/drmP.h>

#include <drm/drm_device.h>

#include <drm/drm_vblank.h>

#include <drm/via_drm.h>



#include "via_drv.h"



#define VIA_REG_INTERRUPT       0x200

drivers/gpu/drm/via/via_map.c

+5 −1
Original line number Diff line number Diff line
@@ -21,8 +21,12 @@ 
 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

 * DEALINGS IN THE SOFTWARE.

 */

#include <drm/drmP.h>



#include <drm/drm_device.h>

#include <drm/drm_pci.h>

#include <drm/drm_vblank.h>

#include <drm/via_drm.h>



#include "via_drv.h"



static int via_do_init_map(struct drm_device *dev, drm_via_init_t *init)