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

Commit 9338203c authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Archit Taneja
Browse files

drm: Don't include <drm/drm_encoder.h> in <drm/drm_crtc.h> 



<drm/drm_crtc.h> used to define most of the in-kernel KMS API. It has
now been split into separate files for each object type, but still
includes most other KMS headers to avoid breaking driver compilation.

As a step towards fixing that problem, remove the inclusion of
<drm/drm_encoder.h> from <drm/drm_crtc.h> and include it instead where
appropriate. Also remove the forward declarations of the drm_encoder and
drm_encoder_helper_funcs structures from <drm/drm_crtc.h> as they're not
needed in the header.

<drm/drm_encoder.h> now has to include <drm/drm_mode.h> and contain a
forward declaration of struct drm_encoder in order to allow including it
as the first header in a compilation unit.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Sinclair Yeh <syeh@vmware.com> # For vmwgfx
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarArchit Taneja <architt@codeaurora.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1481709550-29226-2-git-send-email-laurent.pinchart+renesas@ideasonboard.com
parent b44f97fd

drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 


#include <drm/drm_crtc.h>

#include <drm/drm_edid.h>

#include <drm/drm_encoder.h>

#include <drm/drm_dp_helper.h>

#include <drm/drm_fixed.h>

#include <drm/drm_crtc_helper.h>

drivers/gpu/drm/ast/ast_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#ifndef __AST_DRV_H__

#define __AST_DRV_H__



#include <drm/drm_encoder.h>

#include <drm/drm_fb_helper.h>



#include <drm/ttm/ttm_bo_api.h>

drivers/gpu/drm/bochs/bochs.h

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <drm/drmP.h>

#include <drm/drm_crtc.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_encoder.h>

#include <drm/drm_fb_helper.h>



#include <drm/drm_gem.h>

drivers/gpu/drm/cirrus/cirrus_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


#include <video/vga.h>



#include <drm/drm_encoder.h>

#include <drm/drm_fb_helper.h>



#include <drm/ttm/ttm_bo_api.h>

drivers/gpu/drm/drm_connector.c

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <drm/drmP.h>

#include <drm/drm_connector.h>

#include <drm/drm_edid.h>

#include <drm/drm_encoder.h>



#include "drm_crtc_internal.h"

#include "drm_internal.h"