korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-18 16:44:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
6441ab5f8f
linux/drivers/gpu/drm/vmwgfx
History
Daniel Vetter 398b7a1b88 Linux 3.6-rc7 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
 iQEcBAABAgAGBQJQX7MuAAoJEHm+PkMAQRiG0h0IAJURkrMCAQUxA+Ik66ReH89s
 LQcVd0U9uL4UUOi7f5WR64Vf9Cfu6VVGX9ZKSvjpNskvlQaUQPMIt4pMe6g4X4dI
 u0bApEy4XZz3nGabUAghIU8jJ8cDmhCG6kPpSiS7pi7KHc0yIa4WFtJRrIpGaIWT
 xuK38YOiOHcSDRlLyWZzainMncQp/ixJdxnqVMTonkVLk0q0b84XzOr4/qlLE5lU
 i+TsK3PRKdQXgvZ4CebL+srPBwWX1dmgP3VkeBloQbSSenSeELICbFWavn2ml+sF
 GXi4dO93oNquL/Oy5SwI666T4uNcrRPaS+5X+xSZgBW/y2aQVJVJuNZg6ZP/uWk=
 =0v2l
 -----END PGP SIGNATURE-----

Merge tag 'v3.6-rc7' into drm-intel-next-queued

Manual backmerge of -rc7 to resolve a silent conflict leading to
compile failure in drivers/gpu/drm/i915/intel_hdmi.c.

This is due to the bugfix in -rc7:

commit b98b601672
Author: Wang Xingchao <xingchao.wang@intel.com>
Date:   Thu Sep 13 07:43:22 2012 +0800

    drm/i915: HDMI - Clear Audio Enable bit for Hot Plug

Since this code moved around a lot in -next git put that snippet at
the wrong spot. I've tried to fix this by making the conflict explicit
by merging a version for next with:

commit 3cce574f01
Author: Wang Xingchao <xingchao.wang@intel.com>
Date:   Thu Sep 13 11:19:00 2012 +0800

    drm/i915: HDMI - Clear Audio Enable bit for Hot Plug unconditionally

But that failed to solve the entire problem. To avoid pushing out
further -nightly branch to our QA where this is broken, do the
backmerge and manually add the stuff git adds to -next from the patch
in -fixes.

Note that this doesn't show up in git's merge diff (and hence is also
not handled by git rerere), which adds to the reasons why I'd like to
fix this with a verbose backmerge. The git merge diff only shows a
bunch of trivial conflicts of the "code changed in lines next to each
another" kind.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-09-24 18:17:12 +02:00
..
Kconfig drm/vmwgfx: allow a kconfig option to choose if fbcon is enabled 2012-09-07 13:24:34 +10:00
Makefile vmwgfx: Add screen object support 2011-10-05 10:17:14 +01:00
svga3d_reg.h vmwgfx: Update register files to latest from vmware-sdk 2011-10-05 10:17:08 +01:00
svga_escape.h vmwgfx: Update register files to latest from vmware-sdk 2011-10-05 10:17:08 +01:00
svga_overlay.h vmwgfx: Update register files to latest from vmware-sdk 2011-10-05 10:17:08 +01:00
svga_reg.h vmwgfx: Update register files to latest from vmware-sdk 2011-10-05 10:17:08 +01:00
svga_types.h
vmwgfx_buffer.c drm/ttm: isolate dma data from ttm_tt V4 2011-12-06 10:40:02 +00:00
vmwgfx_dmabuf.c vmwgfx: Fix up query processing 2011-10-05 10:17:22 +01:00
vmwgfx_drv.c Linux 3.6-rc7 2012-09-24 18:17:12 +02:00
vmwgfx_drv.h vmwgfx: add dumb ioctl support 2012-09-13 11:42:31 +10:00
vmwgfx_execbuf.c vmwgfx: Make it possible to get fence from execbuf 2012-02-13 12:01:33 +00:00
vmwgfx_fb.c vmwgfx: Pick up the initial size from the width and height regs 2012-02-13 12:01:35 +00:00
vmwgfx_fence.c vmwgfx: Clean up pending event references to struct drm_file objects on close 2012-02-13 12:01:32 +00:00
vmwgfx_fence.h vmwgfx: Move function declaration to correct header 2012-02-13 12:01:36 +00:00
vmwgfx_fifo.c vmwgfx: Use the revised fifo hw version register when present 2011-12-19 14:06:00 +00:00
vmwgfx_gmr.c drm/vmwgfx: Fix nasty write past alloced memory area 2012-06-01 17:00:20 +01:00
vmwgfx_gmrid_manager.c vmwgfx: Restrict number of GMR pages to device limit 2011-09-01 09:38:07 +01:00
vmwgfx_ioctl.c vmwgfx: Remove dmabuf check in present ioctl 2011-12-19 14:06:01 +00:00
vmwgfx_irq.c vmwgfx: Add fence events 2011-10-10 15:46:55 +01:00
vmwgfx_kms.c vmwgfx: remove useless set memory to zero use memset() 2012-09-13 11:34:34 +10:00
vmwgfx_kms.h vmwgfx: Add page flip support 2012-02-13 12:01:35 +00:00
vmwgfx_ldu.c vmwgfx: Pick up the initial size from the width and height regs 2012-02-13 12:01:35 +00:00
vmwgfx_marker.c vmwgfx: Fix confusion caused by using "fence" in various places 2011-09-06 11:48:40 +01:00
vmwgfx_overlay.c vmwgfx: minor dmabuf utilities cleanup 2011-10-05 10:17:20 +01:00
vmwgfx_reg.h drm/vmwgfx: Add DRM driver for VMware Virtual GPU 2009-12-15 08:38:43 +10:00
vmwgfx_resource.c vmwgfx: add dumb ioctl support 2012-09-13 11:42:31 +10:00
vmwgfx_scrn.c vmwgfx: Pick up the initial size from the width and height regs 2012-02-13 12:01:35 +00:00
vmwgfx_ttm_glue.c vmwgfx: Remove the possibility to map the fifo from user-space 2011-09-06 11:48:34 +01:00