Commit 397a1117 authored by Deepak Rawat's avatar Deepak Rawat Committed by Thomas Hellstrom

drm/vmwgfx: Support for SVGA3dSurfaceAllFlags in vmwgfx

Since svga device introduced new 64bit SVGA3dSurfaceAllFlags, vmwgfx
now stores the surface flags internally as SVGA3dSurfaceAllFlags.
For legacy surface define commands, only lower 32-bit is used.
Signed-off-by: default avatarDeepak Rawat <drawat@vmware.com>
Reviewed-by: default avatarSinclair Yeh <syeh@vmware.com>
Reviewed-by: default avatarBrian Paul <brianp@vmware.com>
Reviewed-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
parent cdff8e73
...@@ -166,7 +166,7 @@ struct vmw_surface_offset; ...@@ -166,7 +166,7 @@ struct vmw_surface_offset;
struct vmw_surface { struct vmw_surface {
struct vmw_resource res; struct vmw_resource res;
uint32_t flags; SVGA3dSurfaceAllFlags flags;
uint32_t format; uint32_t format;
uint32_t mip_levels[DRM_VMW_MAX_SURFACE_FACES]; uint32_t mip_levels[DRM_VMW_MAX_SURFACE_FACES];
struct drm_vmw_size base_size; struct drm_vmw_size base_size;
...@@ -1080,7 +1080,7 @@ extern int vmw_surface_validate(struct vmw_private *dev_priv, ...@@ -1080,7 +1080,7 @@ extern int vmw_surface_validate(struct vmw_private *dev_priv,
struct vmw_surface *srf); struct vmw_surface *srf);
int vmw_surface_gb_priv_define(struct drm_device *dev, int vmw_surface_gb_priv_define(struct drm_device *dev,
uint32_t user_accounting_size, uint32_t user_accounting_size,
uint32_t svga3d_flags, SVGA3dSurfaceAllFlags svga3d_flags,
SVGA3dSurfaceFormat format, SVGA3dSurfaceFormat format,
bool for_scanout, bool for_scanout,
uint32_t num_mip_levels, uint32_t num_mip_levels,
......
...@@ -224,7 +224,12 @@ static void vmw_surface_define_encode(const struct vmw_surface *srf, ...@@ -224,7 +224,12 @@ static void vmw_surface_define_encode(const struct vmw_surface *srf,
cmd->header.id = SVGA_3D_CMD_SURFACE_DEFINE; cmd->header.id = SVGA_3D_CMD_SURFACE_DEFINE;
cmd->header.size = cmd_len; cmd->header.size = cmd_len;
cmd->body.sid = srf->res.id; cmd->body.sid = srf->res.id;
cmd->body.surfaceFlags = srf->flags; /*
* Downcast of surfaceFlags, was upcasted when received from user-space,
* since driver internally stores as 64 bit.
* For legacy surface define only 32 bit flag is supported.
*/
cmd->body.surfaceFlags = (SVGA3dSurface1Flags)srf->flags;
cmd->body.format = srf->format; cmd->body.format = srf->format;
for (i = 0; i < DRM_VMW_MAX_SURFACE_FACES; ++i) for (i = 0; i < DRM_VMW_MAX_SURFACE_FACES; ++i)
cmd->body.face[i].numMipLevels = srf->mip_levels[i]; cmd->body.face[i].numMipLevels = srf->mip_levels[i];
...@@ -760,7 +765,8 @@ int vmw_surface_define_ioctl(struct drm_device *dev, void *data, ...@@ -760,7 +765,8 @@ int vmw_surface_define_ioctl(struct drm_device *dev, void *data,
srf = &user_srf->srf; srf = &user_srf->srf;
res = &srf->res; res = &srf->res;
srf->flags = req->flags; /* Driver internally stores as 64-bit flags */
srf->flags = (SVGA3dSurfaceAllFlags)req->flags;
srf->format = req->format; srf->format = req->format;
srf->scanout = req->scanout; srf->scanout = req->scanout;
...@@ -992,7 +998,8 @@ int vmw_surface_reference_ioctl(struct drm_device *dev, void *data, ...@@ -992,7 +998,8 @@ int vmw_surface_reference_ioctl(struct drm_device *dev, void *data,
user_srf = container_of(base, struct vmw_user_surface, prime.base); user_srf = container_of(base, struct vmw_user_surface, prime.base);
srf = &user_srf->srf; srf = &user_srf->srf;
rep->flags = srf->flags; /* Downcast of flags when sending back to user space */
rep->flags = (uint32_t)srf->flags;
rep->format = srf->format; rep->format = srf->format;
memcpy(rep->mip_levels, srf->mip_levels, sizeof(srf->mip_levels)); memcpy(rep->mip_levels, srf->mip_levels, sizeof(srf->mip_levels));
user_sizes = (struct drm_vmw_size __user *)(unsigned long) user_sizes = (struct drm_vmw_size __user *)(unsigned long)
...@@ -1082,7 +1089,7 @@ static int vmw_gb_surface_create(struct vmw_resource *res) ...@@ -1082,7 +1089,7 @@ static int vmw_gb_surface_create(struct vmw_resource *res)
cmd3->header.id = cmd_id; cmd3->header.id = cmd_id;
cmd3->header.size = cmd_len; cmd3->header.size = cmd_len;
cmd3->body.sid = srf->res.id; cmd3->body.sid = srf->res.id;
cmd3->body.surfaceFlags = (SVGA3dSurfaceAllFlags)srf->flags; cmd3->body.surfaceFlags = srf->flags;
cmd3->body.format = srf->format; cmd3->body.format = srf->format;
cmd3->body.numMipLevels = srf->mip_levels[0]; cmd3->body.numMipLevels = srf->mip_levels[0];
cmd3->body.multisampleCount = srf->multisample_count; cmd3->body.multisampleCount = srf->multisample_count;
...@@ -1320,7 +1327,7 @@ int vmw_gb_surface_define_ioctl(struct drm_device *dev, void *data, ...@@ -1320,7 +1327,7 @@ int vmw_gb_surface_define_ioctl(struct drm_device *dev, void *data,
/* Define a surface based on the parameters. */ /* Define a surface based on the parameters. */
ret = vmw_surface_gb_priv_define(dev, ret = vmw_surface_gb_priv_define(dev,
size, size,
req->svga3d_flags, (SVGA3dSurfaceAllFlags)req->svga3d_flags,
req->format, req->format,
req->drm_surface_flags & drm_vmw_surface_flag_scanout, req->drm_surface_flags & drm_vmw_surface_flag_scanout,
req->mip_levels, req->mip_levels,
...@@ -1451,7 +1458,7 @@ int vmw_gb_surface_reference_ioctl(struct drm_device *dev, void *data, ...@@ -1451,7 +1458,7 @@ int vmw_gb_surface_reference_ioctl(struct drm_device *dev, void *data,
goto out_bad_resource; goto out_bad_resource;
} }
rep->creq.svga3d_flags = srf->flags; rep->creq.svga3d_flags = (uint32_t)srf->flags;
rep->creq.format = srf->format; rep->creq.format = srf->format;
rep->creq.mip_levels = srf->mip_levels[0]; rep->creq.mip_levels = srf->mip_levels[0];
rep->creq.drm_surface_flags = 0; rep->creq.drm_surface_flags = 0;
...@@ -1495,7 +1502,7 @@ int vmw_gb_surface_reference_ioctl(struct drm_device *dev, void *data, ...@@ -1495,7 +1502,7 @@ int vmw_gb_surface_reference_ioctl(struct drm_device *dev, void *data,
*/ */
int vmw_surface_gb_priv_define(struct drm_device *dev, int vmw_surface_gb_priv_define(struct drm_device *dev,
uint32_t user_accounting_size, uint32_t user_accounting_size,
uint32_t svga3d_flags, SVGA3dSurfaceAllFlags svga3d_flags,
SVGA3dSurfaceFormat format, SVGA3dSurfaceFormat format,
bool for_scanout, bool for_scanout,
uint32_t num_mip_levels, uint32_t num_mip_levels,
......
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