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

Commit 69036f0c authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

Merge branch 'archit/wb-dispc-for-3.7' 

Merge omapdss writeback work. These patches implement the low level writeback
features in the DISPC, but do not yet add a way to actually use the writeback
from the userspace.

* archit/wb-dispc-for-3.7:
  OMAPDSS: DISPC: Configure color conversion coefficients for writeback
  OMAPDSS: DISPC: Add manager like functions for writeback
  OMAPDSS: DISPC: Configure writeback FIFOs
  OMAPDSS: DISPC: Configure writeback specific parameters in dispc_wb_setup()
  OMAPDSS: DISPC: Configure overlay-like parameters in dispc_wb_setup
  OMAPDSS: DISPC: Add function to set channel in for writeback
  OMAPDSS: DISPC: Don't set chroma resampling bit for writeback
  OMAPDSS: DISPC: Downscale chroma if plane is writeback
  OMAPDSS: DISPC: Configure input and output sizes for writeback
  OMAPDSS: DISPC: Add writeback register offsets and dss features structs
  OMAPDSS: DISPC: Allow both upscaling and downscaling of chroma
  OMAPDSS: DIPSC: Relax scaling limitations when in memory to memory mode
  OMAPDSS: DISPC: Don't pass channel out when configuring overlays
  OMAPDSS: DISPC: Make dispc_ovl_setup call dispc_ovl_setup_common
  OMAPDSS: OVERLAY: Add position and replication as overlay caps
  OMAPDSS: DISPC: Pass overlay caps as a parameter to dispc plane functions
  OMAPDSS: DISPC: Simplify function names for setting pipeline input and output sizes
  OMAPDSS: DISPC: Constify omap_overlay_info in dispc_ovl_setup()
parents 866f0956 6e5264b0

drivers/video/omap2/dss/apply.c

