Skip to content

Conversation

@saper
Copy link

@saper saper commented Mar 12, 2020

This backport of #73 onto drm-v4.11-fbsd11.2 fixes #225

  • drm/i915: Remove trailing spaces in intel_freebsd.c

While here:

  • Add a space between a variable and the + operator.

  • Rename one __notyet to __notyet__.

  • drm/i915: Disable intel_gmch_probe() and intel_enable_gtt()

They are now no-ops, like they are in drm2 in FreeBSD base.

They were used by Intel GPUs up to and including gen 5. This patch makes
the driver work on those old Intel GPUs. At least it was successfully
tested on an Intel 965GM coupled with an Intel Core 2 Duo from 2007.

@zeising
Copy link
Member

zeising commented Mar 12, 2020

Please separate out whitespace fixes from functional changes in different commits.
Disregard this, I see that this is pulled from a different branch.

@saper saper mentioned this pull request Mar 12, 2020
@zeising
Copy link
Member

zeising commented Mar 20, 2020

Have you used git cherry-pick? Any chance you can use -x so it's easy to see where this was picked from? (git cherry-pick -x adds a reference to the original commit in this commit message).

While here:
* Add a space between a variable and the `+` operator.
* Rename one `__notyet` to `__notyet__`.

(cherry picked from commit 12a700a)
They are now no-ops, like they are in `drm2` in FreeBSD base.

They were used by Intel GPUs up to and including gen 5. This patch makes
the driver work on those old Intel GPUs. At least it was successfully
tested on an Intel 965GM coupled with an Intel Core 2 Duo from 2007.

(cherry picked from commit 613fe4e)
@saper saper force-pushed the drm-v4.11-fbsd11.2-backport-73 branch from 23bce13 to 8d65961 Compare March 20, 2020 09:43
@saper
Copy link
Author

saper commented Mar 20, 2020

@zeising No, I think I have merged them. No problem, the branch is now updated with two commits cherry picked with -x

@zeising zeising merged commit 3c49876 into FreeBSDDesktop:drm-v4.11-fbsd11.2 Mar 20, 2020
@zeising
Copy link
Member

zeising commented Mar 20, 2020

Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants