diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2013-08-25 10:49:57 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2013-08-25 11:00:32 +0100 |
| commit | 097c2567939f2063749acf0bc768df7bb002d535 (patch) | |
| tree | ce5f4f974ea25bf158fc7e8bec824bd2de03e203 /src/sna/sna_video.h | |
| parent | d7e6e9b83ce029e81767de35124b84914ad7d54b (diff) | |
sna: Add a few more checks for a hosted Xserver before walking CRTC lists
If we are hosted, we do not own the CRTC configuration, and deferencing
the private data structures believing them to be ours, only leads to
disaster.
Based on patches by Christopher James Halse Rogers.
Reported-by: Christopher James Halse Rogers <raof@ubuntu.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/sna_video.h')
| -rw-r--r-- | src/sna/sna_video.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/sna/sna_video.h b/src/sna/sna_video.h index 875f8cce..cbb3ea3b 100644 --- a/src/sna/sna_video.h +++ b/src/sna/sna_video.h @@ -162,10 +162,9 @@ static inline int is_planar_fourcc(int id) } bool -sna_video_clip_helper(ScrnInfoPtr scrn, - struct sna_video *adaptor_priv, +sna_video_clip_helper(struct sna_video *video, struct sna_video_frame *frame, - xf86CrtcPtr * crtc_ret, + xf86CrtcPtr *crtc_ret, BoxPtr dst, short src_x, short src_y, short drw_x, short drw_y, |