Commit 95e472da authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Tomi Valkeinen
Browse files

drm/omap: hdmi: Constify video mode and related pointers 



Constify many pointers to struct videomode, as well as pointers to
container structures, to ensure the video mode isn't modified after
the .check_timings() operation.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarSebastian Reichel <sebastian.reichel@collabora.co.uk>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 7d39e59b

drivers/gpu/drm/omapdrm/dss/hdmi.h

+4 −4
Original line number Diff line number Diff line
@@ -313,13 +313,13 @@ void hdmi_wp_clear_irqenable(struct hdmi_wp_data *wp, u32 mask); 
int hdmi_wp_set_phy_pwr(struct hdmi_wp_data *wp, enum hdmi_phy_pwr val);

int hdmi_wp_set_pll_pwr(struct hdmi_wp_data *wp, enum hdmi_pll_pwr val);

void hdmi_wp_video_config_format(struct hdmi_wp_data *wp,

		struct hdmi_video_format *video_fmt);

		const struct hdmi_video_format *video_fmt);

void hdmi_wp_video_config_interface(struct hdmi_wp_data *wp,

		struct videomode *vm);

		const struct videomode *vm);

void hdmi_wp_video_config_timing(struct hdmi_wp_data *wp,

		struct videomode *vm);

		const struct videomode *vm);

void hdmi_wp_init_vid_fmt_timings(struct hdmi_video_format *video_fmt,

		struct videomode *vm, struct hdmi_config *param);

		struct videomode *vm, const struct hdmi_config *param);

int hdmi_wp_init(struct platform_device *pdev, struct hdmi_wp_data *wp,

		 unsigned int version);

phys_addr_t hdmi_wp_get_audio_dma_addr(struct hdmi_wp_data *wp);

drivers/gpu/drm/omapdrm/dss/hdmi4.c

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ static void hdmi_power_off_core(struct omap_hdmi *hdmi) 
static int hdmi_power_on_full(struct omap_hdmi *hdmi)

{

	int r;

	struct videomode *vm;

	const struct videomode *vm;

	struct hdmi_wp_data *wp = &hdmi->wp;

	struct dss_pll_clock_info hdmi_cinfo = { 0 };

	unsigned int pc;

drivers/gpu/drm/omapdrm/dss/hdmi5.c

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ static void hdmi_power_off_core(struct omap_hdmi *hdmi) 
static int hdmi_power_on_full(struct omap_hdmi *hdmi)

{

	int r;

	struct videomode *vm;

	const struct videomode *vm;

	struct dss_pll_clock_info hdmi_cinfo = { 0 };

	unsigned int pc;

drivers/gpu/drm/omapdrm/dss/hdmi5_core.c

+3 −3
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ void hdmi5_core_dump(struct hdmi_core_data *core, struct seq_file *s) 
}



static void hdmi_core_init(struct hdmi_core_vid_config *video_cfg,

			struct hdmi_config *cfg)

			   const struct hdmi_config *cfg)

{

	DSSDBG("hdmi_core_init\n");
@@ -325,10 +325,10 @@ static void hdmi_core_init(struct hdmi_core_vid_config *video_cfg, 


/* DSS_HDMI_CORE_VIDEO_CONFIG */

static void hdmi_core_video_config(struct hdmi_core_data *core,

			struct hdmi_core_vid_config *cfg)

			const struct hdmi_core_vid_config *cfg)

{

	void __iomem *base = core->base;

	struct videomode *vm = &cfg->v_fc_config.vm;

	const struct videomode *vm = &cfg->v_fc_config.vm;

	unsigned char r = 0;

	bool vsync_pol, hsync_pol;

drivers/gpu/drm/omapdrm/dss/hdmi_wp.c

+4 −4
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ void hdmi_wp_video_stop(struct hdmi_wp_data *wp) 
}



void hdmi_wp_video_config_format(struct hdmi_wp_data *wp,

		struct hdmi_video_format *video_fmt)

		const struct hdmi_video_format *video_fmt)

{

	u32 l = 0;
@@ -144,7 +144,7 @@ void hdmi_wp_video_config_format(struct hdmi_wp_data *wp, 
}



void hdmi_wp_video_config_interface(struct hdmi_wp_data *wp,

				    struct videomode *vm)

				    const struct videomode *vm)

{

	u32 r;

	bool vsync_inv, hsync_inv;
@@ -164,7 +164,7 @@ void hdmi_wp_video_config_interface(struct hdmi_wp_data *wp, 
}



void hdmi_wp_video_config_timing(struct hdmi_wp_data *wp,

				 struct videomode *vm)

				 const struct videomode *vm)

{

	u32 timing_h = 0;

	u32 timing_v = 0;
@@ -193,7 +193,7 @@ void hdmi_wp_video_config_timing(struct hdmi_wp_data *wp, 
}



void hdmi_wp_init_vid_fmt_timings(struct hdmi_video_format *video_fmt,

		struct videomode *vm, struct hdmi_config *param)

		struct videomode *vm, const struct hdmi_config *param)

{

	DSSDBG("Enter hdmi_wp_video_init_format\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE