diff options
author | Jingoo Han <jg1.han@samsung.com> | 2011-04-11 03:25:37 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-04-11 12:38:50 -0400 |
commit | b07f3bbee12163a6b48991138a37b87a1126462a (patch) | |
tree | 006e82afdbe25dd92999547dffe3c5abbe5e383c /drivers/video/s3c-fb.c | |
parent | 0d60b281dc7fd2ae7ec6463f916138fd2d182bee (diff) |
video: s3c-fb: add spinlock to interrupt routine
The spinlock is added to interrupt routine to ensure that the driver
is protected against multiple accesses.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/video/s3c-fb.c')
-rw-r--r-- | drivers/video/s3c-fb.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c index 2d075f0684d9..3fa7911ac906 100644 --- a/drivers/video/s3c-fb.c +++ b/drivers/video/s3c-fb.c | |||
@@ -182,6 +182,7 @@ struct s3c_fb_vsync { | |||
182 | 182 | ||
183 | /** | 183 | /** |
184 | * struct s3c_fb - overall hardware state of the hardware | 184 | * struct s3c_fb - overall hardware state of the hardware |
185 | * @slock: The spinlock protection for this data sturcture. | ||
185 | * @dev: The device that we bound to, for printing, etc. | 186 | * @dev: The device that we bound to, for printing, etc. |
186 | * @regs_res: The resource we claimed for the IO registers. | 187 | * @regs_res: The resource we claimed for the IO registers. |
187 | * @bus_clk: The clk (hclk) feeding our interface and possibly pixclk. | 188 | * @bus_clk: The clk (hclk) feeding our interface and possibly pixclk. |
@@ -195,6 +196,7 @@ struct s3c_fb_vsync { | |||
195 | * @vsync_info: VSYNC-related information (count, queues...) | 196 | * @vsync_info: VSYNC-related information (count, queues...) |
196 | */ | 197 | */ |
197 | struct s3c_fb { | 198 | struct s3c_fb { |
199 | spinlock_t slock; | ||
198 | struct device *dev; | 200 | struct device *dev; |
199 | struct resource *regs_res; | 201 | struct resource *regs_res; |
200 | struct clk *bus_clk; | 202 | struct clk *bus_clk; |
@@ -947,6 +949,8 @@ static irqreturn_t s3c_fb_irq(int irq, void *dev_id) | |||
947 | void __iomem *regs = sfb->regs; | 949 | void __iomem *regs = sfb->regs; |
948 | u32 irq_sts_reg; | 950 | u32 irq_sts_reg; |
949 | 951 | ||
952 | spin_lock(&sfb->slock); | ||
953 | |||
950 | irq_sts_reg = readl(regs + VIDINTCON1); | 954 | irq_sts_reg = readl(regs + VIDINTCON1); |
951 | 955 | ||
952 | if (irq_sts_reg & VIDINTCON1_INT_FRAME) { | 956 | if (irq_sts_reg & VIDINTCON1_INT_FRAME) { |
@@ -963,6 +967,7 @@ static irqreturn_t s3c_fb_irq(int irq, void *dev_id) | |||
963 | */ | 967 | */ |
964 | s3c_fb_disable_irq(sfb); | 968 | s3c_fb_disable_irq(sfb); |
965 | 969 | ||
970 | spin_unlock(&sfb->slock); | ||
966 | return IRQ_HANDLED; | 971 | return IRQ_HANDLED; |
967 | } | 972 | } |
968 | 973 | ||
@@ -1339,6 +1344,8 @@ static int __devinit s3c_fb_probe(struct platform_device *pdev) | |||
1339 | sfb->pdata = pd; | 1344 | sfb->pdata = pd; |
1340 | sfb->variant = fbdrv->variant; | 1345 | sfb->variant = fbdrv->variant; |
1341 | 1346 | ||
1347 | spin_lock_init(&sfb->slock); | ||
1348 | |||
1342 | sfb->bus_clk = clk_get(dev, "lcd"); | 1349 | sfb->bus_clk = clk_get(dev, "lcd"); |
1343 | if (IS_ERR(sfb->bus_clk)) { | 1350 | if (IS_ERR(sfb->bus_clk)) { |
1344 | dev_err(dev, "failed to get bus clock\n"); | 1351 | dev_err(dev, "failed to get bus clock\n"); |