Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

Linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

640eee06

Commit 640eee06 authored 4 years ago by Dave Airlie

Downloads
- Plain Diff

Merge tag 'drm-misc-next-fixes-2020-10-13' of...

Merge tag 'drm-misc-next-fixes-2020-10-13' of git://anongit.freedesktop.org/drm/drm-misc

into drm-next

One fix for a bad revert in ingenic-drm, and one fix for panfrost to increase a timeout at power up.

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20201013065709.lwjw3fthoxwsbqsl@gilmour.lan

parents 0d2e90f4 d3c8f278

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

MAINTAINERS 4 additions, 3 deletions

MAINTAINERS
drivers/gpu/drm/ingenic/ingenic-drm-drv.c 2 additions, 112 deletions

drivers/gpu/drm/ingenic/ingenic-drm-drv.c
drivers/gpu/drm/ingenic/ingenic-drm.h 0 additions, 4 deletions

drivers/gpu/drm/ingenic/ingenic-drm.h
drivers/gpu/drm/ingenic/ingenic-ipu.c 2 additions, 10 deletions

drivers/gpu/drm/ingenic/ingenic-ipu.c
drivers/gpu/drm/panfrost/panfrost_gpu.c 2 additions, 2 deletions

drivers/gpu/drm/panfrost/panfrost_gpu.c

with 10 additions and 131 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment