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

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

Merge changes If37ec780,Ia691c95d into display-kernel.lnx.1.0 

* changes:
  disp: msm: sde: remove sde wrapper for clock set flags
  Disp: Snapshot change for lahaina display driver
parents 57069185 b02d482e

msm/dp/dp_drm.c

+2 −2
Original line number Diff line number Diff line
@@ -231,8 +231,8 @@ static void dp_bridge_post_disable(struct drm_bridge *drm_bridge) 
}



static void dp_bridge_mode_set(struct drm_bridge *drm_bridge,

				struct drm_display_mode *mode,

				struct drm_display_mode *adjusted_mode)

				const struct drm_display_mode *mode,

				const struct drm_display_mode *adjusted_mode)

{

	struct dp_bridge *bridge;

	struct dp_display *dp;

msm/dp/dp_drm.h

+5 −7
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
#include <linux/types.h>

#include <drm/drmP.h>

#include <drm/drm_crtc.h>

#include <drm/drm_crtc_helper.h>



#include "msm_drv.h"

#include "dp_display.h"
@@ -47,7 +46,7 @@ int dp_connector_config_hdr(struct drm_connector *connector, 
 */

int dp_connector_atomic_check(struct drm_connector *connector,

	void *display,

	struct drm_connector_state *c_state);

	struct drm_atomic_state *state);



/**

 * dp_connector_set_colorspace - callback to set new colorspace
@@ -184,14 +183,13 @@ static inline int dp_connector_config_hdr(struct drm_connector *connector, 
	return 0;

}



int dp_connector_atomic_check(struct drm_connector *connector,

	void *display,

	struct drm_connector_state *c_state)

static inline int dp_connector_atomic_check(struct drm_connector *connector,

		void *display, struct drm_atomic_state *state)

{

	return 0;

}



int dp_connector_set_colorspace(struct drm_connector *connector,

static inline int dp_connector_set_colorspace(struct drm_connector *connector,

		void *display)

{

	return 0;

msm/dp/dp_mst_drm.c

+2 −2
Original line number Diff line number Diff line
@@ -1025,8 +1025,8 @@ static void dp_mst_bridge_post_disable(struct drm_bridge *drm_bridge) 
}



static void dp_mst_bridge_mode_set(struct drm_bridge *drm_bridge,

				struct drm_display_mode *mode,

				struct drm_display_mode *adjusted_mode)

				const struct drm_display_mode *mode,

				const struct drm_display_mode *adjusted_mode)

{

	struct dp_mst_bridge *bridge;

	struct dp_display *dp;

msm/dsi/dsi_display.c

+8 −5
Original line number Diff line number Diff line
@@ -1423,7 +1423,7 @@ static ssize_t debugfs_read_esd_check_mode(struct file *file, 
	struct drm_panel_esd_config *esd_config;

	char *buf;

	int rc = 0;

	size_t len;

	size_t len = 0;



	if (!display)

		return -ENODEV;
@@ -5380,12 +5380,15 @@ static enum drm_mode_status dsi_display_drm_ext_mode_valid( 


static int dsi_display_drm_ext_atomic_check(struct drm_connector *connector,

		void *disp,

		struct drm_connector_state *c_state)

		struct drm_atomic_state *state)

{

	struct dsi_display *display = disp;

	struct drm_connector_state *c_state;



	c_state = drm_atomic_get_new_connector_state(state, connector);



	return display->ext_conn->helper_private->atomic_check(

			display->ext_conn, c_state);

			display->ext_conn, state);

}



static int dsi_display_ext_get_info(struct drm_connector *connector,
@@ -5536,8 +5539,8 @@ static bool dsi_display_drm_ext_bridge_mode_fixup( 


static void dsi_display_drm_ext_bridge_mode_set(

		struct drm_bridge *bridge,

		struct drm_display_mode *mode,

		struct drm_display_mode *adjusted_mode)

		const struct drm_display_mode *mode,

		const struct drm_display_mode *adjusted_mode)

{

	struct dsi_display_ext_bridge *ext_bridge;

	struct drm_display_mode tmp;

msm/dsi/dsi_drm.c

+2 −2
Original line number Diff line number Diff line
@@ -314,8 +314,8 @@ static void dsi_bridge_post_disable(struct drm_bridge *bridge) 
}



static void dsi_bridge_mode_set(struct drm_bridge *bridge,

				struct drm_display_mode *mode,

				struct drm_display_mode *adjusted_mode)

				const struct drm_display_mode *mode,

				const struct drm_display_mode *adjusted_mode)

{

	struct dsi_bridge *c_bridge = to_dsi_bridge(bridge);