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

Commit 72e4ee58 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm: fix compilation issues for "msm" on 4.9" into msm-4.8

parents 39f76f2c 04c7e8e4

drivers/gpu/drm/msm/Makefile

+5 −1
Original line number Original line Diff line number Diff line
@@ -62,6 +62,7 @@ msm_drm-$(CONFIG_DRM_MSM_MDP4) += mdp/mdp4/mdp4_crtc.o \ 
	mdp/mdp4/mdp4_lvds_connector.o \

	mdp/mdp4/mdp4_lvds_connector.o \

	mdp/mdp4/mdp4_irq.o \

	mdp/mdp4/mdp4_irq.o \

	mdp/mdp4/mdp4_kms.o \

	mdp/mdp4/mdp4_kms.o \

	mdp/mdp4/mdp4_dsi_encoder.o \

	mdp/mdp4/mdp4_plane.o

	mdp/mdp4/mdp4_plane.o





msm_drm-$(CONFIG_DRM_FBDEV_EMULATION) += msm_fbdev.o

msm_drm-$(CONFIG_DRM_FBDEV_EMULATION) += msm_fbdev.o
@@ -133,12 +134,15 @@ msm_drm-$(CONFIG_DRM_MSM) += \ 
	msm_gem.o \

	msm_gem.o \

	msm_gem_prime.o \

	msm_gem_prime.o \

	msm_gem_submit.o \

	msm_gem_submit.o \

	msm_gem_shrinker.o \

	msm_gpu.o \

	msm_gpu.o \

	msm_iommu.o \

	msm_iommu.o \

	msm_smmu.o \

	msm_smmu.o \

	msm_perf.o \

	msm_perf.o \

	msm_rd.o \

	msm_rd.o \

	msm_ringbuffer.o \

	msm_ringbuffer.o \

	msm_prop.o

	msm_prop.o \

	msm_fence.o \

	msm_debugfs.o





obj-$(CONFIG_DRM_MSM)	+= msm_drm.o
 
obj-$(CONFIG_DRM_MSM)	+= msm_drm.o

drivers/gpu/drm/msm/hdmi/hdmi_hdcp.c

+6 −6
Original line number Original line Diff line number Diff line 
/* Copyright (c) 2010-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2010-2017, The Linux Foundation. All rights reserved.

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * it under the terms of the GNU General Public License version 2 and
@@ -1438,24 +1438,24 @@ void msm_hdmi_hdcp_destroy(struct hdmi *hdmi) 
}

}





#else

#else

struct hdmi_hdcp_ctrl *hdmi_hdcp_ctrl_init(struct hdmi *hdmi)

struct hdmi_hdcp_ctrl *msm_hdmi_hdcp_init(struct hdmi *hdmi)

{

{

	return NULL;

	return NULL;

}

}





void hdmi_hdcp_ctrl_destroy(struct hdmi *hdmi)

void msm_hdmi_hdcp_destroy(struct hdmi *hdmi)

{

{

}

}





void hdmi_hdcp_ctrl_on(struct hdmi_hdcp_ctrl *hdcp_ctrl)

void msm_hdmi_hdcp_on(struct hdmi_hdcp_ctrl *hdcp_ctrl)

{

{

}

}





void hdmi_hdcp_ctrl_off(struct hdmi_hdcp_ctrl *hdcp_ctrl)

void msm_hdmi_hdcp_off(struct hdmi_hdcp_ctrl *hdcp_ctrl)

{

{

}

}





void hdmi_hdcp_ctrl_irq(struct hdmi_hdcp_ctrl *hdcp_ctrl)

void msm_hdmi_hdcp_irq(struct hdmi_hdcp_ctrl *hdcp_ctrl)

{

{

}

}

#endif
 
#endif

drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h

+11 −0
Original line number Original line Diff line number Diff line
@@ -200,8 +200,19 @@ struct drm_plane *mdp4_plane_init(struct drm_device *dev, 
		enum mdp4_pipe pipe_id, bool private_plane);

		enum mdp4_pipe pipe_id, bool private_plane);





uint32_t mdp4_crtc_vblank(struct drm_crtc *crtc);

uint32_t mdp4_crtc_vblank(struct drm_crtc *crtc);

#ifdef CONFIG_DRM_MSM_MDP4

void mdp4_crtc_set_config(struct drm_crtc *crtc, uint32_t config);

void mdp4_crtc_set_config(struct drm_crtc *crtc, uint32_t config);

void mdp4_crtc_set_intf(struct drm_crtc *crtc, enum mdp4_intf intf, int mixer);

void mdp4_crtc_set_intf(struct drm_crtc *crtc, enum mdp4_intf intf, int mixer);

#else

static inline void mdp4_crtc_set_config(struct drm_crtc *crtc, uint32_t config)

{

}



static inline void mdp4_crtc_set_intf(struct drm_crtc *crtc,

						enum mdp4_intf intf, int mixer)

{

}

#endif

void mdp4_crtc_wait_for_commit_done(struct drm_crtc *crtc);

void mdp4_crtc_wait_for_commit_done(struct drm_crtc *crtc);

struct drm_crtc *mdp4_crtc_init(struct drm_device *dev,

struct drm_crtc *mdp4_crtc_init(struct drm_device *dev,

		struct drm_plane *plane, int id, int ovlp_id,

		struct drm_plane *plane, int id, int ovlp_id,

drivers/gpu/drm/msm/msm_atomic.c

+5 −2
Original line number Original line Diff line number Diff line 
/*

/*

 * Copyright (c) 2016, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.

 * Copyright (C) 2014 Red Hat

 * Copyright (C) 2014 Red Hat

 * Author: Rob Clark <robdclark@gmail.com>

 * Author: Rob Clark <robdclark@gmail.com>

 *

 *
@@ -93,6 +93,8 @@ static void msm_atomic_wait_for_commit_done( 
	int i;

	int i;





	for_each_crtc_in_state(old_state, crtc, crtc_state, i) {

	for_each_crtc_in_state(old_state, crtc, crtc_state, i) {

		int private_flags;



		if (!crtc->state->enable)

		if (!crtc->state->enable)

			continue;

			continue;
@@ -133,7 +135,8 @@ msm_disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state) 
			continue;

			continue;





		crtc_idx = drm_crtc_index(old_conn_state->crtc);

		crtc_idx = drm_crtc_index(old_conn_state->crtc);

		old_crtc_state = old_state->crtc_states[crtc_idx];

		old_crtc_state = drm_atomic_get_existing_crtc_state(old_state,

						    old_conn_state->crtc);





		if (!old_crtc_state->active ||

		if (!old_crtc_state->active ||

		    !drm_atomic_crtc_needs_modeset(old_conn_state->crtc->state))

		    !drm_atomic_crtc_needs_modeset(old_conn_state->crtc->state))

drivers/gpu/drm/msm/msm_kms.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -106,6 +106,8 @@ static inline 
struct msm_kms *mdp4_kms_init(struct drm_device *dev) { return NULL; };

struct msm_kms *mdp4_kms_init(struct drm_device *dev) { return NULL; };

#endif

#endif

struct msm_kms *mdp5_kms_init(struct drm_device *dev);

struct msm_kms *mdp5_kms_init(struct drm_device *dev);

int msm_mdss_init(struct drm_device *dev);

void msm_mdss_destroy(struct drm_device *dev);

struct msm_kms *sde_kms_init(struct drm_device *dev);

struct msm_kms *sde_kms_init(struct drm_device *dev);





/**

/**