Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 167143
b: refs/heads/master
c: 4f49be5
h: refs/heads/master
i:
  167141: 5862527
  167139: d2ca3b6
  167135: 4e878a9
v: v3
  • Loading branch information
Chris Wilson committed Sep 29, 2009
1 parent 3335963 commit e2fe529
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 25 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4781f20f29926ec68715f5cc930273a79fc0a9eb
refs/heads/master: 4f49be546806bf3839daa0601e1c2d4342c93359
48 changes: 24 additions & 24 deletions trunk/drivers/gpu/drm/i915/i915_trace.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,16 +158,16 @@ TRACE_EVENT(i915_gem_request_submit,
TP_ARGS(dev, seqno),

TP_STRUCT__entry(
__field(struct drm_device *, dev)
__field(u32, dev)
__field(u32, seqno)
),

TP_fast_assign(
__entry->dev = dev;
__entry->dev = dev->primary->index;
__entry->seqno = seqno;
),

TP_printk("dev=%p, seqno=%u", __entry->dev, __entry->seqno)
TP_printk("dev=%u, seqno=%u", __entry->dev, __entry->seqno)
);

TRACE_EVENT(i915_gem_request_flush,
Expand All @@ -178,20 +178,20 @@ TRACE_EVENT(i915_gem_request_flush,
TP_ARGS(dev, seqno, flush_domains, invalidate_domains),

TP_STRUCT__entry(
__field(struct drm_device *, dev)
__field(u32, dev)
__field(u32, seqno)
__field(u32, flush_domains)
__field(u32, invalidate_domains)
),

TP_fast_assign(
__entry->dev = dev;
__entry->dev = dev->primary->index;
__entry->seqno = seqno;
__entry->flush_domains = flush_domains;
__entry->invalidate_domains = invalidate_domains;
),

TP_printk("dev=%p, seqno=%u, flush=%04x, invalidate=%04x",
TP_printk("dev=%u, seqno=%u, flush=%04x, invalidate=%04x",
__entry->dev, __entry->seqno,
__entry->flush_domains, __entry->invalidate_domains)
);
Expand All @@ -204,16 +204,16 @@ TRACE_EVENT(i915_gem_request_complete,
TP_ARGS(dev, seqno),

TP_STRUCT__entry(
__field(struct drm_device *, dev)
__field(u32, dev)
__field(u32, seqno)
),

TP_fast_assign(
__entry->dev = dev;
__entry->dev = dev->primary->index;
__entry->seqno = seqno;
),

TP_printk("dev=%p, seqno=%u", __entry->dev, __entry->seqno)
TP_printk("dev=%u, seqno=%u", __entry->dev, __entry->seqno)
);

TRACE_EVENT(i915_gem_request_retire,
Expand All @@ -223,16 +223,16 @@ TRACE_EVENT(i915_gem_request_retire,
TP_ARGS(dev, seqno),

TP_STRUCT__entry(
__field(struct drm_device *, dev)
__field(u32, dev)
__field(u32, seqno)
),

TP_fast_assign(
__entry->dev = dev;
__entry->dev = dev->primary->index;
__entry->seqno = seqno;
),

TP_printk("dev=%p, seqno=%u", __entry->dev, __entry->seqno)
TP_printk("dev=%u, seqno=%u", __entry->dev, __entry->seqno)
);

TRACE_EVENT(i915_gem_request_wait_begin,
Expand All @@ -242,16 +242,16 @@ TRACE_EVENT(i915_gem_request_wait_begin,
TP_ARGS(dev, seqno),

TP_STRUCT__entry(
__field(struct drm_device *, dev)
__field(u32, dev)
__field(u32, seqno)
),

TP_fast_assign(
__entry->dev = dev;
__entry->dev = dev->primary->index;
__entry->seqno = seqno;
),

TP_printk("dev=%p, seqno=%u", __entry->dev, __entry->seqno)
TP_printk("dev=%u, seqno=%u", __entry->dev, __entry->seqno)
);

TRACE_EVENT(i915_gem_request_wait_end,
Expand All @@ -261,16 +261,16 @@ TRACE_EVENT(i915_gem_request_wait_end,
TP_ARGS(dev, seqno),

TP_STRUCT__entry(
__field(struct drm_device *, dev)
__field(u32, dev)
__field(u32, seqno)
),

TP_fast_assign(
__entry->dev = dev;
__entry->dev = dev->primary->index;
__entry->seqno = seqno;
),

TP_printk("dev=%p, seqno=%u", __entry->dev, __entry->seqno)
TP_printk("dev=%u, seqno=%u", __entry->dev, __entry->seqno)
);

TRACE_EVENT(i915_ring_wait_begin,
Expand All @@ -280,14 +280,14 @@ TRACE_EVENT(i915_ring_wait_begin,
TP_ARGS(dev),

TP_STRUCT__entry(
__field(struct drm_device *, dev)
__field(u32, dev)
),

TP_fast_assign(
__entry->dev = dev;
__entry->dev = dev->primary->index;
),

TP_printk("dev=%p", __entry->dev)
TP_printk("dev=%u", __entry->dev)
);

TRACE_EVENT(i915_ring_wait_end,
Expand All @@ -297,14 +297,14 @@ TRACE_EVENT(i915_ring_wait_end,
TP_ARGS(dev),

TP_STRUCT__entry(
__field(struct drm_device *, dev)
__field(u32, dev)
),

TP_fast_assign(
__entry->dev = dev;
__entry->dev = dev->primary->index;
),

TP_printk("dev=%p", __entry->dev)
TP_printk("dev=%u", __entry->dev)
);

#endif /* _I915_TRACE_H_ */
Expand Down
4 changes: 4 additions & 0 deletions trunk/drivers/gpu/drm/i915/intel_display.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3095,6 +3095,7 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc,
struct drm_gem_object *bo;
struct drm_i915_gem_object *obj_priv;
int pipe = intel_crtc->pipe;
int plane = intel_crtc->plane;
uint32_t control = (pipe == 0) ? CURACNTR : CURBCNTR;
uint32_t base = (pipe == 0) ? CURABASE : CURBBASE;
uint32_t temp = I915_READ(control);
Expand Down Expand Up @@ -3181,6 +3182,9 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc,
drm_gem_object_unreference(intel_crtc->cursor_bo);
}

if ((IS_I965G(dev) || plane == 0))
intel_update_fbc(crtc, &crtc->mode);

mutex_unlock(&dev->struct_mutex);

intel_crtc->cursor_addr = addr;
Expand Down

0 comments on commit e2fe529

Please sign in to comment.