| Message ID | 87pntfl6pa.fsf@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [PULL] topic/drmp-cleanup for drm-misc-next and drm-intel-next-queued | expand |
Hi Jani, On Wed, Jan 02, 2019 at 12:00:49PM +0200, Jani Nikula wrote: > I embarked on removing drmP.h includes from i915, but that requires a > bunch of drm header cleanup to add relevant includes and forward > declarations. Due to the timing, propagating the patches back to i915 > would take eons, so Daniel suggested a topic branch to be merged both to > drm-misc-next and drm-intel-next-queued. So here it is, with $(git > merge-base drm-misc-next drm-intel-next-queued) as the starting point. > > The topic branch has been part of drm-tip since, uh, last year, but I > did just force push it to update the commit messages to reflect > Laurent's review. No code changes. > > I'll merge the same thing to i915 after it's been pulled to > drm-misc-next, and with this, I should be able to get rid of all drmP.h > includes in i915. I merged the PR, and it's on its way to Daniel and Dave now. Thanks Maxime
Hi Sean, Maarten & Maxime - I embarked on removing drmP.h includes from i915, but that requires a bunch of drm header cleanup to add relevant includes and forward declarations. Due to the timing, propagating the patches back to i915 would take eons, so Daniel suggested a topic branch to be merged both to drm-misc-next and drm-intel-next-queued. So here it is, with $(git merge-base drm-misc-next drm-intel-next-queued) as the starting point. The topic branch has been part of drm-tip since, uh, last year, but I did just force push it to update the commit messages to reflect Laurent's review. No code changes. I'll merge the same thing to i915 after it's been pulled to drm-misc-next, and with this, I should be able to get rid of all drmP.h includes in i915. BR, Jani. The following changes since commit b4bf44d2dcbd6c35d9651bc6286e4940b8b3df95: drm/i915: Update DRIVER_DATE to 20181122 (2018-11-22 16:49:47 +0200) are available in the git repository at: git://anongit.freedesktop.org/drm/drm-intel tags/topic/drmp-cleanup-2019-01-02 for you to fetch changes up to dd7ece7f6e220e4d1a2a8ba4c42622d7d73e6376: drm: forward declare struct drm_file in drm_syncobj.h (2019-01-02 11:38:08 +0200) ---------------------------------------------------------------- Make some drm headers self-contained with includes and forward declarations ---------------------------------------------------------------- Jani Nikula (5): drm: un-inline drm_legacy_findmap() drm: include kernel.h and agp_backend.h from intel-gtt.h drm: include idr.h from drm_file.h drm: include types.h from drm_hdcp.h drm: forward declare struct drm_file in drm_syncobj.h drivers/gpu/drm/drm_bufs.c | 11 +++++++++++ include/drm/drm_file.h | 1 + include/drm/drm_hdcp.h | 2 ++ include/drm/drm_legacy.h | 14 ++++---------- include/drm/drm_syncobj.h | 4 +++- include/drm/intel-gtt.h | 3 +++ 6 files changed, 24 insertions(+), 11 deletions(-)