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

Commit 6fe8bff4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/sde: allow writeback to support null fb"

parents 9857fc9b 4212dd40

drivers/gpu/drm/msm/dp/dp_drm.c

+1 −1
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ int dp_connector_post_init(struct drm_connector *connector, 
}



int dp_connector_get_mode_info(const struct drm_display_mode *drm_mode,

	struct msm_mode_info *mode_info, u32 max_mixer_width)

	struct msm_mode_info *mode_info, u32 max_mixer_width, void *display)

{

	const u32 dual_lm = 2;

	const u32 single_lm = 1;

drivers/gpu/drm/msm/dp/dp_drm.h

+2 −1
Original line number Diff line number Diff line
@@ -78,11 +78,12 @@ enum drm_mode_status dp_connector_mode_valid(struct drm_connector *connector, 
 * @drm_mode: Display mode set for the display

 * @mode_info: Out parameter. Information of the mode

 * @max_mixer_width: max width supported by HW layer mixer

 * @display: Pointer to private display structure

 * Returns: zero on success

 */

int dp_connector_get_mode_info(const struct drm_display_mode *drm_mode,

		struct msm_mode_info *mode_info,

		u32 max_mixer_width);

		u32 max_mixer_width, void *display);



int dp_connector_get_info(struct msm_display_info *info, void *display);

drivers/gpu/drm/msm/dsi-staging/dsi_drm.c

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ static bool dsi_bridge_mode_fixup(struct drm_bridge *bridge, 


int dsi_conn_get_mode_info(const struct drm_display_mode *drm_mode,

	struct msm_mode_info *mode_info,

	u32 max_mixer_width)

	u32 max_mixer_width, void *display)

{

	struct dsi_display_mode dsi_mode;

	struct dsi_mode_info *timing;

drivers/gpu/drm/msm/dsi-staging/dsi_drm.h

+3 −1
Original line number Diff line number Diff line
@@ -76,10 +76,12 @@ void dsi_connector_put_modes(struct drm_connector *connector, 
 * @drm_mode: Display mode set for the display

 * @mode_info: Out parameter. information of the mode.

 * @max_mixer_width: max width supported by HW layer mixer

 * @display: Pointer to private display structure

 * Returns: Zero on success

 */

int dsi_conn_get_mode_info(const struct drm_display_mode *drm_mode,

	struct msm_mode_info *mode_info, u32 max_mixer_width);

	struct msm_mode_info *mode_info, u32 max_mixer_width,

	void *display);



/**

 * dsi_conn_mode_valid - callback to determine if specified mode is valid

drivers/gpu/drm/msm/sde/sde_connector.h

+2 −1
Original line number Diff line number Diff line
@@ -134,11 +134,12 @@ struct sde_connector_ops { 
	 * @drm_mode: Display mode set for the display

	 * @mode_info: Out parameter. information of the display mode

	 * @max_mixer_width: max width supported by HW layer mixer

	 * @display: Pointer to private display structure

	 * Returns: Zero on success

	 */

	int (*get_mode_info)(const struct drm_display_mode *drm_mode,

			struct msm_mode_info *mode_info,

			u32 max_mixer_width);

			u32 max_mixer_width, void *display);



	/**

	 * enable_event - notify display of event registration/unregistration