kernel: added 2 patches for i915 drm (Arch), enable firewire, disable linux logo.
This commit is contained in:
Juan RP
parent
68335665c6
commit
6e7cb998ac
|
|
@ -1715,7 +1715,11 @@ CONFIG_FUSION_CTL=m
|
|||
#
|
||||
# IEEE 1394 (FireWire) support
|
||||
#
|
||||
# CONFIG_FIREWIRE is not set
|
||||
CONFIG_FIREWIRE=m
|
||||
CONFIG_FIREWIRE_OHCI=m
|
||||
CONFIG_FIREWIRE_OHCI_DEBUG=y
|
||||
CONFIG_FIREWIRE_SBP2=m
|
||||
CONFIG_FIREWIRE_NET=m
|
||||
CONFIG_FIREWIRE_NOSY=m
|
||||
CONFIG_I2O=m
|
||||
CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
|
||||
|
|
@ -3408,6 +3412,12 @@ CONFIG_DVB_PLUTO2=m
|
|||
#
|
||||
CONFIG_DVB_DM1105=m
|
||||
|
||||
#
|
||||
# Supported FireWire (IEEE 1394) Adapters
|
||||
#
|
||||
CONFIG_DVB_FIREDTV=m
|
||||
CONFIG_DVB_FIREDTV_INPUT=y
|
||||
|
||||
#
|
||||
# Supported Earthsoft PT1 Adapters
|
||||
#
|
||||
|
|
@ -3731,10 +3741,10 @@ CONFIG_FONT_8x16=y
|
|||
# CONFIG_FONT_SUN8x16 is not set
|
||||
# CONFIG_FONT_SUN12x22 is not set
|
||||
# CONFIG_FONT_10x18 is not set
|
||||
CONFIG_LOGO=y
|
||||
CONFIG_LOGO_LINUX_MONO=y
|
||||
CONFIG_LOGO_LINUX_VGA16=y
|
||||
CONFIG_LOGO_LINUX_CLUT224=y
|
||||
# CONFIG_LOGO is not set
|
||||
# CONFIG_LOGO_LINUX_MONO is not set
|
||||
# CONFIG_LOGO_LINUX_VGA16 is not set
|
||||
# CONFIG_LOGO_LINUX_CLUT224 is not set
|
||||
CONFIG_SOUND=m
|
||||
CONFIG_SOUND_OSS_CORE=y
|
||||
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
|
||||
|
|
@ -3890,6 +3900,10 @@ CONFIG_SND_USB_CAIAQ=m
|
|||
CONFIG_SND_USB_CAIAQ_INPUT=y
|
||||
CONFIG_SND_USB_US122L=m
|
||||
CONFIG_SND_USB_6FIRE=m
|
||||
CONFIG_SND_FIREWIRE=y
|
||||
CONFIG_SND_FIREWIRE_LIB=m
|
||||
CONFIG_SND_FIREWIRE_SPEAKERS=m
|
||||
CONFIG_SND_ISIGHT=m
|
||||
CONFIG_SND_SOC=m
|
||||
CONFIG_SND_SOC_CACHE_LZO=y
|
||||
CONFIG_SND_SOC_I2C_AND_SPI=m
|
||||
|
|
@ -5242,6 +5256,7 @@ CONFIG_RING_BUFFER_ALLOW_SWAP=y
|
|||
CONFIG_TRACING_SUPPORT=y
|
||||
# CONFIG_FTRACE is not set
|
||||
# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
|
||||
CONFIG_FIREWIRE_OHCI_REMOTE_DMA=y
|
||||
# CONFIG_DYNAMIC_DEBUG is not set
|
||||
# CONFIG_DMA_API_DEBUG is not set
|
||||
# CONFIG_ATOMIC64_SELFTEST is not set
|
||||
|
|
|
|||
|
|
@ -0,0 +1,26 @@
|
|||
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
|
||||
Tested-by: Santi <santi@agolina.net>
|
||||
---
|
||||
drivers/gpu/drm/i915/intel_tv.c | 9 +++++++++
|
||||
1 files changed, 9 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
|
||||
index dc83b7a..c8f67bf 100644
|
||||
--- a/drivers/gpu/drm/i915/intel_tv.c
|
||||
+++ b/drivers/gpu/drm/i915/intel_tv.c
|
||||
@@ -1267,6 +1267,15 @@
|
||||
DAC_B_0_7_V |
|
||||
DAC_C_0_7_V);
|
||||
|
||||
+ /*
|
||||
+ * The TV sense state should be cleared to zero on cantiga platform. Otherwise
|
||||
+ * the TV is misdetected. This is hardware requirement.
|
||||
+ */
|
||||
+ if (IS_GM45(dev))
|
||||
+ tv_dac &= ~(TVDAC_STATE_CHG_EN | TVDAC_A_SENSE_CTL |
|
||||
+ TVDAC_B_SENSE_CTL | TVDAC_C_SENSE_CTL);
|
||||
+
|
||||
+
|
||||
I915_WRITE(TV_CTL, tv_ctl);
|
||||
I915_WRITE(TV_DAC, tv_dac);
|
||||
POSTING_READ(TV_DAC);
|
||||
|
|
@ -0,0 +1,55 @@
|
|||
commit 389a55581e30607af0fcde6cdb4e54f189cf46cf
|
||||
Author: Chris Wilson <chris@chris-wilson.co.uk>
|
||||
Date: Tue Nov 29 15:12:16 2011 +0000
|
||||
|
||||
drm/i915: Only clear the GPU domains upon a successful finish
|
||||
|
||||
By clearing the GPU read domains before waiting upon the buffer, we run
|
||||
the risk of the wait being interrupted and the domains prematurely
|
||||
cleared. The next time we attempt to wait upon the buffer (after
|
||||
userspace handles the signal), we believe that the buffer is idle and so
|
||||
skip the wait.
|
||||
|
||||
There are a number of bugs across all generations which show signs of an
|
||||
overly haste reuse of active buffers.
|
||||
|
||||
Such as:
|
||||
|
||||
https://bugs.freedesktop.org/show_bug.cgi?id=29046
|
||||
https://bugs.freedesktop.org/show_bug.cgi?id=35863
|
||||
https://bugs.freedesktop.org/show_bug.cgi?id=38952
|
||||
https://bugs.freedesktop.org/show_bug.cgi?id=40282
|
||||
https://bugs.freedesktop.org/show_bug.cgi?id=41098
|
||||
https://bugs.freedesktop.org/show_bug.cgi?id=41102
|
||||
https://bugs.freedesktop.org/show_bug.cgi?id=41284
|
||||
https://bugs.freedesktop.org/show_bug.cgi?id=42141
|
||||
|
||||
A couple of those pre-date i915_gem_object_finish_gpu(), so may be
|
||||
unrelated (such as a wild write from a userspace command buffer), but
|
||||
this does look like a convincing cause for most of those bugs.
|
||||
|
||||
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
|
||||
Cc: stable@kernel.org
|
||||
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
|
||||
Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
|
||||
|
||||
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
|
||||
index d560175..036bc58 100644
|
||||
--- a/drivers/gpu/drm/i915/i915_gem.c
|
||||
+++ b/drivers/gpu/drm/i915/i915_gem.c
|
||||
@@ -3087,10 +3087,13 @@ i915_gem_object_finish_gpu(struct drm_i915_gem_object *obj)
|
||||
return ret;
|
||||
}
|
||||
|
||||
+ ret = i915_gem_object_wait_rendering(obj);
|
||||
+ if (ret)
|
||||
+ return ret;
|
||||
+
|
||||
/* Ensure that we invalidate the GPU's caches and TLBs. */
|
||||
obj->base.read_domains &= ~I915_GEM_GPU_DOMAINS;
|
||||
-
|
||||
- return i915_gem_object_wait_rendering(obj);
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1 +0,0 @@
|
|||
-Np1
|
||||
|
|
@ -11,8 +11,9 @@ triggers="kernel-hooks"
|
|||
nostrip=yes
|
||||
noverifyrdeps=yes
|
||||
preserve=yes
|
||||
patch_args="-Np1"
|
||||
|
||||
#revision=1
|
||||
revision=1
|
||||
_kernel_headers_revision=${revision}
|
||||
if [ -n "${_kernel_snapshot}" ]; then
|
||||
if [ -n "${_kernel_patch_ver}" ]; then
|
||||
|
|
|
|||
Loading…
Reference in New Issue