Skip to contentSkip to conversation

drm-tegra-fixes

GIT PULL Thierry Reding 2 participants 4 messages Jun 20, 2013 – Jun 22, 2013 1 message not in the archive Tegra architecture support

lore
Share & tools
lore
#0 lore raw

Hi Dave,

The following changes since commit c7788792a5e7b0d5d7f96d0766b4cb6112d47d75:

Linux 3.10-rc2 (2013-05-20 14:37:38 -0700)

are available in the git repository at:

git://anongit.freedesktop.org/tegra/linux.git drm/fixes

for you to fetch changes up to 2b15aa0fd466a4b2defdfd84c0b5168804b3eb33:

gpu: host1x: Rework CPU syncpoint increment (2013-06-20 12:21:38 +0200)

I know this comes awfully late and is much bigger than I'd like. It's all my fault, though, since I've been travelling a lot lately and just didn't find the time to prepare this earlier. I did want to sort out patches that didn't warrant to go in before the final 3.10 release, but all met the criteria as far as I could tell.

The larger chunks are fixes for the firewall that checks job submissions from userspace, which was unfortunately not working properly. All other patches are mostly one-liners to fix things that were introduced in 3.10.

Thierry

----------------------------------------------------------------
Arto Merilainen (5):
gpu: host1x: Check reloc table before usage
gpu: host1x: Copy gathers before verification
gpu: host1x: Fix memory access in syncpt request
gpu: host1x: Fix client_managed type
gpu: host1x: Rework CPU syncpoint increment

Emil Goode (1):
drm/tegra: Include header drm/drm.h

Laurent Pinchart (1):
drm/tegra: Remove DRIVER_BUS_PLATFORM from driver_features

Terje Bergstrom (2):
gpu: host1x: Check INCR opcode correctly
gpu: host1x: Don't reset firewall between gathers

Thierry Reding (5):
drm/tegra: Don't disable unused planes
drm/tegra: Explicitly set irq_enabled
drm/tegra: Honor pixel-format changes
MAINTAINERS: Update Tegra DRM entry
drm/tegra: Fix return value

Wei Yongjun (2):
drm/tegra: fix missing unlock on error drm/tegra: fix error return code in gr2d_submit()

 MAINTAINERS                       |   7 +-
 drivers/gpu/host1x/dev.h          |   8 +--
 drivers/gpu/host1x/drm/dc.c       |   5 ++
 drivers/gpu/host1x/drm/drm.c      |  14 +++-
 drivers/gpu/host1x/drm/gr2d.c     |  12 ++--
 drivers/gpu/host1x/hw/cdma_hw.c   |   2 +-
 drivers/gpu/host1x/hw/syncpt_hw.c |  12 ++--
 drivers/gpu/host1x/job.c          | 135 +++++++++++++++++---------------------
 drivers/gpu/host1x/syncpt.c       |  26 +++-----
 drivers/gpu/host1x/syncpt.h       |  13 ++--
 include/uapi/drm/tegra_drm.h      |   2 +
 11 files changed, 113 insertions(+), 123 deletions(-)
#1 lore raw
Quoted 4 lines

git://anongit.freedesktop.org/tegra/linux.git drm/fixes

for you to fetch changes up to 2b15aa0fd466a4b2defdfd84c0b5168804b3eb33:

Quoted 8 lines

gpu: host1x: Rework CPU syncpoint increment (2013-06-20 12:21:38 +0200)

I know this comes awfully late and is much bigger than I'd like. It's all my fault, though, since I've been travelling a lot lately and just didn't find the time to prepare this earlier. I did want to sort out patches that didn't warrant to go in before the final 3.10 release, but all met the criteria as far as I could tell.

Don't think I want to submit this to Linus, its way too much at this point,

User visible oops or regressions is all you get now really.

Dave.

Quoted 40 lines

Arto Merilainen (5):
gpu: host1x: Check reloc table before usage
gpu: host1x: Copy gathers before verification
gpu: host1x: Fix memory access in syncpt request
gpu: host1x: Fix client_managed type
gpu: host1x: Rework CPU syncpoint increment

Emil Goode (1):
drm/tegra: Include header drm/drm.h

Laurent Pinchart (1):
drm/tegra: Remove DRIVER_BUS_PLATFORM from driver_features

Terje Bergstrom (2):
gpu: host1x: Check INCR opcode correctly
gpu: host1x: Don't reset firewall between gathers

Thierry Reding (5):
drm/tegra: Don't disable unused planes
drm/tegra: Explicitly set irq_enabled
drm/tegra: Honor pixel-format changes
MAINTAINERS: Update Tegra DRM entry
drm/tegra: Fix return value

Wei Yongjun (2):
drm/tegra: fix missing unlock on error drm/tegra: fix error return code in gr2d_submit()

 MAINTAINERS                       |   7 +-
 drivers/gpu/host1x/dev.h          |   8 +--
 drivers/gpu/host1x/drm/dc.c       |   5 ++
 drivers/gpu/host1x/drm/drm.c      |  14 +++-
 drivers/gpu/host1x/drm/gr2d.c     |  12 ++--
 drivers/gpu/host1x/hw/cdma_hw.c   |   2 +-
 drivers/gpu/host1x/hw/syncpt_hw.c |  12 ++--
 drivers/gpu/host1x/job.c          | 135 +++++++++++++++++---------------------
 drivers/gpu/host1x/syncpt.c       |  26 +++-----
 drivers/gpu/host1x/syncpt.h       |  13 ++--
 include/uapi/drm/tegra_drm.h      |   2 +
 11 files changed, 113 insertions(+), 123 deletions(-)

A message that is not in the archive (sent off-list or not yet received): CAPM=9tz_-m+kZo9+BJ1P-3-d01+HDEQkM0-Kvdc4GFVffex5gg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

#3 lore raw
Quoted 13 lines · Dave Airlie
Quoted 4 lines

git://anongit.freedesktop.org/tegra/linux.git drm/fixes

for you to fetch changes up to 2b15aa0fd466a4b2defdfd84c0b5168804b3eb33:

Quoted 8 lines

gpu: host1x: Rework CPU syncpoint increment (2013-06-20 12:21:38 +0200)

I know this comes awfully late and is much bigger than I'd like. It's all my fault, though, since I've been travelling a lot lately and just didn't find the time to prepare this earlier. I did want to sort out patches that didn't warrant to go in before the final 3.10 release, but all met the criteria as far as I could tell.

Quoted 3 lines

Don't think I want to submit this to Linus, its way too much at this point,

User visible oops or regressions is all you get now really.

Okay, I understand. Can you take this pull request for 3.11 instead?

Thierry

#4 lore raw
Quoted 14 lines · Thierry Reding
Quoted 13 lines · Dave Airlie
Quoted 12 lines

git://anongit.freedesktop.org/tegra/linux.git drm/fixes

for you to fetch changes up to 2b15aa0fd466a4b2defdfd84c0b5168804b3eb33:

gpu: host1x: Rework CPU syncpoint increment (2013-06-20 12:21:38 +0200)

I know this comes awfully late and is much bigger than I'd like. It's all my fault, though, since I've been travelling a lot lately and just didn't find the time to prepare this earlier. I did want to sort out patches that didn't warrant to go in before the final 3.10 release, but all met the criteria as far as I could tell.

Quoted 5 lines
Quoted 3 lines

Don't think I want to submit this to Linus, its way too much at this point,

User visible oops or regressions is all you get now really.

Okay, I understand. Can you take this pull request for 3.11 instead?

Scratch that. I'll send a proper pull request for 3.11.

Thierry