Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 205137
b: refs/heads/master
c: 11824e8
h: refs/heads/master
i:
  205135: 2efa747
v: v3
  • Loading branch information
Chris Wilson authored and Eric Anholt committed Aug 2, 2010
1 parent 198a8cf commit 78d2765
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2dafb1e082c541d4bc0f275a6ffa9c39da690f01
refs/heads/master: 11824e8c4e8a1279ee209173da777b2295b72e82
4 changes: 2 additions & 2 deletions trunk/drivers/gpu/drm/i915/i915_drv.h
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,7 @@ struct drm_i915_gem_object {
*
* Size: 4 bits for 16 fences + sign (for FENCE_REG_NONE)
*/
int fence_reg : 5;
signed int fence_reg : 5;

/**
* Used for checking the object doesn't appear more than once
Expand Down Expand Up @@ -709,7 +709,7 @@ struct drm_i915_gem_object {
*
* In the worst case this is 1 + 1 + 1 + 2*2 = 7. That would fit into 3
* bits with absolutely no headroom. So use 4 bits. */
int pin_count : 4;
unsigned int pin_count : 4;
#define DRM_I915_GEM_OBJECT_MAX_PIN_COUNT 0xf

/** AGP memory structure for our GTT binding. */
Expand Down

0 comments on commit 78d2765

Please sign in to comment.