All of lore.kernel.org
 help / color / mirror / Atom feed
From: Dave Airlie <airlied@gmail.com>
To: Linus Torvalds <torvalds@linux-foundation.org>,
	Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: dri-devel <dri-devel@lists.freedesktop.org>,
	LKML <linux-kernel@vger.kernel.org>,
	Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
	Stephen Rothwell <sfr@canb.auug.org.au>
Subject: [git pull] drm fixes for 5.9-rc5 (special edition)
Date: Tue, 8 Sep 2020 16:22:25 +1000	[thread overview]
Message-ID: <CAPM=9tw2tebfrjMEiB5fUy8USZrjq4b_siciDecFfMu8H794gA@mail.gmail.com> (raw)

Hi Linus,

The i915 reverts are going to be a bit of a conflict mess for next, so
I decided to dequeue them now, along with some msm fixes for a ring
corruption issue, that Rob sent over the weekend.

Dave.

drm-fixes-2020-09-08:
drm fixes for 5.9-rc5 (special edition)

i915:
- revert gpu relocation changes due to regression

msm:
- fixes for RPTR corruption issue
The following changes since commit f4d51dffc6c01a9e94650d95ce0104964f8ae822:

  Linux 5.9-rc4 (2020-09-06 17:11:40 -0700)

are available in the Git repository at:

  git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2020-09-08

for you to fetch changes up to 20561da3a2e1e0e827ef5510cb0f74bcfd377e41:

  Revert "drm/i915/gem: Delete unused code" (2020-09-08 15:45:27 +1000)

----------------------------------------------------------------
drm fixes for 5.9-rc5 (special edition)

i915:
- revert gpu relocation changes due to regression

msm:
- fixes for RPTR corruption issue

----------------------------------------------------------------
Dave Airlie (4):
      Merge tag 'drm-msm-fixes-2020-09-04' of
https://gitlab.freedesktop.org/drm/msm into drm-fixes
      Revert "drm/i915: Remove i915_gem_object_get_dirty_page()"
      Revert "drm/i915/gem: Async GPU relocations only"
      Revert "drm/i915/gem: Delete unused code"

Jordan Crouse (4):
      drm/msm: Split the a5xx preemption record
      drm/msm: Enable expanded apriv support for a650
      drm/msm: Disable preemption on all 5xx targets
      drm/msm: Disable the RPTR shadow

 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c     | 314 +++++++++++++++++++--
 drivers/gpu/drm/i915/gem/i915_gem_object.h         |   4 +
 drivers/gpu/drm/i915/gem/i915_gem_pages.c          |  14 +
 .../drm/i915/gem/selftests/i915_gem_execbuffer.c   |  21 +-
 drivers/gpu/drm/msm/adreno/a2xx_gpu.c              |   5 +
 drivers/gpu/drm/msm/adreno/a3xx_gpu.c              |  10 +
 drivers/gpu/drm/msm/adreno/a4xx_gpu.c              |  10 +
 drivers/gpu/drm/msm/adreno/a5xx_gpu.c              |  14 +-
 drivers/gpu/drm/msm/adreno/a5xx_gpu.h              |   1 +
 drivers/gpu/drm/msm/adreno/a5xx_preempt.c          |  25 +-
 drivers/gpu/drm/msm/adreno/a6xx_gpu.c              |  13 +-
 drivers/gpu/drm/msm/adreno/adreno_gpu.c            |  27 +-
 drivers/gpu/drm/msm/msm_gpu.c                      |   2 +-
 drivers/gpu/drm/msm/msm_gpu.h                      |  11 +
 drivers/gpu/drm/msm/msm_ringbuffer.c               |   4 +-
 15 files changed, 411 insertions(+), 64 deletions(-)

WARNING: multiple messages have this Message-ID (diff)
From: Dave Airlie <airlied@gmail.com>
To: Linus Torvalds <torvalds@linux-foundation.org>,
	Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	LKML <linux-kernel@vger.kernel.org>,
	dri-devel <dri-devel@lists.freedesktop.org>
Subject: [git pull] drm fixes for 5.9-rc5 (special edition)
Date: Tue, 8 Sep 2020 16:22:25 +1000	[thread overview]
Message-ID: <CAPM=9tw2tebfrjMEiB5fUy8USZrjq4b_siciDecFfMu8H794gA@mail.gmail.com> (raw)

Hi Linus,

The i915 reverts are going to be a bit of a conflict mess for next, so
I decided to dequeue them now, along with some msm fixes for a ring
corruption issue, that Rob sent over the weekend.

Dave.

drm-fixes-2020-09-08:
drm fixes for 5.9-rc5 (special edition)

i915:
- revert gpu relocation changes due to regression

msm:
- fixes for RPTR corruption issue
The following changes since commit f4d51dffc6c01a9e94650d95ce0104964f8ae822:

  Linux 5.9-rc4 (2020-09-06 17:11:40 -0700)

are available in the Git repository at:

  git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2020-09-08

for you to fetch changes up to 20561da3a2e1e0e827ef5510cb0f74bcfd377e41:

  Revert "drm/i915/gem: Delete unused code" (2020-09-08 15:45:27 +1000)

----------------------------------------------------------------
drm fixes for 5.9-rc5 (special edition)

i915:
- revert gpu relocation changes due to regression

msm:
- fixes for RPTR corruption issue

----------------------------------------------------------------
Dave Airlie (4):
      Merge tag 'drm-msm-fixes-2020-09-04' of
https://gitlab.freedesktop.org/drm/msm into drm-fixes
      Revert "drm/i915: Remove i915_gem_object_get_dirty_page()"
      Revert "drm/i915/gem: Async GPU relocations only"
      Revert "drm/i915/gem: Delete unused code"

Jordan Crouse (4):
      drm/msm: Split the a5xx preemption record
      drm/msm: Enable expanded apriv support for a650
      drm/msm: Disable preemption on all 5xx targets
      drm/msm: Disable the RPTR shadow

 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c     | 314 +++++++++++++++++++--
 drivers/gpu/drm/i915/gem/i915_gem_object.h         |   4 +
 drivers/gpu/drm/i915/gem/i915_gem_pages.c          |  14 +
 .../drm/i915/gem/selftests/i915_gem_execbuffer.c   |  21 +-
 drivers/gpu/drm/msm/adreno/a2xx_gpu.c              |   5 +
 drivers/gpu/drm/msm/adreno/a3xx_gpu.c              |  10 +
 drivers/gpu/drm/msm/adreno/a4xx_gpu.c              |  10 +
 drivers/gpu/drm/msm/adreno/a5xx_gpu.c              |  14 +-
 drivers/gpu/drm/msm/adreno/a5xx_gpu.h              |   1 +
 drivers/gpu/drm/msm/adreno/a5xx_preempt.c          |  25 +-
 drivers/gpu/drm/msm/adreno/a6xx_gpu.c              |  13 +-
 drivers/gpu/drm/msm/adreno/adreno_gpu.c            |  27 +-
 drivers/gpu/drm/msm/msm_gpu.c                      |   2 +-
 drivers/gpu/drm/msm/msm_gpu.h                      |  11 +
 drivers/gpu/drm/msm/msm_ringbuffer.c               |   4 +-
 15 files changed, 411 insertions(+), 64 deletions(-)
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

             reply	other threads:[~2020-09-08  6:22 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-08  6:22 Dave Airlie [this message]
2020-09-08  6:22 ` [git pull] drm fixes for 5.9-rc5 (special edition) Dave Airlie
2020-09-08 18:19 ` pr-tracker-bot
2020-09-08 18:19   ` pr-tracker-bot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAPM=9tw2tebfrjMEiB5fUy8USZrjq4b_siciDecFfMu8H794gA@mail.gmail.com' \
    --to=airlied@gmail.com \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=joonas.lahtinen@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.