+1 −1
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ static void dss_ovl_write_regs(struct omap_overlay *ovl) 


	replication = dss_ovl_use_replication(mp->lcd_config, oi->color_mode);



	r = dispc_ovl_setup(ovl->id, oi, replication, &mp->timings);

	r = dispc_ovl_setup(ovl->id, oi, replication, &mp->timings, false);

	if (r) {

		/*

		 * We can't do much here, as this function can be called from

drivers/video/omap2/dss/dispc.c

+393 −169

File changed.

Preview size limit exceeded, changes collapsed.

drivers/video/omap2/dss/dispc.h

+33 −0
Original line number Diff line number Diff line
@@ -373,6 +373,7 @@ static inline u16 DISPC_BA0_OFFSET(enum omap_plane plane) 
	case OMAP_DSS_VIDEO2:

		return 0x0000;

	case OMAP_DSS_VIDEO3:

	case OMAP_DSS_WB:

		return 0x0008;

	default:

		BUG();
@@ -388,6 +389,7 @@ static inline u16 DISPC_BA1_OFFSET(enum omap_plane plane) 
	case OMAP_DSS_VIDEO2:

		return 0x0004;

	case OMAP_DSS_VIDEO3:

	case OMAP_DSS_WB:

		return 0x000C;

	default:

		BUG();
@@ -407,6 +409,8 @@ static inline u16 DISPC_BA0_UV_OFFSET(enum omap_plane plane) 
		return 0x04BC;

	case OMAP_DSS_VIDEO3:

		return 0x0310;

	case OMAP_DSS_WB:

		return 0x0118;

	default:

		BUG();

		return 0;
@@ -425,6 +429,8 @@ static inline u16 DISPC_BA1_UV_OFFSET(enum omap_plane plane) 
		return 0x04C0;

	case OMAP_DSS_VIDEO3:

		return 0x0314;

	case OMAP_DSS_WB:

		return 0x011C;

	default:

		BUG();

		return 0;
@@ -454,6 +460,7 @@ static inline u16 DISPC_SIZE_OFFSET(enum omap_plane plane) 
	case OMAP_DSS_VIDEO2:

		return 0x000C;

	case OMAP_DSS_VIDEO3:

	case OMAP_DSS_WB:

		return 0x00A8;

	default:

		BUG();
@@ -470,6 +477,7 @@ static inline u16 DISPC_ATTR_OFFSET(enum omap_plane plane) 
	case OMAP_DSS_VIDEO2:

		return 0x0010;

	case OMAP_DSS_VIDEO3:

	case OMAP_DSS_WB:

		return 0x0070;

	default:

		BUG();
@@ -489,6 +497,8 @@ static inline u16 DISPC_ATTR2_OFFSET(enum omap_plane plane) 
		return 0x04DC;

	case OMAP_DSS_VIDEO3:

		return 0x032C;

	case OMAP_DSS_WB:

		return 0x0310;

	default:

		BUG();

		return 0;
@@ -504,6 +514,7 @@ static inline u16 DISPC_FIFO_THRESH_OFFSET(enum omap_plane plane) 
	case OMAP_DSS_VIDEO2:

		return 0x0014;

	case OMAP_DSS_VIDEO3:

	case OMAP_DSS_WB:

		return 0x008C;

	default:

		BUG();
@@ -537,6 +548,7 @@ static inline u16 DISPC_ROW_INC_OFFSET(enum omap_plane plane) 
	case OMAP_DSS_VIDEO2:

		return 0x001C;

	case OMAP_DSS_VIDEO3:

	case OMAP_DSS_WB:

		return 0x00A4;

	default:

		BUG();
@@ -553,6 +565,7 @@ static inline u16 DISPC_PIX_INC_OFFSET(enum omap_plane plane) 
	case OMAP_DSS_VIDEO2:

		return 0x0020;

	case OMAP_DSS_VIDEO3:

	case OMAP_DSS_WB:

		return 0x0098;

	default:

		BUG();
@@ -602,6 +615,7 @@ static inline u16 DISPC_FIR_OFFSET(enum omap_plane plane) 
	case OMAP_DSS_VIDEO2:

		return 0x0024;

	case OMAP_DSS_VIDEO3:

	case OMAP_DSS_WB:

		return 0x0090;

	default:

		BUG();
@@ -621,6 +635,8 @@ static inline u16 DISPC_FIR2_OFFSET(enum omap_plane plane) 
		return 0x055C;

	case OMAP_DSS_VIDEO3:

		return 0x0424;

	case OMAP_DSS_WB:

		return 0x290;

	default:

		BUG();

		return 0;
@@ -637,6 +653,7 @@ static inline u16 DISPC_PIC_SIZE_OFFSET(enum omap_plane plane) 
	case OMAP_DSS_VIDEO2:

		return 0x0028;

	case OMAP_DSS_VIDEO3:

	case OMAP_DSS_WB:

		return 0x0094;

	default:

		BUG();
@@ -655,6 +672,7 @@ static inline u16 DISPC_ACCU0_OFFSET(enum omap_plane plane) 
	case OMAP_DSS_VIDEO2:

		return 0x002C;

	case OMAP_DSS_VIDEO3:

	case OMAP_DSS_WB:

		return 0x0000;

	default:

		BUG();
@@ -674,6 +692,8 @@ static inline u16 DISPC_ACCU2_0_OFFSET(enum omap_plane plane) 
		return 0x0560;

	case OMAP_DSS_VIDEO3:

		return 0x0428;

	case OMAP_DSS_WB:

		return 0x0294;

	default:

		BUG();

		return 0;
@@ -690,6 +710,7 @@ static inline u16 DISPC_ACCU1_OFFSET(enum omap_plane plane) 
	case OMAP_DSS_VIDEO2:

		return 0x0030;

	case OMAP_DSS_VIDEO3:

	case OMAP_DSS_WB:

		return 0x0004;

	default:

		BUG();
@@ -709,6 +730,8 @@ static inline u16 DISPC_ACCU2_1_OFFSET(enum omap_plane plane) 
		return 0x0564;

	case OMAP_DSS_VIDEO3:

		return 0x042C;

	case OMAP_DSS_WB:

		return 0x0298;

	default:

		BUG();

		return 0;
@@ -726,6 +749,7 @@ static inline u16 DISPC_FIR_COEF_H_OFFSET(enum omap_plane plane, u16 i) 
	case OMAP_DSS_VIDEO2:

		return 0x0034 + i * 0x8;

	case OMAP_DSS_VIDEO3:

	case OMAP_DSS_WB:

		return 0x0010 + i * 0x8;

	default:

		BUG();
@@ -746,6 +770,8 @@ static inline u16 DISPC_FIR_COEF_H2_OFFSET(enum omap_plane plane, u16 i) 
		return 0x0568 + i * 0x8;

	case OMAP_DSS_VIDEO3:

		return 0x0430 + i * 0x8;

	case OMAP_DSS_WB:

		return 0x02A0 + i * 0x8;

	default:

		BUG();

		return 0;
@@ -763,6 +789,7 @@ static inline u16 DISPC_FIR_COEF_HV_OFFSET(enum omap_plane plane, u16 i) 
	case OMAP_DSS_VIDEO2:

		return 0x0038 + i * 0x8;

	case OMAP_DSS_VIDEO3:

	case OMAP_DSS_WB:

		return 0x0014 + i * 0x8;

	default:

		BUG();
@@ -783,6 +810,8 @@ static inline u16 DISPC_FIR_COEF_HV2_OFFSET(enum omap_plane plane, u16 i) 
		return 0x056C + i * 0x8;

	case OMAP_DSS_VIDEO3:

		return 0x0434 + i * 0x8;

	case OMAP_DSS_WB:

		return 0x02A4 + i * 0x8;

	default:

		BUG();

		return 0;
@@ -799,6 +828,7 @@ static inline u16 DISPC_CONV_COEF_OFFSET(enum omap_plane plane, u16 i) 
	case OMAP_DSS_VIDEO1:

	case OMAP_DSS_VIDEO2:

	case OMAP_DSS_VIDEO3:

	case OMAP_DSS_WB:

		return 0x0074 + i * 0x4;

	default:

		BUG();
@@ -818,6 +848,7 @@ static inline u16 DISPC_FIR_COEF_V_OFFSET(enum omap_plane plane, u16 i) 
	case OMAP_DSS_VIDEO2:

		return 0x00B4 + i * 0x4;

	case OMAP_DSS_VIDEO3:

	case OMAP_DSS_WB:

		return 0x0050 + i * 0x4;

	default:

		BUG();
@@ -838,6 +869,8 @@ static inline u16 DISPC_FIR_COEF_V2_OFFSET(enum omap_plane plane, u16 i) 
		return 0x05A8 + i * 0x4;

	case OMAP_DSS_VIDEO3:

		return 0x0470 + i * 0x4;

	case OMAP_DSS_WB:

		return 0x02E0 + i * 0x4;

	default:

		BUG();

		return 0;

drivers/video/omap2/dss/dss.h

+23 −2
Original line number Diff line number Diff line
@@ -113,6 +113,17 @@ enum dss_dsi_content_type { 
	DSS_DSI_CONTENT_GENERIC,

};



enum dss_writeback_channel {

	DSS_WB_LCD1_MGR =	0,

	DSS_WB_LCD2_MGR =	1,

	DSS_WB_TV_MGR =		2,

	DSS_WB_OVL0 =		3,

	DSS_WB_OVL1 =		4,

	DSS_WB_OVL2 =		5,

	DSS_WB_OVL3 =		6,

	DSS_WB_LCD3_MGR =	7,

};



struct dss_clock_info {

	/* rates that we get with dividers below */

	unsigned long fck;
@@ -444,8 +455,9 @@ void dispc_ovl_set_fifo_threshold(enum omap_plane plane, u32 low, u32 high); 
void dispc_ovl_compute_fifo_thresholds(enum omap_plane plane,

		u32 *fifo_low, u32 *fifo_high, bool use_fifomerge,

		bool manual_update);

int dispc_ovl_setup(enum omap_plane plane, struct omap_overlay_info *oi,

		bool replication, const struct omap_video_timings *mgr_timings);

int dispc_ovl_setup(enum omap_plane plane, const struct omap_overlay_info *oi,

		bool replication, const struct omap_video_timings *mgr_timings,

		bool mem_to_mem);

int dispc_ovl_enable(enum omap_plane plane, bool enable);

void dispc_ovl_set_channel_out(enum omap_plane plane,

		enum omap_channel channel);
@@ -474,6 +486,15 @@ int dispc_mgr_get_clock_div(enum omap_channel channel, 
void dispc_mgr_setup(enum omap_channel channel,

		struct omap_overlay_manager_info *info);



u32 dispc_wb_get_framedone_irq(void);

bool dispc_wb_go_busy(void);

void dispc_wb_go(void);

void dispc_wb_enable(bool enable);

bool dispc_wb_is_enabled(void);

void dispc_wb_set_channel_in(enum dss_writeback_channel channel);

int dispc_wb_setup(const struct omap_dss_writeback_info *wi,

		bool mem_to_mem, const struct omap_video_timings *timings);



/* VENC */

#ifdef CONFIG_OMAP2_DSS_VENC

int venc_init_platform_driver(void) __init;

drivers/video/omap2/dss/dss_features.c

+44 −13
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ struct omap_dss_features { 


	const int num_mgrs;

	const int num_ovls;

	const int num_wbs;

	const enum omap_display_type *supported_displays;

	const enum omap_dss_output_id *supported_outputs;

	const enum omap_color_mode *supported_color_modes;
@@ -310,58 +311,80 @@ static const enum omap_color_mode omap4_dss_supported_color_modes[] = { 
	OMAP_DSS_COLOR_ARGB16 | OMAP_DSS_COLOR_XRGB16_1555 |

	OMAP_DSS_COLOR_ARGB32 | OMAP_DSS_COLOR_RGBX16 |

	OMAP_DSS_COLOR_RGBX32,



	/* OMAP_DSS_WB */

	OMAP_DSS_COLOR_RGB16 | OMAP_DSS_COLOR_RGB12U |

	OMAP_DSS_COLOR_YUV2 | OMAP_DSS_COLOR_ARGB16_1555 |

	OMAP_DSS_COLOR_RGBA32 | OMAP_DSS_COLOR_NV12 |

	OMAP_DSS_COLOR_RGBA16 | OMAP_DSS_COLOR_RGB24U |

	OMAP_DSS_COLOR_RGB24P | OMAP_DSS_COLOR_UYVY |

	OMAP_DSS_COLOR_ARGB16 | OMAP_DSS_COLOR_XRGB16_1555 |

	OMAP_DSS_COLOR_ARGB32 | OMAP_DSS_COLOR_RGBX16 |

	OMAP_DSS_COLOR_RGBX32,

};



static const enum omap_overlay_caps omap2_dss_overlay_caps[] = {

	/* OMAP_DSS_GFX */

	0,

	OMAP_DSS_OVL_CAP_POS | OMAP_DSS_OVL_CAP_REPLICATION,



	/* OMAP_DSS_VIDEO1 */

	OMAP_DSS_OVL_CAP_SCALE,

	OMAP_DSS_OVL_CAP_SCALE | OMAP_DSS_OVL_CAP_POS |

		OMAP_DSS_OVL_CAP_REPLICATION,



	/* OMAP_DSS_VIDEO2 */

	OMAP_DSS_OVL_CAP_SCALE,

	OMAP_DSS_OVL_CAP_SCALE | OMAP_DSS_OVL_CAP_POS |

		OMAP_DSS_OVL_CAP_REPLICATION,

};



static const enum omap_overlay_caps omap3430_dss_overlay_caps[] = {

	/* OMAP_DSS_GFX */

	OMAP_DSS_OVL_CAP_GLOBAL_ALPHA,

	OMAP_DSS_OVL_CAP_GLOBAL_ALPHA | OMAP_DSS_OVL_CAP_POS |

		OMAP_DSS_OVL_CAP_REPLICATION,



	/* OMAP_DSS_VIDEO1 */

	OMAP_DSS_OVL_CAP_SCALE,

	OMAP_DSS_OVL_CAP_SCALE | OMAP_DSS_OVL_CAP_POS |

		OMAP_DSS_OVL_CAP_REPLICATION,



	/* OMAP_DSS_VIDEO2 */

	OMAP_DSS_OVL_CAP_SCALE | OMAP_DSS_OVL_CAP_GLOBAL_ALPHA,

	OMAP_DSS_OVL_CAP_SCALE | OMAP_DSS_OVL_CAP_GLOBAL_ALPHA |

		OMAP_DSS_OVL_CAP_POS | OMAP_DSS_OVL_CAP_REPLICATION,

};



static const enum omap_overlay_caps omap3630_dss_overlay_caps[] = {

	/* OMAP_DSS_GFX */

	OMAP_DSS_OVL_CAP_GLOBAL_ALPHA | OMAP_DSS_OVL_CAP_PRE_MULT_ALPHA,

	OMAP_DSS_OVL_CAP_GLOBAL_ALPHA | OMAP_DSS_OVL_CAP_PRE_MULT_ALPHA |

		OMAP_DSS_OVL_CAP_POS | OMAP_DSS_OVL_CAP_REPLICATION,



	/* OMAP_DSS_VIDEO1 */

	OMAP_DSS_OVL_CAP_SCALE,

	OMAP_DSS_OVL_CAP_SCALE | OMAP_DSS_OVL_CAP_POS |

		OMAP_DSS_OVL_CAP_REPLICATION,



	/* OMAP_DSS_VIDEO2 */

	OMAP_DSS_OVL_CAP_SCALE | OMAP_DSS_OVL_CAP_GLOBAL_ALPHA |

		OMAP_DSS_OVL_CAP_PRE_MULT_ALPHA,

		OMAP_DSS_OVL_CAP_PRE_MULT_ALPHA | OMAP_DSS_OVL_CAP_POS |

		OMAP_DSS_OVL_CAP_REPLICATION,

};



static const enum omap_overlay_caps omap4_dss_overlay_caps[] = {

	/* OMAP_DSS_GFX */

	OMAP_DSS_OVL_CAP_GLOBAL_ALPHA | OMAP_DSS_OVL_CAP_PRE_MULT_ALPHA |

		OMAP_DSS_OVL_CAP_ZORDER,

		OMAP_DSS_OVL_CAP_ZORDER | OMAP_DSS_OVL_CAP_POS |

		OMAP_DSS_OVL_CAP_REPLICATION,



	/* OMAP_DSS_VIDEO1 */

	OMAP_DSS_OVL_CAP_SCALE | OMAP_DSS_OVL_CAP_GLOBAL_ALPHA |

		OMAP_DSS_OVL_CAP_PRE_MULT_ALPHA | OMAP_DSS_OVL_CAP_ZORDER,

		OMAP_DSS_OVL_CAP_PRE_MULT_ALPHA | OMAP_DSS_OVL_CAP_ZORDER |

		OMAP_DSS_OVL_CAP_POS | OMAP_DSS_OVL_CAP_REPLICATION,



	/* OMAP_DSS_VIDEO2 */

	OMAP_DSS_OVL_CAP_SCALE | OMAP_DSS_OVL_CAP_GLOBAL_ALPHA |

		OMAP_DSS_OVL_CAP_PRE_MULT_ALPHA | OMAP_DSS_OVL_CAP_ZORDER,

		OMAP_DSS_OVL_CAP_PRE_MULT_ALPHA | OMAP_DSS_OVL_CAP_ZORDER |

		OMAP_DSS_OVL_CAP_POS | OMAP_DSS_OVL_CAP_REPLICATION,



	/* OMAP_DSS_VIDEO3 */

	OMAP_DSS_OVL_CAP_SCALE | OMAP_DSS_OVL_CAP_GLOBAL_ALPHA |

		OMAP_DSS_OVL_CAP_PRE_MULT_ALPHA | OMAP_DSS_OVL_CAP_ZORDER,

		OMAP_DSS_OVL_CAP_PRE_MULT_ALPHA | OMAP_DSS_OVL_CAP_ZORDER |

		OMAP_DSS_OVL_CAP_POS | OMAP_DSS_OVL_CAP_REPLICATION,

};



static const char * const omap2_dss_clk_source_names[] = {
@@ -698,6 +721,7 @@ static const struct omap_dss_features omap4430_es1_0_dss_features = { 


	.num_mgrs = 3,

	.num_ovls = 4,

	.num_wbs = 1,

	.supported_displays = omap4_dss_supported_displays,

	.supported_outputs = omap4_dss_supported_outputs,

	.supported_color_modes = omap4_dss_supported_color_modes,
@@ -719,6 +743,7 @@ static const struct omap_dss_features omap4430_es2_0_1_2_dss_features = { 


	.num_mgrs = 3,

	.num_ovls = 4,

	.num_wbs = 1,

	.supported_displays = omap4_dss_supported_displays,

	.supported_outputs = omap4_dss_supported_outputs,

	.supported_color_modes = omap4_dss_supported_color_modes,
@@ -740,6 +765,7 @@ static const struct omap_dss_features omap4_dss_features = { 


	.num_mgrs = 3,

	.num_ovls = 4,

	.num_wbs = 1,

	.supported_displays = omap4_dss_supported_displays,

	.supported_outputs = omap4_dss_supported_outputs,

	.supported_color_modes = omap4_dss_supported_color_modes,
@@ -817,6 +843,11 @@ int dss_feat_get_num_ovls(void) 
	return omap_current_dss_features->num_ovls;

}



int dss_feat_get_num_wbs(void)

{

	return omap_current_dss_features->num_wbs;

}



unsigned long dss_feat_get_param_min(enum dss_range_param param)

{

	return omap_current_dss_features->dss_params[param].min;