-
c8c6ec0d
by Ville Syrjälä
at 2018-02-06T13:11:32Z
sna/video: Try to use hw scaling with SKL+ sprites
SKL reintroduced plane scaling once more. Let's try to make use of it.
The one annoying caveat is that you can't do colorkeying and scaling at
the same time :( For now we'll leave the choice of colorkey vs.
scaling to the user via that XV_ALWAYS_ON_TOP attribute.
One possible idea for improving the situation would be to add support
for autopaint colorkey, and automatically disable the colorkey whenever
the window is not obscured by anything and autopaint colorkey is enabled.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
896122c9
by Ville Syrjälä
at 2018-02-06T13:12:33Z
sna: Make DBG() and ERR() non-empty
Use do{}while(0) for DBG() and ERR() to avoid isses with if/else/etc.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
-
a3a9e99b
by Ville Syrjälä
at 2018-02-06T13:12:33Z
autotools: Nuke IPC_RMID_DEFERRED_RELEASE
IPC_RMID_DEFERRED_RELEASE is unused so nuke it.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
-
781fd07e
by Ville Syrjälä
at 2018-02-06T13:12:33Z
meson: Add meson build system
Allow building the driver with meson. Could probably use
plenty of cleanups, but at least it gives me a working driver.
And I think I managed to make it build everything that
autotools builds.
Quite a few compiler warnings were suppressed as well. Might
want to look at those at some point.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
-
2d6af9e7
by Chris Wilson
at 2018-02-07T19:04:54Z
sna: Switch from ifdef PICT_ to if XORG_VERSION_CURRENT
The PICT_ are enums and so never report true to ifdef PICT_a2r10g10b10
and instead we need to check the xserver version they were introduced.
Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
5c7e4e0e
by Chris Wilson
at 2018-02-08T17:20:55Z
intel: Only check file type bits not mode when searching for rendernodes
Before checking st_rdev, we first need to validate that the file is a
device node, but we only want to check the file type bits and not
compare the permissions.
Reported-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
75795523
by Ville Syrjälä
at 2018-02-14T20:49:26Z
sna/video: Actually use the NV12 shader on gen8
Oops. We never actually select the NV12 shader on gen8, causing
us to render garbage. Looks like this is the only one I somehow
missed.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
9b4f4001
by Ville Syrjälä
at 2018-03-02T15:17:21Z
sna: Add XV_COLORSPACE attribute support for sprite Xv adaptors
Use the new "COLOR_ENCODING" plane property to implement the
XV_COLORSPACE port attribute for sprite Xv adaptors.
v2: assert(colorspace < ARRAY_SIZE) (Chris)
Cc: Jyri Sarha <jsarha@ti.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
aa36399c
by dom.constant@free.fr
at 2018-03-02T15:17:35Z
sna: CustomEDID fix
For my HTPC setup, I'm using the option "CustomEDID".
With this option, output attaching and destroying events leads to
crashes.
The following sequence leads to a crash:
- In xorg.conf: Option "CustomEDID" "HDMI2:/etc/my_edid.bin"
- Starting Xorg
- Connect HDMI2
- Disconnect HDMI2
- Reconnect HDMI2
-> Crash
The crash happens in xf86OutputSetEDID
(xorg/xserver/hw/xfree86/modes/xf86Crtc.c)
at "free(output->MonInfo)". MonInfo is assigned with
sna_output->fake_edid_mon
which is allocated by intel driver in sna_output_load_fake_edid
(src/sna/sna_display.c).
Sequence details:
- Starting Xorg
-> fake_edid_mon is initialized
- Connect HDMI2
-> xf86OutputSetEDID is called:
- MonInfo is NULL
- MonInfo is assigned with fake_edid_mon pointer
- MonInfo is read by Xorg
- Disconnect HDMI2
- Reconnect HDMI2
-> xf86OutputSetEDID is called:
- MonInfo is freed thus also fake_edid_mon
- MonInfo is assigned with fake_edid_mon
- MonInfo is read but it was freed -> CRASH
The fix consists of a new instance of xf86MonPtr for each calls of
xf86OutputSetEDID.
is initialized with fake_edid_raw which render
fake_edid_mon useless.
With this proposal, the behaviour of an EDID override is similar to
a "real" EDID.
Signed-off-by: Dominique Constant <dom.constant@free.fr>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
6c1e70ca
by Chris Wilson
at 2018-03-26T21:41:30Z
sna: Fixup early assert of xf86ScrnToScreen
During early init, xf86ScrnToScreen() may return NULL, so handle that
possibility inside the assert.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
7418d53c
by Chris Wilson
at 2018-03-28T18:42:06Z
sna/dri2: Clip application of damage to windowed swapbuffers
Since forever we have been passing region=NULL when doing a windowed
swapbuffer on vblank, and using that to mark the entire pixmap as being
damaged. For an uncomposited window, this is incorrect as it points to a
clipped region of the ScreenPixmap and so we were marking the entire
ScreenPixmap as being flushed, but only having operated on the windowed
region. Instead pass along the clip extents if region is unset.
References: https://bugs.freedesktop.org/show_bug.cgi?id=105720
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
8f2d0801
by Chris Wilson
at 2018-04-01T12:27:49Z
sna: Force posting of shadow updates for NotifyFd
The update for ABI 22 and NotifyFd left behind an important flush for
shadow rendering.
Fixes: 4ab9145c7748 ("Update to ABI 22 and NotifyFd")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
af36a4ab
by Chris Wilson
at 2018-04-01T12:27:49Z
sna: Defer submission of the next shadow frame until halfway through
Do not immediately post the next shadow flip on completion of the
current flips, but instead queue a timer for half way through the next
vblank so that try to we keep the additional input-output lag to less
than a frame.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
0a8a8529
by Chris Wilson
at 2018-04-03T18:04:10Z
sna: Report the move_to_gpu failed if the allocation failed
Do not try and workaround the failure by forcing the wait-for-flip as we
may be inside a vblank handler already. Just report the move failed and
expect the caller to skip the draw, fairly standard practice for
allocation failure handling (stale output rather than crash).
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
ca6a57d5
by Chris Wilson
at 2018-04-03T18:08:21Z
sna: Skip shadow redisplay if flips still pending
We shouldn't even be attempting to redisplay if there are flips pending,
so exit early and expect to be called again after the pending flips
complete. Exiting early avoids having to call sna_mode_wakeup() in what
used to be a potentially recursive manner (see commit af36a4ab78cc
"sna: Defer submission of the next shadow frame until halfway through").
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
12db28ab
by Chris Wilson
at 2018-04-03T18:23:26Z
sna: Reorder vblank/flip event handling to avoid TearFree recursion
TearFree wants to grab the most recently used scanout for rendering the
next frame into. If the flip event was still pending, we would then
query the drm event buffer for any pending completions, but this would
proceed to execute all the other events before the flip events as well.
Since we they were out of sequence, we pushed them into a buffer to
execute afterwards, however we forgot the side effects of the flip
handlers, for example see commit af36a4ab78cc ("sna: Defer submission
of the next shadow frame until halfway through") and that there may have
been events read from drm into a local buffer inside sna_mode_wakeup()
that haven't been processed yet.
Eliminate the need for calling sna_mode_wakeup() by ensuring that all
flip events have been completed first before handing the vblank
callbacks and potential drawing, ensuring the correct ordering.
References: https://bugs.freedesktop.org/show_bug.cgi?id=105720
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
4953aa13
by Chris Wilson
at 2018-04-04T12:21:04Z
sna: Always sync before using mmap pointers in memcpy_copy_boxes
kgem_bo_map__(cpu|gtt) leaves the sync up to the caller, in particular
so that the obtaining the pointer and controlling the cache domains are
not conflated and can be separated. However, it does mean that the
caller can not assume that obtaining the pointer updates the cache
domains, as it does not. memcpy_copy_boxes fell into this trap.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
d9bf46e4
by Chris Wilson
at 2018-04-04T14:20:01Z
sna: Discard the per-crtc TearFree back buffer on resize
When we mix TearFree and per-crtc pixmaps (e.g. for RandR transformations),
we stash the old buffer on the CRTC for double buffering. However, this
buffer needs to be reallocated when we change output resolutions, as the
CRTC size may change.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
846879ae
by Chris Wilson
at 2018-04-05T23:54:33Z
sna: Fix the relocation dword for stippled_1_blt
We were telling the kernel the correct location for it to fill the
64b relocation, but we were writing the presumed offset into the wrong
pair of dwords in the batch ourselves. For the frequent case where we
used a new upload buffer, the kernel would perform the fixup and correct
our mistake, but if we happened to reuse a buffer then we told the gpu
to source the stipple from the wrong address.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105886
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
84eaaba2
by Chris Wilson
at 2018-04-05T23:56:45Z
sna: Add some debug output for clipping in stippled_1_blt
Having just chased a bug along this path, I found the following debug
helpful in a narrowing down why certain paths were chosen.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
16820c4b
by Chris Wilson
at 2018-04-13T09:43:17Z
sna: Handle wedged devices during sna_crtc_redisplay
If the device is already wedged (no GPU), jump straight to the swrast
path for performing the per-crtc transformations.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105420
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
02dfb919
by Chris Wilson
at 2018-04-15T14:47:37Z
sna/present: Only add the first element to the Timer queue
TimerSet scales linearly with the number of elements in the queue as it
performs an insertion sort, duplicating the sorting we also perform to
keep the per-crtc vblank queue in an orderly fashion. As we already
maintain the ordered timeline of vblanks, we can simply queue the next
when the current vblank completes.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
0cf51c7e
by Ville Syrjälä
at 2018-04-24T11:58:09Z
sna/video/sprite: Remove stale video->plane
video->plane is never populated so nuke it. Its only user can be nuked
as well since all it's trying to do is turn off the plane (which fails
on account plane_id being zero). We don't need to disable the plane
immediately upon the setplane failure as the higher level code will
end up stopping the entire port on error, and thus the plane will get
disabled just fine.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
d7dfab62
by Ville Syrjälä
at 2018-04-24T12:01:02Z
sna/video/sprite: Retry with GPU scaling if setplane fails
The kernel may reject the setplane due to eg. exceeding the max
downscaling limit of the hardware. In that case let's retry the
operation but let the GPU do the scaling for us.
Tested on my IVB, after hacking the kernel to reject setplane
which exceeds the max hw downscaling limit.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
8b90ab04
by Liwei Song
at 2018-05-02T09:47:06Z
Add Coffeelake PCI IDs for H Skus
Add the Coffeelake PCI IDs based on the following kernel patches:
commit ccfd13215fd25a0e8c28221f3acc0dcaec11cd15
Author: Anusha Srivatsa <anusha.srivatsa@intel.com>
Date: Thu Jun 8 16:41:06 2017 -0700
drm/i915/cfl: Add Coffee Lake PCI IDs for H Sku.
Signed-off-by: Liwei Song <liwei.song@windriver.com>
-
e7bfc906
by Liwei Song
at 2018-05-02T09:47:25Z
Add Coffeelake PCI IDs for U Skus
Add the Coffeelake PCI IDs based on the following kernel patch:
commit d29fe702c9cb682df99146d24d06e5455f043101
Author: Anusha Srivatsa <anusha.srivatsa@intel.com>
Date: Thu Jun 8 16:41:07 2017 -0700
drm/i915/cfl: Add Coffee Lake PCI IDs for U Sku.
Signed-off-by: Liwei Song <liwei.song@windriver.com>
-
35947721
by Chris Wilson
at 2018-05-12T09:01:10Z
configure: Set DRI1 to autodiscover
We only need DRI1 to support UMS on i810, but modern Xservers don't
support DRI1 and the support infrastructure is no longer being shipped
on some distributions. Gracefully fail if we can't compile the DRI1
code blocks for i810.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
d3c93e66
by Ville Syrjälä
at 2018-05-31T19:35:13Z
Remove duplicate exa_wm_yuv_rgb.g5a shader source
exa_wm_yuv_rgb.g5a is identical to exa_wm_yuv_rgb.g4a. Just use a
symlink intead of duplicating the whole file.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
35a9e969
by Ville Syrjälä
at 2018-05-31T19:35:30Z
Rename current yuv->rgb shader sources to exa_wm_yuv_rgb_bt601
Our current yuv->rgb shaders follow the BT.601 conversion formula.
Rename the shader sources to indicate that fact.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
e4f2b5d5
by Ville Syrjälä
at 2018-05-31T19:35:32Z
sna/video: Add XV_COLORSPACE attribute for the textured Xv adaptor
Allow the client to select between BT.601 and BT.709 via the
XV_COLORSPACE port attribute with the textured Xv adaptor as well.
Since the BT.601 coefficients are currently hardcoded in the
yuv->rgb shader, let's just add a mostly duplicated shader with
hardcoded BT.709 coefficients instead. Not the most elegant solution
but avoids having to touch any state setup etc.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
d2a21702
by Ville Syrjälä
at 2018-05-31T19:35:34Z
sna/video/sprite: Add sprite planes in order
On SKL+ dst color keying only works between the first sprite and the
primary. We probably wante the first Xv port to be the first sprite
plane so that the user gets working colorkeying for the port that is
most likely to be used first. No way to get dst colorkeying with the
other ports :(
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
9c281c62
by Ville Syrjälä
at 2018-05-31T19:35:38Z
sna/video/sprite: Query planes for RGB565
Not all sprite planes support RGB565. Insrtead of hardcoding which
platforms have it let's ask the kernel instead.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
13ac0a81
by Ville Syrjälä
at 2018-05-31T19:35:40Z
sna/video/sprite: Add NV12 support
Starting from ~KBL planes can do NV12. Let's make use that
capability in the sprite Xv adaptor.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
bb5ee1ad
by Ville Syrjälä
at 2018-05-31T19:35:43Z
sna/video/sprite: Make NV12 take the GPU scaling fallback
Even unscaled NV12 needs the plane scaler on SKL+, so when
unscaled NV12 setplane fails we should still take the GPU
scaling fallback path.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
42c24d32
by Ville Syrjälä
at 2018-05-31T19:35:44Z
sna/video/sprite: Try disabling plane before giving up on colorkey
When we're trying to reinstate the colorkey we might fail on account of
the plane still being enable with a configuration that prevent the
use of colorkey. This happens easily with NV12 since the plane scaler
required by even unscaled NV12 is not compatible with colorkey.
To work around the problem let's try disabling the plane first, then
re-enable the colorkey, and finally we will try to re-enable the plane.
The plane re-enable may fail, in which case we'll head to the GPU
scaling fallback path. The cost is a flash of the colorkey when the
plane blink off and then back on.
Help me atomic ioctl, you're my only hope!
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
ce31859a
by Ville Syrjälä
at 2018-06-09T13:10:21Z
sna/video/sprite: Remove the XV_ALWAYS_ON_TOP restriction for SKL+ scaling
On SKL+ the dst colorkey is enabled on the primary plane instead of the
sprite plane. That means the restriction of scaling vs. keying doesn't
actually apply here as we never scale the primary. So let's remove
the requirement of having XV_ALWAYS_ON_TOP enabled to get hw scaling.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
-
3d395062
by Ville Syrjälä
at 2018-06-09T13:10:46Z
meson: Add libdrm dependency for intel_drv
Looks like we need a libdrm dep on intel_drv. Build fails for me on
Arch.
In file included from ../src/intel_device.c:51:
/usr/include/xf86drm.h:40:10: fatal error: drm.h: No such file or directory
#include <drm.h>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
-
a3bccba5
by Chris Wilson
at 2018-09-05T14:54:33Z
sna: Select the correct depth for addfb in test_has_dirtyfb()
It's 32bpp, depth 24 (for x8r8g8b8 pixel format), not 32 for everything.
Just to be on the safe side, pick the more common x8r8g8b8 format.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
ac81d31f
by Chris Wilson
at 2018-09-05T14:54:53Z
sna: Disable the reduced flush optimisation
Deferring the flush until Mesa checks its DRI2 buffer status only works
so long as Mesa is checking its DRI2 buffers. Hint, it doesn't....
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97914
References: https://bugs.freedesktop.org/show_bug.cgi?id=52930
References: https://bugs.freedesktop.org/show_bug.cgi?id=90264
References: https://bugs.freedesktop.org/show_bug.cgi?id=101819
References: https://bugs.freedesktop.org/show_bug.cgi?id=101620
Fixes: 1f6dfc9df678 ("sna: Only flush GPU bo for a damage event")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
d44274e1
by Liwei Song
at 2018-09-05T15:04:28Z
Adding more Coffee Lake PCI IDs
Add more Coffeelake PCI IDs based on the following kernel patch:
commit c99d7832dcd7423ba352386107118b9bd8b83158
Author: Rodrigo Vivi <rodrigo.vivi@intel.com>
Date: Wed Dec 20 10:29:19 2017 -0800
drm/i915/cfl: Adding more Coffee Lake PCI IDs.
Signed-off-by: Liwei Song <liwei.song@windriver.com>
-
00184dc0
by Chris Wilson
at 2018-09-05T15:05:21Z
Sync i915_pciids upto d0e062ebb3a4
Import the kernel's i915_pciids.h, up to
commit d0e062ebb3a44b56a7e672da568334c76f763552
Author: Rodrigo Vivi <rodrigo.vivi@intel.com>
Date: Fri Aug 3 16:27:21 2018 -0700
drm/i915/cfl: Add a new CFL PCI ID.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
25c9a2fc
by Chris Wilson
at 2018-09-06T12:00:04Z
sna: Check for incoherent writes through the GTT
Sometimes the write simply do not land until later, requiring us to be
very careful in how we perform domain tracking.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
-
28498b87
by Timo Aaltonen
at 2018-09-25T12:07:37Z
Merge branch 'upstream-unstable' into debian-unstable
-
e70cb9f0
by Timo Aaltonen
at 2018-09-25T12:11:40Z
bump the version
-
fecda19e
by Timo Aaltonen
at 2018-09-25T12:14:27Z
control: Update VCS urls.
-
851f69d9
by Timo Aaltonen
at 2018-09-25T12:28:51Z
rules: Fix destdir, use dh_missing.
-
5463c52b
by Timo Aaltonen
at 2018-09-25T12:36:27Z
upload to unstable