|
@@ -293,13 +293,10 @@ static int vmw_cmdbuf_header_submit(struct vmw_cmdbuf_header *header)
|
|
struct vmw_cmdbuf_man *man = header->man;
|
|
struct vmw_cmdbuf_man *man = header->man;
|
|
u32 val;
|
|
u32 val;
|
|
|
|
|
|
- if (sizeof(header->handle) > 4)
|
|
|
|
- val = (header->handle >> 32);
|
|
|
|
- else
|
|
|
|
- val = 0;
|
|
|
|
|
|
+ val = upper_32_bits(header->handle);
|
|
vmw_write(man->dev_priv, SVGA_REG_COMMAND_HIGH, val);
|
|
vmw_write(man->dev_priv, SVGA_REG_COMMAND_HIGH, val);
|
|
|
|
|
|
- val = (header->handle & 0xFFFFFFFFULL);
|
|
|
|
|
|
+ val = lower_32_bits(header->handle);
|
|
val |= header->cb_context & SVGA_CB_CONTEXT_MASK;
|
|
val |= header->cb_context & SVGA_CB_CONTEXT_MASK;
|
|
vmw_write(man->dev_priv, SVGA_REG_COMMAND_LOW, val);
|
|
vmw_write(man->dev_priv, SVGA_REG_COMMAND_LOW, val);
|
|
|
|
|