Commit Graph

3417 Commits

Author SHA1 Message Date
Cyril Brulebois fc2eb64d7a xvmc: Silence gcc, add parentheses around arithmetic.
Get rid of those accordingly with CFLAGS="-Wall -Werror":
|   CC     i915_xvmc.lo
| cc1: warnings being treated as errors
| i915_xvmc.c: In function ‘i915_mc_one_time_state_emit’:
| i915_xvmc.c:369: error: suggest parentheses around arithmetic in operand of ‘|’
| i915_xvmc.c:374: error: suggest parentheses around arithmetic in operand of ‘|’
| i915_xvmc.c:379: error: suggest parentheses around arithmetic in operand of ‘|’
| i915_xvmc.c: In function ‘i915_mc_load_indirect_render_emit’:
| i915_xvmc.c:708: error: suggest parentheses around arithmetic in operand of ‘|’
| i915_xvmc.c:713: error: suggest parentheses around arithmetic in operand of ‘|’

Signed-off-by: Cyril Brulebois <kibi@debian.org>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2011-01-31 09:59:04 +00:00
Cyril Brulebois 1b9349bceb xvmc: Silence gcc, add parentheses around assignment.
Get rid of the following with CFLAGS="-Wall -Werror":
|   CC     intel_xvmc_dump.lo
| cc1: warnings being treated as errors
| intel_xvmc_dump.c: In function ‘intel_xvmc_dump_open’:
| intel_xvmc_dump.c:41: error: suggest parentheses around assignment used as truth value

Signed-off-by: Cyril Brulebois <kibi@debian.org>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2011-01-31 09:58:33 +00:00
Cyril Brulebois ae8877e307 xvmc: Get rid of unused variables.
Signed-off-by: Cyril Brulebois <kibi@debian.org>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2011-01-31 09:58:11 +00:00
Chris Wilson 8bd6a7149f Enable conditional compilation of asserts
With '--disable-debug' we define NDEBUG and so disable the asserts, that
is we continue to default to compiling asserts into the code.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2011-01-29 12:06:59 +00:00
Chris Wilson a5a1ab7bbc i915: Remove unused 'w' and 'h'
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2011-01-28 17:20:06 +00:00
Chris Wilson 2c9b3225d8 i915: Remove unused 'num_floats' variable
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2011-01-28 17:19:39 +00:00
Chris Wilson c6dc27562a uxa: Only recreate the glyph cache on *generational* updates
The screen resources are recreated when the screen is rotated as well,
without being finalized. In this case, we do not need to reconstuct the
cache (or if we did, we would need to tear it down first).

Reported-by: Till Matthiesen <entropy@everymail.net>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=33412
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2011-01-24 20:29:57 +00:00
Xiang, Haihao 5baa63c634 Fix an error in 4c4ad55556.
See the original patch at https://bugs.freedesktop.org/show_bug.cgi?id=24767

Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
2011-01-21 09:02:16 +08:00
Chris Wilson 3e28a0c0b4 Create the UXA generational resources during screen create
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2011-01-20 15:13:33 +00:00
Xiang, Haihao 4c4ad55556 Correct offset of planes within clipped window
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=24767
Reported-and-tested-by: Sitsofe Wheeler <sitsofe@yahoo.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2011-01-19 15:25:45 +00:00
Eric Anholt 5a22bc999d Quiet compiler warning about is_affine_src same way we do is_affine_mask. 2011-01-17 11:32:37 -08:00
Simon Farnsworth 3a2a4b0784 Fix textured video when destination is larger than screen
In our application, the screen is never rotated from the point of view
of the driver; instead, the compositor applies a suitable rotation as
it composites the display. This works fine on 945, but on 965, videos
are limited in height to the actual height of the screen.

