From 52d25bd1f586f38d4cda4bb0d22b5ea86e86c375 Mon Sep 17 00:00:00 2001 From: Thomas Hellstrom Date: Fri, 1 Jun 2012 15:48:04 +0200 Subject: [PATCH] --- yaml --- r: 310107 b: refs/heads/master c: 0824db38e515644f8d1bfd64adbd7cb2c6ea7c62 h: refs/heads/master i: 310105: 0a8dc1b73742e8e82da3d3c12d9067d40db851b7 310103: 6dbb4f9087d83a4393f0d2ef721ef05ff9644d85 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6987835a7ace..4857674c6072 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a8ff3ee211fccf708e1911bbc096625453ebf759 +refs/heads/master: 0824db38e515644f8d1bfd64adbd7cb2c6ea7c62 diff --git a/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c b/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c index 51c9ba5cd2fb..21ee78226560 100644 --- a/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c +++ b/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c @@ -66,7 +66,7 @@ static int vmw_gmr2_bind(struct vmw_private *dev_priv, cmd += sizeof(remap_cmd) / sizeof(uint32); for (i = 0; i < num_pages; ++i) { - if (VMW_PPN_SIZE > 4) + if (VMW_PPN_SIZE <= 4) *cmd = page_to_pfn(*pages++); else *((uint64_t *)cmd) = page_to_pfn(*pages++);