---

yaml
---
r: 284930
b: refs/heads/master
c: 063fd70
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af3d64b2c674bc6246bb04654b484f34287fbbc3
+refs/heads/master: 063fd701abba3b58c36b6043d5feacf0fdc76cbd

trunk/drivers/video/omap2/dss/apply.c

@@ -89,13 +89,15 @@ struct mgr_priv_data {
 };
 
 static struct {
-	spinlock_t lock;
 	struct ovl_priv_data ovl_priv_data_array[MAX_DSS_OVERLAYS];
 	struct mgr_priv_data mgr_priv_data_array[MAX_DSS_MANAGERS];
 
 	bool irq_enabled;
 } dss_cache;
 
+/* protects dss_cache */
+static spinlock_t data_lock;
+
 static struct ovl_priv_data *get_ovl_priv(struct omap_overlay *ovl)
 {
 	return &dss_cache.ovl_priv_data_array[ovl->id];
@@ -108,7 +110,7 @@ static struct mgr_priv_data *get_mgr_priv(struct omap_overlay_manager *mgr)
 
 void dss_apply_init(void)
 {
-	spin_lock_init(&dss_cache.lock);
+	spin_lock_init(&data_lock);
 }
 
 static bool ovl_manual_update(struct omap_overlay *ovl)
@@ -149,10 +151,10 @@ int dss_mgr_wait_for_go(struct omap_overlay_manager *mgr)
 		unsigned long flags;
 		bool shadow_dirty, dirty;
 
-		spin_lock_irqsave(&dss_cache.lock, flags);
+		spin_lock_irqsave(&data_lock, flags);
 		dirty = mp->dirty;
 		shadow_dirty = mp->shadow_dirty;
-		spin_unlock_irqrestore(&dss_cache.lock, flags);
+		spin_unlock_irqrestore(&data_lock, flags);
 
 		if (!dirty && !shadow_dirty) {
 			r = 0;
@@ -212,10 +214,10 @@ int dss_mgr_wait_for_go_ovl(struct omap_overlay *ovl)
 		unsigned long flags;
 		bool shadow_dirty, dirty;
 
-		spin_lock_irqsave(&dss_cache.lock, flags);
+		spin_lock_irqsave(&data_lock, flags);
 		dirty = op->dirty;
 		shadow_dirty = op->shadow_dirty;
-		spin_unlock_irqrestore(&dss_cache.lock, flags);
+		spin_unlock_irqrestore(&data_lock, flags);
 
 		if (!dirty && !shadow_dirty) {
 			r = 0;
@@ -464,7 +466,7 @@ static void dss_apply_irq_handler(void *data, u32 mask)
 	for (i = 0; i < num_mgrs; i++)
 		mgr_busy[i] = dispc_mgr_go_busy(i);
 
-	spin_lock(&dss_cache.lock);
+	spin_lock(&data_lock);
 
 	for (i = 0; i < num_ovls; ++i) {
 		ovl = omap_dss_get_overlay(i);
@@ -498,7 +500,7 @@ static void dss_apply_irq_handler(void *data, u32 mask)
 	dss_unregister_vsync_isr();
 
 end:
-	spin_unlock(&dss_cache.lock);
+	spin_unlock(&data_lock);
 }
 
 static int omap_dss_mgr_apply_ovl(struct omap_overlay *ovl)
@@ -620,7 +622,7 @@ int omap_dss_mgr_apply(struct omap_overlay_manager *mgr)
 	if (r)
 		return r;
 
-	spin_lock_irqsave(&dss_cache.lock, flags);
+	spin_lock_irqsave(&data_lock, flags);
 
 	/* Configure overlays */
 	list_for_each_entry(ovl, &mgr->overlays, list)
@@ -641,7 +643,7 @@ int omap_dss_mgr_apply(struct omap_overlay_manager *mgr)
 		dss_write_regs();
 	}
 
-	spin_unlock_irqrestore(&dss_cache.lock, flags);
+	spin_unlock_irqrestore(&data_lock, flags);
 
 	dispc_runtime_put();