drm/vc4: fix include notation and remove -Iinclude/drm flag
Include <drm/*.h> instead of relative path from include/drm, then remove the -Iinclude/drm compiler flag. While we are here, use <...> instead of "..." for include/linux/*.h and include/sound/*.h headers too. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1495081793-9707-2-git-send-email-yamada.masahiro@socionext.com
This commit is contained in:
parent
141518d234
commit
b7e8e25b37
|
@ -1,5 +1,3 @@
|
||||||
ccflags-y := -Iinclude/drm
|
|
||||||
|
|
||||||
# Please keep these build lists sorted!
|
# Please keep these build lists sorted!
|
||||||
|
|
||||||
# core driver code
|
# core driver code
|
||||||
|
|
|
@ -32,13 +32,13 @@
|
||||||
* ones that set the clock.
|
* ones that set the clock.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "drm_atomic.h"
|
#include <drm/drm_atomic.h>
|
||||||
#include "drm_atomic_helper.h"
|
#include <drm/drm_atomic_helper.h>
|
||||||
#include "drm_crtc_helper.h"
|
#include <drm/drm_crtc_helper.h>
|
||||||
#include "linux/clk.h"
|
#include <linux/clk.h>
|
||||||
#include "drm_fb_cma_helper.h"
|
#include <drm/drm_fb_cma_helper.h>
|
||||||
#include "linux/component.h"
|
#include <linux/component.h>
|
||||||
#include "linux/of_device.h"
|
#include <linux/of_device.h>
|
||||||
#include "vc4_drv.h"
|
#include "vc4_drv.h"
|
||||||
#include "vc4_regs.h"
|
#include "vc4_regs.h"
|
||||||
|
|
||||||
|
|
|
@ -22,14 +22,14 @@
|
||||||
* ALT2 function.
|
* ALT2 function.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "drm_atomic_helper.h"
|
#include <drm/drm_atomic_helper.h>
|
||||||
#include "drm_crtc_helper.h"
|
#include <drm/drm_crtc_helper.h>
|
||||||
#include "drm_edid.h"
|
#include <drm/drm_edid.h>
|
||||||
#include "drm_panel.h"
|
#include <drm/drm_panel.h>
|
||||||
#include "linux/clk.h"
|
#include <linux/clk.h>
|
||||||
#include "linux/component.h"
|
#include <linux/component.h>
|
||||||
#include "linux/of_graph.h"
|
#include <linux/of_graph.h>
|
||||||
#include "linux/of_platform.h"
|
#include <linux/of_platform.h>
|
||||||
#include "vc4_drv.h"
|
#include "vc4_drv.h"
|
||||||
#include "vc4_regs.h"
|
#include "vc4_regs.h"
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
#include <linux/of_platform.h>
|
#include <linux/of_platform.h>
|
||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
#include <linux/pm_runtime.h>
|
#include <linux/pm_runtime.h>
|
||||||
#include "drm_fb_cma_helper.h"
|
#include <drm/drm_fb_cma_helper.h>
|
||||||
#include <drm/drm_fb_helper.h>
|
#include <drm/drm_fb_helper.h>
|
||||||
|
|
||||||
#include "uapi/drm/vc4_drm.h"
|
#include "uapi/drm/vc4_drm.h"
|
||||||
|
|
|
@ -6,12 +6,10 @@
|
||||||
* published by the Free Software Foundation.
|
* published by the Free Software Foundation.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "drmP.h"
|
|
||||||
#include "drm_gem_cma_helper.h"
|
|
||||||
#include "drm_gem_cma_helper.h"
|
|
||||||
|
|
||||||
#include <linux/reservation.h>
|
#include <linux/reservation.h>
|
||||||
|
#include <drm/drmP.h>
|
||||||
#include <drm/drm_encoder.h>
|
#include <drm/drm_encoder.h>
|
||||||
|
#include <drm/drm_gem_cma_helper.h>
|
||||||
|
|
||||||
struct vc4_dev {
|
struct vc4_dev {
|
||||||
struct drm_device *dev;
|
struct drm_device *dev;
|
||||||
|
|
|
@ -29,20 +29,20 @@
|
||||||
* hopefully present.
|
* hopefully present.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "drm_atomic_helper.h"
|
#include <drm/drm_atomic_helper.h>
|
||||||
#include "drm_crtc_helper.h"
|
#include <drm/drm_crtc_helper.h>
|
||||||
#include "drm_edid.h"
|
#include <drm/drm_edid.h>
|
||||||
#include "drm_mipi_dsi.h"
|
#include <drm/drm_mipi_dsi.h>
|
||||||
#include "drm_panel.h"
|
#include <drm/drm_panel.h>
|
||||||
#include "linux/clk.h"
|
#include <linux/clk.h>
|
||||||
#include "linux/clk-provider.h"
|
#include <linux/clk-provider.h>
|
||||||
#include "linux/completion.h"
|
#include <linux/completion.h>
|
||||||
#include "linux/component.h"
|
#include <linux/component.h>
|
||||||
#include "linux/dmaengine.h"
|
#include <linux/dmaengine.h>
|
||||||
#include "linux/i2c.h"
|
#include <linux/i2c.h>
|
||||||
#include "linux/of_address.h"
|
#include <linux/of_address.h>
|
||||||
#include "linux/of_platform.h"
|
#include <linux/of_platform.h>
|
||||||
#include "linux/pm_runtime.h"
|
#include <linux/pm_runtime.h>
|
||||||
#include "vc4_drv.h"
|
#include "vc4_drv.h"
|
||||||
#include "vc4_regs.h"
|
#include "vc4_regs.h"
|
||||||
|
|
||||||
|
|
|
@ -42,21 +42,21 @@
|
||||||
* encoder block has CEC support.
|
* encoder block has CEC support.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "drm_atomic_helper.h"
|
#include <drm/drm_atomic_helper.h>
|
||||||
#include "drm_crtc_helper.h"
|
#include <drm/drm_crtc_helper.h>
|
||||||
#include "drm_edid.h"
|
#include <drm/drm_edid.h>
|
||||||
#include "linux/clk.h"
|
#include <linux/clk.h>
|
||||||
#include "linux/component.h"
|
#include <linux/component.h>
|
||||||
#include "linux/i2c.h"
|
#include <linux/i2c.h>
|
||||||
#include "linux/of_address.h"
|
#include <linux/of_address.h>
|
||||||
#include "linux/of_gpio.h"
|
#include <linux/of_gpio.h>
|
||||||
#include "linux/of_platform.h"
|
#include <linux/of_platform.h>
|
||||||
#include "linux/pm_runtime.h"
|
#include <linux/pm_runtime.h>
|
||||||
#include "linux/rational.h"
|
#include <linux/rational.h>
|
||||||
#include "sound/dmaengine_pcm.h"
|
#include <sound/dmaengine_pcm.h>
|
||||||
#include "sound/pcm_drm_eld.h"
|
#include <sound/pcm_drm_eld.h>
|
||||||
#include "sound/pcm_params.h"
|
#include <sound/pcm_params.h>
|
||||||
#include "sound/soc.h"
|
#include <sound/soc.h>
|
||||||
#include "vc4_drv.h"
|
#include "vc4_drv.h"
|
||||||
#include "vc4_regs.h"
|
#include "vc4_regs.h"
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
* each CRTC.
|
* each CRTC.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "linux/component.h"
|
#include <linux/component.h>
|
||||||
#include "vc4_drv.h"
|
#include "vc4_drv.h"
|
||||||
#include "vc4_regs.h"
|
#include "vc4_regs.h"
|
||||||
|
|
||||||
|
|
|
@ -14,12 +14,12 @@
|
||||||
* crtc, HDMI encoder).
|
* crtc, HDMI encoder).
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "drm_crtc.h"
|
#include <drm/drm_crtc.h>
|
||||||
#include "drm_atomic.h"
|
#include <drm/drm_atomic.h>
|
||||||
#include "drm_atomic_helper.h"
|
#include <drm/drm_atomic_helper.h>
|
||||||
#include "drm_crtc_helper.h"
|
#include <drm/drm_crtc_helper.h>
|
||||||
#include "drm_plane_helper.h"
|
#include <drm/drm_plane_helper.h>
|
||||||
#include "drm_fb_cma_helper.h"
|
#include <drm/drm_fb_cma_helper.h>
|
||||||
#include "vc4_drv.h"
|
#include "vc4_drv.h"
|
||||||
|
|
||||||
static void vc4_output_poll_changed(struct drm_device *dev)
|
static void vc4_output_poll_changed(struct drm_device *dev)
|
||||||
|
|
|
@ -18,12 +18,13 @@
|
||||||
* into the region of the HVS that it has allocated for us.
|
* into the region of the HVS that it has allocated for us.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <drm/drm_atomic.h>
|
||||||
|
#include <drm/drm_atomic_helper.h>
|
||||||
|
#include <drm/drm_fb_cma_helper.h>
|
||||||
|
#include <drm/drm_plane_helper.h>
|
||||||
|
|
||||||
#include "vc4_drv.h"
|
#include "vc4_drv.h"
|
||||||
#include "vc4_regs.h"
|
#include "vc4_regs.h"
|
||||||
#include "drm_atomic.h"
|
|
||||||
#include "drm_atomic_helper.h"
|
|
||||||
#include "drm_fb_cma_helper.h"
|
|
||||||
#include "drm_plane_helper.h"
|
|
||||||
|
|
||||||
enum vc4_scaling_mode {
|
enum vc4_scaling_mode {
|
||||||
VC4_SCALING_NONE,
|
VC4_SCALING_NONE,
|
||||||
|
|
|
@ -16,9 +16,9 @@
|
||||||
* this program. If not, see <http://www.gnu.org/licenses/>.
|
* this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "linux/clk.h"
|
#include <linux/clk.h>
|
||||||
#include "linux/component.h"
|
#include <linux/component.h>
|
||||||
#include "linux/pm_runtime.h"
|
#include <linux/pm_runtime.h>
|
||||||
#include "vc4_drv.h"
|
#include "vc4_drv.h"
|
||||||
#include "vc4_regs.h"
|
#include "vc4_regs.h"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue