Commit d77461da authored by David S. Miller's avatar David S. Miller

[FFB]: Force-disable cursor in ffb_switch_from_graph().

parent 3d635a5f
...@@ -466,6 +466,7 @@ static __inline__ void ffb_rop(struct ffb_par *par, u32 rop) ...@@ -466,6 +466,7 @@ static __inline__ void ffb_rop(struct ffb_par *par, u32 rop)
static void ffb_switch_from_graph(struct ffb_par *par) static void ffb_switch_from_graph(struct ffb_par *par)
{ {
struct ffb_fbc *fbc = par->fbc; struct ffb_fbc *fbc = par->fbc;
struct ffb_dac *dac = par->dac;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&par->lock, flags); spin_lock_irqsave(&par->lock, flags);
...@@ -482,6 +483,14 @@ static void ffb_switch_from_graph(struct ffb_par *par) ...@@ -482,6 +483,14 @@ static void ffb_switch_from_graph(struct ffb_par *par)
upa_writel(par->fg_cache, &fbc->fg); upa_writel(par->fg_cache, &fbc->fg);
upa_writel(par->bg_cache, &fbc->bg); upa_writel(par->bg_cache, &fbc->bg);
FFBWait(par); FFBWait(par);
/* Disable cursor. */
upa_writel(0x100, &dac->type2);
if (par->dac_rev <= 2)
upa_writel(0, &dac->value2);
else
upa_writel(3, &dac->value2);
spin_unlock_irqrestore(&par->lock, flags); spin_unlock_irqrestore(&par->lock, flags);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment