Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2da83319 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Daniel Vetter
Browse files

drm/ttm: fix include notation and remove -Iinclude/drm flag 



For the C file, include <drm/*.h> instead of relative path from
include/drm.

For headers in include/drm/ttm, simplify the <tty/*.h> with "*.h".

This allows us to remove the -Iinclude/drm compiler flag from
drivers/gpu/drm/ttm/Makefile (and from other drivers' Makefiles).

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1493009447-31524-3-git-send-email-yamada.masahiro@socionext.com
parent e4e818cc

drivers/gpu/drm/ttm/Makefile

+0 −1
Original line number Diff line number Diff line 
#

# Makefile for the drm device driver.  This driver provides support for the



ccflags-y := -Iinclude/drm

ttm-y := ttm_memory.o ttm_tt.o ttm_bo.o \

	ttm_bo_util.o ttm_bo_vm.o ttm_module.o \

	ttm_object.o ttm_lock.o ttm_execbuf_util.o ttm_page_alloc.o \

drivers/gpu/drm/ttm/ttm_bo_vm.c

+3 −3
Original line number Diff line number Diff line
@@ -30,9 +30,9 @@ 


#define pr_fmt(fmt) "[TTM] " fmt



#include <ttm/ttm_module.h>

#include <ttm/ttm_bo_driver.h>

#include <ttm/ttm_placement.h>

#include <drm/ttm/ttm_module.h>

#include <drm/ttm/ttm_bo_driver.h>

#include <drm/ttm/ttm_placement.h>

#include <drm/drm_vma_manager.h>

#include <linux/mm.h>

#include <linux/pfn_t.h>

include/drm/ttm/ttm_bo_driver.h

+5 −4
Original line number Diff line number Diff line
@@ -30,10 +30,6 @@ 
#ifndef _TTM_BO_DRIVER_H_

#define _TTM_BO_DRIVER_H_



#include <ttm/ttm_bo_api.h>

#include <ttm/ttm_memory.h>

#include <ttm/ttm_module.h>

#include <ttm/ttm_placement.h>

#include <drm/drm_mm.h>

#include <drm/drm_global.h>

#include <drm/drm_vma_manager.h>
@@ -42,6 +38,11 @@ 
#include <linux/spinlock.h>

#include <linux/reservation.h>



#include "ttm_bo_api.h"

#include "ttm_memory.h"

#include "ttm_module.h"

#include "ttm_placement.h"



#define TTM_MAX_BO_PRIORITY	4U



struct ttm_backend_func {

include/drm/ttm/ttm_execbuf_util.h

+2 −1
Original line number Diff line number Diff line
@@ -31,9 +31,10 @@ 
#ifndef _TTM_EXECBUF_UTIL_H_

#define _TTM_EXECBUF_UTIL_H_



#include <ttm/ttm_bo_api.h>

#include <linux/list.h>



#include "ttm_bo_api.h"



/**

 * struct ttm_validate_buffer

 *

include/drm/ttm/ttm_lock.h

+2 −1
Original line number Diff line number Diff line
@@ -49,10 +49,11 @@ 
#ifndef _TTM_LOCK_H_

#define _TTM_LOCK_H_



#include <ttm/ttm_object.h>

#include <linux/wait.h>

#include <linux/atomic.h>



#include "ttm_object.h"



/**

 * struct ttm_lock

 *