summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordok666 <dok666>2003-05-13 20:00:54 +0000
committerdok666 <dok666>2003-05-13 20:00:54 +0000
commit17943bfd2b079052a49f0febde2319d7be60895a (patch)
treeb217a26a8e9af3f29dada2de737bc15e8d9030b8
parent3db0ad9c7643b0f0e73fff3dc256a757c20108e6 (diff)
Reenabled dstorg check in mga_verify_context(). Possible values are
front offset, back offset and MGA_DSTORG_EXTENDED_CONTEXT. The latter one causes the new drm_mga_extended_context_regs_t info to be used.
-rw-r--r--src/kernel/drm/mga_state.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/kernel/drm/mga_state.c b/src/kernel/drm/mga_state.c
index c8e83fb1e74..66bfdc3ad66 100644
--- a/src/kernel/drm/mga_state.c
+++ b/src/kernel/drm/mga_state.c
@@ -422,19 +422,19 @@ static void mga_g400_emit_state( drm_mga_private_t *dev_priv )
*/
static int mga_verify_context( drm_mga_private_t *dev_priv )
{
-#if 0
drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
drm_mga_context_regs_t *ctx = &sarea_priv->context_state;
if ( ctx->dstorg != dev_priv->front_offset &&
- ctx->dstorg != dev_priv->back_offset ) {
+ ctx->dstorg != dev_priv->back_offset &&
+ ctx->dstorg != MGA_DSTORG_EXTENDED_CONTEXT) {
DRM_ERROR( "*** bad DSTORG: %x (front %x, back %x)\n\n",
ctx->dstorg, dev_priv->front_offset,
dev_priv->back_offset );
ctx->dstorg = 0;
return DRM_ERR(EINVAL);
}
-#endif
+
return 0;
}