* [git pull] drm fixes for v4.15-rc3
@ 2017-12-08 1:20 ` Dave Airlie
0 siblings, 0 replies; 5+ messages in thread
From: Dave Airlie @ 2017-12-08 1:20 UTC (permalink / raw)
To: Linus Torvalds; +Cc: LKML, dri-devel
Hi Linus,
FYI, I'm on holidays for next week, it's normally a time of the dev
cycle where anything urgent happens so things should tick along
nicely. I'll have some email access but no serious hw.
This pull is a bit larger than I'd like but a large bunch of it is
license fixes, AMD wanted to fix the licenses for a bunch of files
that were missing them,
Otherwise a bunch of TTM regression fix since the hugepage support,
some i915 and gvt fixes,
a core connector free in a safe context fix, and one bridge fix.
Dave.
The following changes since commit ae64f9bd1d3621b5e60d7363bc20afb46aede215:
Linux 4.15-rc2 (2017-12-03 11:01:47 -0500)
are available in the git repository at:
git://people.freedesktop.org/~airlied/linux tags/drm-fixes-for-v4.15-rc3
for you to fetch changes up to 90eeb3aa34831ff3d031589c0c24892eb8a07e51:
Merge tag 'drm-misc-fixes-2017-12-07' of
git://anongit.freedesktop.org/drm/drm-misc into drm-fixes (2017-12-08
08:17:53 +1000)
----------------------------------------------------------------
i915, amdgpu + misc fixes
----------------------------------------------------------------
Alex Deucher (2):
drm/amdgpu: add license to Makefiles
drm/amdgpu: add license to files where it was missing
Boris Brezillon (1):
drm/vc4: Fix false positive WARN() backtrace on refcount_inc() usage
Changbin Du (1):
drm/i915/gvt: Emulate PCI expansion ROM base address register
Chris Wilson (2):
drm/i915: Skip switch-to-kernel-context on suspend when wedged
drm/i915: Call i915_gem_init_userptr() before taking struct_mutex
Christian König (2):
drm/ttm: swap consecutive allocated cached pages v3
drm/ttm: swap consecutive allocated pooled pages v4
Daniel Vetter (1):
drm: safely free connectors from connector_iter
Dave Airlie (5):
Merge branch 'drm-fixes-4.15' of
git://people.freedesktop.org/~agd5f/linux into drm-fixes
Merge tag 'drm-misc-fixes-2017-12-06' of
git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
Merge tag 'exynos-drm-fixes-for-v4.15-rc3' of
git://git.kernel.org/.../daeinki/drm-exynos into drm-fixes
Merge tag 'drm-intel-fixes-2017-12-07' of
git://anongit.freedesktop.org/drm/drm-intel into drm-fixes
Merge tag 'drm-misc-fixes-2017-12-07' of
git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
Inki Dae (2):
drm/exynos: remove unnecessary descrptions
drm/exynos: remove unnecessary function declaration
James Ausmus (1):
drm/i915/cnl: Mask previous DDI - PLL mapping
Joonas Lahtinen (1):
Merge tag 'gvt-fixes-2017-12-06' of
https://github.com/intel/gvt-linux into drm-intel-fixes
Marek Szyprowski (3):
drm/exynos: Fix dma-buf import
drm/exynos: gem: Drop NONCONTIG flag for buffers allocated without IOMMU
drm/bridge: analogix dp: Fix runtime PM state in get_modes() callback
Radhakrishna Sripada (1):
Revert "drm/i915: Display WA #1133 WaFbcSkipSegments:cnl, glk"
Roger He (5):
drm/ttm: use NUM_PAGES_TO_ALLOC always
drm/ttm: add page order in page pool
drm/ttm: add set_pages_wb for handling page order more than zero
drm/ttm: add page order support in ttm_pages_put
drm/ttm: roundup the shrink request to prevent skip huge pool
Ville Syrjälä (1):
drm/i915: Fix vblank timestamp/frame counter jumps on gen2
Xiong Zhang (1):
drm/i915/gvt: Limit read hw reg to active vgpu
Zhenyu Wang (2):
drm/i915/gvt: Don't mark vgpu context as inactive when preempted
drm/i915/gvt: set max priority for gvt context
Zhi Wang (1):
drm/i915/gvt: Export intel_gvt_render_mmio_to_ring_id()
drivers/gpu/drm/amd/acp/Makefile | 21 +++++
drivers/gpu/drm/amd/amdgpu/Makefile | 22 ++++-
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 2 +
drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 24 +++++-
drivers/gpu/drm/amd/amdkfd/Makefile | 22 ++++-
drivers/gpu/drm/amd/display/Makefile | 21 +++++
drivers/gpu/drm/amd/display/amdgpu_dm/Makefile | 21 +++++
drivers/gpu/drm/amd/display/dc/Makefile | 21 +++++
drivers/gpu/drm/amd/display/dc/basics/Makefile | 21 +++++
drivers/gpu/drm/amd/display/dc/bios/Makefile | 21 +++++
drivers/gpu/drm/amd/display/dc/calcs/Makefile | 21 +++++
drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 22 +++++
drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2 +-
drivers/gpu/drm/amd/display/dc/dc_helper.c | 22 +++++
drivers/gpu/drm/amd/display/dc/dce/Makefile | 21 +++++
drivers/gpu/drm/amd/display/dc/dce100/Makefile | 21 +++++
.../drm/amd/display/dc/dce100/dce100_resource.c | 2 +-
.../drm/amd/display/dc/dce100/dce100_resource.h | 23 +++++
drivers/gpu/drm/amd/display/dc/dce110/Makefile | 21 +++++
.../drm/amd/display/dc/dce110/dce110_resource.c | 2 +-
.../display/dc/dce110/dce110_timing_generator_v.c | 23 +++++
drivers/gpu/drm/amd/display/dc/dce112/Makefile | 21 +++++
drivers/gpu/drm/amd/display/dc/dce120/Makefile | 23 ++++-
drivers/gpu/drm/amd/display/dc/dce80/Makefile | 21 +++++
drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 21 +++++
drivers/gpu/drm/amd/display/dc/dml/Makefile | 21 +++++
drivers/gpu/drm/amd/display/dc/gpio/Makefile | 21 +++++
drivers/gpu/drm/amd/display/dc/i2caux/Makefile | 21 +++++
.../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 22 +++++
.../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 22 +++++
drivers/gpu/drm/amd/display/dc/irq/Makefile | 21 +++++
drivers/gpu/drm/amd/display/dc/virtual/Makefile | 21 +++++
.../gpu/drm/amd/display/modules/freesync/Makefile | 21 +++++
drivers/gpu/drm/amd/lib/Makefile | 21 +++++
drivers/gpu/drm/amd/powerplay/Makefile | 22 ++++-
drivers/gpu/drm/amd/powerplay/hwmgr/Makefile | 22 ++++-
.../gpu/drm/amd/powerplay/hwmgr/pp_overdriver.c | 24 +++++-
drivers/gpu/drm/amd/powerplay/inc/smu72.h | 24 +++++-
drivers/gpu/drm/amd/powerplay/inc/smu72_discrete.h | 24 +++++-
drivers/gpu/drm/amd/powerplay/smumgr/Makefile | 22 ++++-
drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h | 24 +++++-
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 2 +
drivers/gpu/drm/drm_connector.c | 28 ++++++-
drivers/gpu/drm/drm_mode_config.c | 2 +
drivers/gpu/drm/exynos/exynos_drm_drv.c | 46 +++++-----
drivers/gpu/drm/exynos/exynos_drm_drv.h | 5 --
drivers/gpu/drm/exynos/exynos_drm_gem.c | 15 ++++
drivers/gpu/drm/exynos/exynos_drm_gem.h | 2 +
drivers/gpu/drm/i915/gvt/cfg_space.c | 21 +++++
drivers/gpu/drm/i915/gvt/handlers.c | 47 ++++++++---
drivers/gpu/drm/i915/gvt/mmio.h | 2 +
drivers/gpu/drm/i915/gvt/scheduler.c | 22 ++++-
drivers/gpu/drm/i915/i915_gem.c | 31 +++----
drivers/gpu/drm/i915/i915_reg.h | 3 -
drivers/gpu/drm/i915/intel_ddi.c | 1 +
drivers/gpu/drm/i915/intel_display.c | 51 +++++++----
drivers/gpu/drm/i915/intel_pm.c | 13 ---
drivers/gpu/drm/ttm/ttm_page_alloc.c | 98 ++++++++++++++++------
drivers/gpu/drm/vc4/vc4_bo.c | 3 +-
include/drm/drm_connector.h | 8 ++
60 files changed, 1087 insertions(+), 128 deletions(-)
^ permalink raw reply [flat|nested] 5+ messages in thread
* [git pull] drm fixes for v4.15-rc3
@ 2017-12-08 1:20 ` Dave Airlie
0 siblings, 0 replies; 5+ messages in thread
From: Dave Airlie @ 2017-12-08 1:20 UTC (permalink / raw)
To: Linus Torvalds; +Cc: LKML, dri-devel
Hi Linus,
FYI, I'm on holidays for next week, it's normally a time of the dev
cycle where anything urgent happens so things should tick along
nicely. I'll have some email access but no serious hw.
This pull is a bit larger than I'd like but a large bunch of it is
license fixes, AMD wanted to fix the licenses for a bunch of files
that were missing them,
Otherwise a bunch of TTM regression fix since the hugepage support,
some i915 and gvt fixes,
a core connector free in a safe context fix, and one bridge fix.
Dave.
The following changes since commit ae64f9bd1d3621b5e60d7363bc20afb46aede215:
Linux 4.15-rc2 (2017-12-03 11:01:47 -0500)
are available in the git repository at:
git://people.freedesktop.org/~airlied/linux tags/drm-fixes-for-v4.15-rc3
for you to fetch changes up to 90eeb3aa34831ff3d031589c0c24892eb8a07e51:
Merge tag 'drm-misc-fixes-2017-12-07' of
git://anongit.freedesktop.org/drm/drm-misc into drm-fixes (2017-12-08
08:17:53 +1000)
----------------------------------------------------------------
i915, amdgpu + misc fixes
----------------------------------------------------------------
Alex Deucher (2):
drm/amdgpu: add license to Makefiles
drm/amdgpu: add license to files where it was missing
Boris Brezillon (1):
drm/vc4: Fix false positive WARN() backtrace on refcount_inc() usage
Changbin Du (1):
drm/i915/gvt: Emulate PCI expansion ROM base address register
Chris Wilson (2):
drm/i915: Skip switch-to-kernel-context on suspend when wedged
drm/i915: Call i915_gem_init_userptr() before taking struct_mutex
Christian König (2):
drm/ttm: swap consecutive allocated cached pages v3
drm/ttm: swap consecutive allocated pooled pages v4
Daniel Vetter (1):
drm: safely free connectors from connector_iter
Dave Airlie (5):
Merge branch 'drm-fixes-4.15' of
git://people.freedesktop.org/~agd5f/linux into drm-fixes
Merge tag 'drm-misc-fixes-2017-12-06' of
git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
Merge tag 'exynos-drm-fixes-for-v4.15-rc3' of
git://git.kernel.org/.../daeinki/drm-exynos into drm-fixes
Merge tag 'drm-intel-fixes-2017-12-07' of
git://anongit.freedesktop.org/drm/drm-intel into drm-fixes
Merge tag 'drm-misc-fixes-2017-12-07' of
git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
Inki Dae (2):
drm/exynos: remove unnecessary descrptions
drm/exynos: remove unnecessary function declaration
James Ausmus (1):
drm/i915/cnl: Mask previous DDI - PLL mapping
Joonas Lahtinen (1):
Merge tag 'gvt-fixes-2017-12-06' of
https://github.com/intel/gvt-linux into drm-intel-fixes
Marek Szyprowski (3):
drm/exynos: Fix dma-buf import
drm/exynos: gem: Drop NONCONTIG flag for buffers allocated without IOMMU
drm/bridge: analogix dp: Fix runtime PM state in get_modes() callback
Radhakrishna Sripada (1):
Revert "drm/i915: Display WA #1133 WaFbcSkipSegments:cnl, glk"
Roger He (5):
drm/ttm: use NUM_PAGES_TO_ALLOC always
drm/ttm: add page order in page pool
drm/ttm: add set_pages_wb for handling page order more than zero
drm/ttm: add page order support in ttm_pages_put
drm/ttm: roundup the shrink request to prevent skip huge pool
Ville Syrjälä (1):
drm/i915: Fix vblank timestamp/frame counter jumps on gen2
Xiong Zhang (1):
drm/i915/gvt: Limit read hw reg to active vgpu
Zhenyu Wang (2):
drm/i915/gvt: Don't mark vgpu context as inactive when preempted
drm/i915/gvt: set max priority for gvt context
Zhi Wang (1):
drm/i915/gvt: Export intel_gvt_render_mmio_to_ring_id()
drivers/gpu/drm/amd/acp/Makefile | 21 +++++
drivers/gpu/drm/amd/amdgpu/Makefile | 22 ++++-
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 2 +
drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 24 +++++-
drivers/gpu/drm/amd/amdkfd/Makefile | 22 ++++-
drivers/gpu/drm/amd/display/Makefile | 21 +++++
drivers/gpu/drm/amd/display/amdgpu_dm/Makefile | 21 +++++
drivers/gpu/drm/amd/display/dc/Makefile | 21 +++++
drivers/gpu/drm/amd/display/dc/basics/Makefile | 21 +++++
drivers/gpu/drm/amd/display/dc/bios/Makefile | 21 +++++
drivers/gpu/drm/amd/display/dc/calcs/Makefile | 21 +++++
drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 22 +++++
drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2 +-
drivers/gpu/drm/amd/display/dc/dc_helper.c | 22 +++++
drivers/gpu/drm/amd/display/dc/dce/Makefile | 21 +++++
drivers/gpu/drm/amd/display/dc/dce100/Makefile | 21 +++++
.../drm/amd/display/dc/dce100/dce100_resource.c | 2 +-
.../drm/amd/display/dc/dce100/dce100_resource.h | 23 +++++
drivers/gpu/drm/amd/display/dc/dce110/Makefile | 21 +++++
.../drm/amd/display/dc/dce110/dce110_resource.c | 2 +-
.../display/dc/dce110/dce110_timing_generator_v.c | 23 +++++
drivers/gpu/drm/amd/display/dc/dce112/Makefile | 21 +++++
drivers/gpu/drm/amd/display/dc/dce120/Makefile | 23 ++++-
drivers/gpu/drm/amd/display/dc/dce80/Makefile | 21 +++++
drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 21 +++++
drivers/gpu/drm/amd/display/dc/dml/Makefile | 21 +++++
drivers/gpu/drm/amd/display/dc/gpio/Makefile | 21 +++++
drivers/gpu/drm/amd/display/dc/i2caux/Makefile | 21 +++++
.../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 22 +++++
.../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 22 +++++
drivers/gpu/drm/amd/display/dc/irq/Makefile | 21 +++++
drivers/gpu/drm/amd/display/dc/virtual/Makefile | 21 +++++
.../gpu/drm/amd/display/modules/freesync/Makefile | 21 +++++
drivers/gpu/drm/amd/lib/Makefile | 21 +++++
drivers/gpu/drm/amd/powerplay/Makefile | 22 ++++-
drivers/gpu/drm/amd/powerplay/hwmgr/Makefile | 22 ++++-
.../gpu/drm/amd/powerplay/hwmgr/pp_overdriver.c | 24 +++++-
drivers/gpu/drm/amd/powerplay/inc/smu72.h | 24 +++++-
drivers/gpu/drm/amd/powerplay/inc/smu72_discrete.h | 24 +++++-
drivers/gpu/drm/amd/powerplay/smumgr/Makefile | 22 ++++-
drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h | 24 +++++-
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 2 +
drivers/gpu/drm/drm_connector.c | 28 ++++++-
drivers/gpu/drm/drm_mode_config.c | 2 +
drivers/gpu/drm/exynos/exynos_drm_drv.c | 46 +++++-----
drivers/gpu/drm/exynos/exynos_drm_drv.h | 5 --
drivers/gpu/drm/exynos/exynos_drm_gem.c | 15 ++++
drivers/gpu/drm/exynos/exynos_drm_gem.h | 2 +
drivers/gpu/drm/i915/gvt/cfg_space.c | 21 +++++
drivers/gpu/drm/i915/gvt/handlers.c | 47 ++++++++---
drivers/gpu/drm/i915/gvt/mmio.h | 2 +
drivers/gpu/drm/i915/gvt/scheduler.c | 22 ++++-
drivers/gpu/drm/i915/i915_gem.c | 31 +++----
drivers/gpu/drm/i915/i915_reg.h | 3 -
drivers/gpu/drm/i915/intel_ddi.c | 1 +
drivers/gpu/drm/i915/intel_display.c | 51 +++++++----
drivers/gpu/drm/i915/intel_pm.c | 13 ---
drivers/gpu/drm/ttm/ttm_page_alloc.c | 98 ++++++++++++++++------
drivers/gpu/drm/vc4/vc4_bo.c | 3 +-
include/drm/drm_connector.h | 8 ++
60 files changed, 1087 insertions(+), 128 deletions(-)
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [git pull] drm fixes for v4.15-rc3
2017-12-08 1:20 ` Dave Airlie
@ 2017-12-08 21:16 ` Linus Torvalds
-1 siblings, 0 replies; 5+ messages in thread
From: Linus Torvalds @ 2017-12-08 21:16 UTC (permalink / raw)
To: Dave Airlie, Alex Deucher; +Cc: LKML, dri-devel
On Thu, Dec 7, 2017 at 5:20 PM, Dave Airlie <airlied@gmail.com> wrote:
>
> This pull is a bit larger than I'd like but a large bunch of it is
> license fixes, AMD wanted to fix the licenses for a bunch of files
> that were missing them,
Oh Christ, couldn't they have just added the one-liner SPDX tags
rather than doing that crazy "new 22 line boiler plate garbage to
fifteen random Makefiles"?
I pulled it, but let's try to reign in the crazy "lets add filler
lines" behavior, ok?
Alex, can you talk to the AMD lawyers and ask them about just putting
the SPDX line instead?
Linus
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [git pull] drm fixes for v4.15-rc3
@ 2017-12-08 21:16 ` Linus Torvalds
0 siblings, 0 replies; 5+ messages in thread
From: Linus Torvalds @ 2017-12-08 21:16 UTC (permalink / raw)
To: Dave Airlie, Alex Deucher; +Cc: LKML, dri-devel
On Thu, Dec 7, 2017 at 5:20 PM, Dave Airlie <airlied@gmail.com> wrote:
>
> This pull is a bit larger than I'd like but a large bunch of it is
> license fixes, AMD wanted to fix the licenses for a bunch of files
> that were missing them,
Oh Christ, couldn't they have just added the one-liner SPDX tags
rather than doing that crazy "new 22 line boiler plate garbage to
fifteen random Makefiles"?
I pulled it, but let's try to reign in the crazy "lets add filler
lines" behavior, ok?
Alex, can you talk to the AMD lawyers and ask them about just putting
the SPDX line instead?
Linus
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [git pull] drm fixes for v4.15-rc3
2017-12-08 21:16 ` Linus Torvalds
(?)
@ 2017-12-08 23:34 ` Philippe Ombredanne
-1 siblings, 0 replies; 5+ messages in thread
From: Philippe Ombredanne @ 2017-12-08 23:34 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Dave Airlie, Alex Deucher, LKML, dri-devel
Linus,
On Fri, Dec 8, 2017 at 10:16 PM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
> On Thu, Dec 7, 2017 at 5:20 PM, Dave Airlie <airlied@gmail.com> wrote:
>>
>> This pull is a bit larger than I'd like but a large bunch of it is
>> license fixes, AMD wanted to fix the licenses for a bunch of files
>> that were missing them,
>
> Oh Christ, couldn't they have just added the one-liner SPDX tags
> rather than doing that crazy "new 22 line boiler plate garbage to
> fifteen random Makefiles"?
>
> I pulled it, but let's try to reign in the crazy "lets add filler
> lines" behavior, ok?
>
> Alex, can you talk to the AMD lawyers and ask them about just putting
> the SPDX line instead?
>
> Linus
You made my day! I shall add that every time someone sends a patch
with long legalese boilerplate instead of a shorter SDPX tag, there is
a kitten that dies somewhere.
--
Cordially
Philippe Ombredanne, your friendly kernel licensing decraper
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-12-08 23:35 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-12-08 1:20 [git pull] drm fixes for v4.15-rc3 Dave Airlie
2017-12-08 1:20 ` Dave Airlie
2017-12-08 21:16 ` Linus Torvalds
2017-12-08 21:16 ` Linus Torvalds
2017-12-08 23:34 ` Philippe Ombredanne
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.