Change various bits of code so that we use the width and height of the
destination pixmap instead of the width and height of the virtual
screen. This works correctly both for XVideo to offscreen storage
(CompositeRedirect) and for XVideo to the screen (no compositor).
2011-01-17 11:31:38 -08:00
Chris Wilson fd9235ebe0 Delete unused memory allocation flags.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2011-01-08 19:46:37 +00:00
Chris Wilson 03248a7984 Cache the fixed crtc<->pipe relationship
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2011-01-08 19:46:36 +00:00
Chris Wilson 00a2aee38d Remove unused I830Output
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2011-01-08 19:46:36 +00:00
Chris Wilson a851879695 Remove bitrotted, but fortunately unused, I830CrtcPrivate
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2011-01-08 19:46:36 +00:00
Chris Wilson f8a5d7737e Delete some dead code
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2011-01-08 19:46:36 +00:00
Chris Wilson 968151898b Remove unused GTT/Map sizes and addresses
These have been made obsolete by KMS and GEM.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2011-01-08 19:46:36 +00:00
Chris Wilson 19b5817a54 Remove unused struct _intel_memory definition
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2011-01-08 19:46:36 +00:00
Chris Wilson 40a7bde914 configure: version bump for 2.14.0 2011-01-07 23:46:07 +00:00
Chris Wilson 8ecbba2aca NEWS: Release notes for 2.14.0 2011-01-07 23:45:06 +00:00
Chris Wilson 22d7b61791 i965: Fix off-by-one in assert
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2011-01-04 12:32:01 +00:00
Chris Wilson a7c7a9108f configure: version bump for 2.13.903 snapshot
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2011-01-04 10:53:30 +00:00
Chris Wilson 3fbecf3463 NEWS: Add entry for 2.13.903
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2011-01-04 10:52:44 +00:00
U. Artie Eoff 90538ecfff configure: suggest upstream to find macros in case they're missing.
added upstream suggestion to error message in case xorg macros or
xserver macros are missing. removed package manager references in
suggestion since these are 'user' and/or 'distribution' preferences.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2011-01-04 10:44:46 +00:00
Chris Wilson 6d50f5a140 If the crtc is not enabled, then it can't be on
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2011-01-03 23:06:14 +00:00
Adam Jackson 145c42a101 dri2: Fix interlace computation
scrn->currentMode is a hack for xf86vidmode and in general is wrong for
RANDRful drivers.  Use the mode on the associated CRTC instead.

Signed-off-by: Adam Jackson <ajax@redhat.com>
[ickle: crtc->mode is a ModeRec not Ptr]
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2011-01-03 23:04:13 +00:00
Adam Jackson b0d10ff04a xv: Fix interlace computation
scrn->currentMode is a hack for xf86vidmode and in general is wrong for
RANDRful drivers.  Use the mode on the associated CRTC instead.

Signed-off-by: Adam Jackson <ajax@redhat.com>
[ickle: crtc->mode is a ModeRec]
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2011-01-03 23:02:49 +00:00
Chris Wilson 0ad6d6e1a6 dri: Only issue a warning for an "impossible" flip return 5 times
As it appears that some kernels do indeed return the "wrong" value,
issuing a warning 60 times a second is a cruel and unusual punishment.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=32680
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2011-01-03 16:54:31 +00:00
Chris Wilson d729ef02f2 dri: Don't wait upon a NULL current mode
There is a race condition between the dri swapbuffers code and
hotplugging whereby we might attempt to execute a wait upon a
non-existent output. This causes a NULL dereference and a loud crash.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=32770
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2011-01-02 09:11:10 +00:00
Chris Wilson 537fa55ed2 dri: Fix the use of the uninitialised bo for flink
Reported-by: Jeff Chua <jeff.chua.linux@gmail.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2011-01-02 09:06:28 +00:00
Chris Wilson dbc542b9d3 dri: Protect against using dri with an non-gem pixmap
Reported-by: Jeff Chua <jeff.chua.linux@gmail.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2010-12-31 23:29:31 +00:00
Chris Wilson 53fbc9f176 Don't replace the scanout bo through PutImage
As the bo may be pinned for either use by the scanout or through sharing
with another application, under those circumstances we cannot replace
the bo itself but must force the blit for PutImage.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=31367
Reported-and-tested-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2010-12-30 16:48:52 +00:00
Chris Wilson 7667ad8432 dri: Differentiate identical "get vblank failed" messages with line no
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2010-12-24 09:42:29 +00:00
Chris Wilson 875d482835 i830: amalgamate consecutive composites into a single primitive
Improve aa10text on i845 from 218kglyphs/s to 234kglyphs/s

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2010-12-23 19:42:19 +00:00
Chris Wilson 58d9912e44 Remove the deprecated function 'XNFprintf'
As we know the maximum length of the string, we can replace our single
usage of XNFprintf with snprintf.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2010-12-22 13:50:53 +00:00
Chris Wilson e8db77e019 Revert "Suggest where to find xorg-macros in case it's missing"
I failed my reading comprehension and didn't spot that the help strings
pointed to two separate downstream packages.

