apply a driver patch

cccc · 05-20-2011, 09:17 AM

hi

Can someone pls explain step by step howto apply this driver patch:

Code:

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index f1fcc97..0dcf761 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3530,6 +3530,9 @@ i915_dispatch_gem_execbuffer(struct drm_device *dev,
        if (exec->flags & I915_GEM_NO_DISPATCH)
                return 0;

+       msleep(10);

EricTRA · 05-20-2011, 09:23 AM

Hello,

If you are in the directory where you have those subdirectories then normally you would run:

Code:

patch <patchfile

but I've never done it in combination with git, so you might prefer to ask for someone with more experience on the matter.

Kind regards,

Eric

cccc · 05-22-2011, 07:06 AM

I've tried the following:

Code:

# tar xjf linux-source-2.6.32.tar.bz2
# cd linux-source-2.6.32
# cp /boot/config-$(uname -r) ./.config
# cd drivers/gpu/drm/i915
# vi i915.patch
# patch -p1 i915.patch

but the last command is still active and nothing happens.
What's wrong?

radiodee1 · 05-22-2011, 07:59 AM

Quote:

Originally Posted by cccc

I've tried the following:

Code:

# tar xjf linux-source-2.6.32.tar.bz2
# cd linux-source-2.6.32
# cp /boot/config-$(uname -r) ./.config
# cd drivers/gpu/drm/i915
# vi i915.patch
# patch -p1 i915.patch

but the last command is still active and nothing happens.
What's wrong?

maybe something like this:

Code:

# patch -p1 < i915.patch

see if that works. I could be wrong.

EDIT: this is something like what Eric says above.

cccc · 05-22-2011, 01:04 PM

Thx,

Code:

 
# patch -p1 < i915.patch           patching file drivers/gpu/drm/i915/i915_gem.c
patch: **** unexpected end of file in patch
#

seems to work now.