]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a8b273a 88c31d2)
Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm...
authorDave Airlie <airlied@redhat.com>
Thu, 17 Aug 2023 20:41:51 +0000 (06:41 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 17 Aug 2023 20:42:12 +0000 (06:42 +1000)
This time mostly cleanups around the runtime power management handling
and slightly improved GPU hang handling. Also some additions to the
HWDB to get the driver working properly on more NXP i.MX8MP IP cores.

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Lucas Stach <l.stach@pengutronix.de>
Link: https://patchwork.freedesktop.org/patch/msgid/f40c65f7ecfde2e61f1a6d7fd463f6f739bc0dd1.camel@pengutronix.de
1  2 
drivers/gpu/drm/etnaviv/etnaviv_drv.c patch | diff1 | diff2 | blob | history
drivers/gpu/drm/etnaviv/etnaviv_gpu.c patch | diff1 | diff2 | blob | history

diff --cc drivers/gpu/drm/etnaviv/etnaviv_drv.c
Simple merge
diff --cc drivers/gpu/drm/etnaviv/etnaviv_gpu.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.