Thanks to Carl Worth for pointing out my mistake.

This reverts commit ebb7aca667.
2010-12-21 23:03:21 +00:00
Chris Wilson ebb7aca667 Suggest where to find xorg-macros in case it's missing
[Modified version of U. Artie Eoff's commit to remove the duplicated
string. The paraphrased commit message is repeated below for clarity.]

xorg-macros is often package under an unusual name, so provide some
clues as to what name to try on the user's distribution. Installing
build-deps would be just too easy...

Also include a check for the existence of the XORG_DRIVER_CHECK_EXT
macro, otherwise configure might continue in spite of the missing macro
and cause obtuse syntax errors.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2010-12-21 22:35:49 +00:00
U. Artie Eoff 90576f95f3 configure: updated m4 macro check in configure.ac
Added m4 check for XORG_DRIVER_CHECK_EXT macro definition.  Updated m4 fatal messages to give better hint on how to resolve error when xorg macros are missing.  Previously, configure would continue in spite of the missing macros and the build would fail for syntax errors.
2010-12-21 14:19:13 -08:00
Chris Wilson 1ac2e04023 Undo: Disable BLT for i830 and 845G
Reported-by: György Balló  <ballogy@freestart.hu>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=32482
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2010-12-20 10:59:28 +00:00
Chris Wilson 6f21405454 G35 is gen4 and not gen3
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=32478
Reported-and-tested-by: Michal Marek <mmarek@suse.cz>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2010-12-20 10:49:42 +00:00
Mario Kleiner 5743c22387 Check consistency of pageflip completion vblank count.
Implements a consistency check on returned vblank
count values of pageflip completion. Impossible
values are detected, a x-warning is logged and
returned (msc,ust) values are marked invalid,
so clients could perform error handling. Such
a warning would indicate bugs in the pageflip
completion routine of future kms drivers or the
ddx and thereby aid driver debugging.

Signed-off-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2010-12-16 11:42:43 +00:00
Mario Kleiner 2177e60321 Fix reporting of pageflip completion events on multi-head.
When a drawable is page-flipped on multiple crtc's (fullscreen
drawable on mirror-mode or multi-head x-screen), only one pageflip
event is finally delivered, after the last participating crtc signals
flip completion, this to avoid visual corruption.

Old code returned vblank count and timestamps of flip completion
of this last crtc, instead of the values of the "master crtc", the
one that was used for initially scheduling/triggering the pagflip
via vblank events. (master = I830DRI2DrawablePipe(drawable))

This patch makes sure that the pageflip completion values of the
"master" crtc are returned, otherwise client applications will
get confused by the random (msc, ust) values returned by whichever
crtc was the last to complete its flip. Without this, the returned
values change randomly and jump forward and backward in time and
count.

Signed-off-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2010-12-16 11:42:43 +00:00
Chris Wilson 71af40a75f NEWS: 2.14, I meant the upcoming 2.14 release!
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2010-12-10 15:55:09 +00:00
Chris Wilson 556331a221 configure: version bump for 2.13.902
This is actually the first release candidate for 2.14.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2010-12-10 15:28:37 +00:00
Chris Wilson e01ea4a45c NEWS: Add entry for the 2.13.902 snapshot
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2010-12-10 15:28:00 +00:00
Chris Wilson 8df6f0a608 configure: Bump required libdrm to 2.4.23
To pull in the required headers for BLT and relaxed fencing support.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2010-12-10 12:26:16 +00:00
Chris Wilson 9b967807c2 Revert "i965: The RenderCache flush after every glyph is required for compiz"
This reverts commit 03e8351179.

* sigh.

This was only meant to be a temporary debugging hack, not for public
consumption (or embarrassment).

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2010-12-07 20:47:17 +00:00
Chris Wilson 27e33928f8 i965: Mark sure we mark reused render targets as dirty
... or else we may forget to flush them again.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2010-12-07 20:43:22 +00:00
Chris Wilson 03e8351179 i965: The RenderCache flush after every glyph is required for compiz
... now who can explain why.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2010-12-07 19:27:57 +00:00