summaryrefslogtreecommitdiff
path: root/drivers/video/matrox/matroxfb_base.h
diff options
context:
space:
mode:
authorMikulas Patocka <mpatocka@redhat.com>2014-01-23 14:39:04 -0500
committerTomi Valkeinen <tomi.valkeinen@ti.com>2014-02-11 15:01:04 +0200
commita772d4736641ec1b421ad965e13457c17379fc86 (patch)
treed68f2d7bafd2647f3c650d4d4604a1277c80d818 /drivers/video/matrox/matroxfb_base.h
parenta2317e6a571bb089d71eab747959c245907bed15 (diff)
matroxfb: restore the registers M_ACCESS and M_PITCH
When X11 is running and the user switches back to console, the card modifies the content of registers M_MACCESS and M_PITCH in periodic intervals. This patch fixes it by restoring the content of these registers before issuing any accelerator command. Signed-off-by: Mikulas Patocka <mpatocka@redhat.com> Cc: stable@vger.kernel.org Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/matrox/matroxfb_base.h')
-rw-r--r--drivers/video/matrox/matroxfb_base.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/matrox/matroxfb_base.h b/drivers/video/matrox/matroxfb_base.h
index 11ed57bb704e..556d96ce40bf 100644
--- a/drivers/video/matrox/matroxfb_base.h
+++ b/drivers/video/matrox/matroxfb_base.h
@@ -307,6 +307,8 @@ struct matrox_accel_data {
#endif
u_int32_t m_dwg_rect;
u_int32_t m_opmode;
+ u_int32_t m_access;
+ u_int32_t m_pitch;
};
struct v4l2_queryctrl;