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

Commit d09c7aa8 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAPDSS: APPLY: rename dss_cache to dss_data 



dss_cache struct contains private data used to manage dispc. "cache" is
not a good word for it, so rename it to dss_data.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 063fd701

drivers/video/omap2/dss/apply.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -38,7 +38,7 @@ 
 *        apply()

 *        apply()

 *          v

 *          v

 * +--------------------+

 * +--------------------+

 * |     dss_cache      |

 * |       info         |

 * +--------------------+

 * +--------------------+

 *          v

 *          v

 *      write_regs()

 *      write_regs()
@@ -93,19 +93,19 @@ static struct { 
	struct mgr_priv_data mgr_priv_data_array[MAX_DSS_MANAGERS];

	struct mgr_priv_data mgr_priv_data_array[MAX_DSS_MANAGERS];





	bool irq_enabled;

	bool irq_enabled;

} dss_cache;

} dss_data;





/* protects dss_cache */

/* protects dss_data */

static spinlock_t data_lock;

static spinlock_t data_lock;





static struct ovl_priv_data *get_ovl_priv(struct omap_overlay *ovl)

static struct ovl_priv_data *get_ovl_priv(struct omap_overlay *ovl)

{

{

	return &dss_cache.ovl_priv_data_array[ovl->id];

	return &dss_data.ovl_priv_data_array[ovl->id];

}

}





static struct mgr_priv_data *get_mgr_priv(struct omap_overlay_manager *mgr)

static struct mgr_priv_data *get_mgr_priv(struct omap_overlay_manager *mgr)

{

{

	return &dss_cache.mgr_priv_data_array[mgr->id];

	return &dss_data.mgr_priv_data_array[mgr->id];

}

}





void dss_apply_init(void)

void dss_apply_init(void)
@@ -433,7 +433,7 @@ static void dss_register_vsync_isr(void) 
	r = omap_dispc_register_isr(dss_apply_irq_handler, NULL, mask);

	r = omap_dispc_register_isr(dss_apply_irq_handler, NULL, mask);

	WARN_ON(r);

	WARN_ON(r);





	dss_cache.irq_enabled = true;

	dss_data.irq_enabled = true;

}

}





static void dss_unregister_vsync_isr(void)

static void dss_unregister_vsync_isr(void)
@@ -449,7 +449,7 @@ static void dss_unregister_vsync_isr(void) 
	r = omap_dispc_unregister_isr(dss_apply_irq_handler, NULL, mask);

	r = omap_dispc_unregister_isr(dss_apply_irq_handler, NULL, mask);

	WARN_ON(r);

	WARN_ON(r);





	dss_cache.irq_enabled = false;

	dss_data.irq_enabled = false;

}

}





static void dss_apply_irq_handler(void *data, u32 mask)

static void dss_apply_irq_handler(void *data, u32 mask)
@@ -637,7 +637,7 @@ int omap_dss_mgr_apply(struct omap_overlay_manager *mgr) 




	r = 0;

	r = 0;

	if (mgr->enabled && !mgr_manual_update(mgr)) {

	if (mgr->enabled && !mgr_manual_update(mgr)) {

		if (!dss_cache.irq_enabled)

		if (!dss_data.irq_enabled)

			dss_register_vsync_isr();

			dss_register_vsync_isr();





		dss_write_regs();

		dss_write_regs();