diff options
| author | Dave Airlie <airlied@gmail.com> | 2014-03-02 05:54:31 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2014-03-02 05:54:31 -0500 |
| commit | 49e893b5975102e30be1bf79e002a754f3bf6da8 (patch) | |
| tree | 47bc913f53068c5f33a867fce9a0251544766aad /drivers/gpu/drm/vmwgfx/svga3d_reg.h | |
| parent | b0447888dc29f4fb91c3b3b02e3f1f0bfc6e1222 (diff) | |
| parent | 6950e23e54b1c94abf8c60c1ddfac79133d41de2 (diff) | |
Merge tag 'vmwgfx-fixes-3.14-2014-03-02' of git://people.freedesktop.org/~thomash/linux into drm-fixes
A couple of minor fixes.
Pull request of 2014-03-02
* tag 'vmwgfx-fixes-3.14-2014-03-02' of git://people.freedesktop.org/~thomash/linux:
drm/vmwgfx: avoid null pointer dereference at failure paths
drm/vmwgfx: Make sure backing mobs are cleared when allocated. Update driver date.
drm/vmwgfx: Remove some unused surface formats
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/svga3d_reg.h')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/svga3d_reg.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/gpu/drm/vmwgfx/svga3d_reg.h b/drivers/gpu/drm/vmwgfx/svga3d_reg.h index bb594c11605e..f58dc7dd15c5 100644 --- a/drivers/gpu/drm/vmwgfx/svga3d_reg.h +++ b/drivers/gpu/drm/vmwgfx/svga3d_reg.h | |||
| @@ -261,12 +261,7 @@ typedef enum SVGA3dSurfaceFormat { | |||
| 261 | /* Planar video formats. */ | 261 | /* Planar video formats. */ |
| 262 | SVGA3D_YV12 = 121, | 262 | SVGA3D_YV12 = 121, |
| 263 | 263 | ||
| 264 | /* Shader constant formats. */ | 264 | SVGA3D_FORMAT_MAX = 122, |
| 265 | SVGA3D_SURFACE_SHADERCONST_FLOAT = 122, | ||
| 266 | SVGA3D_SURFACE_SHADERCONST_INT = 123, | ||
| 267 | SVGA3D_SURFACE_SHADERCONST_BOOL = 124, | ||
| 268 | |||
| 269 | SVGA3D_FORMAT_MAX = 125, | ||
| 270 | } SVGA3dSurfaceFormat; | 265 | } SVGA3dSurfaceFormat; |
| 271 | 266 | ||
| 272 | typedef uint32 SVGA3dColor; /* a, r, g, b */ | 267 | typedef uint32 SVGA3dColor; /* a, r, g, b */ |