diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-07 09:17:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-07 09:17:53 -0800 |
| commit | 7a6043cc2e863ab45016622c30879e555523ee13 (patch) | |
| tree | 5d1b276bba9d2a0a3a7d2f2030bbda36e0ff76cc /include | |
| parent | ddec8ed2d4905d0967ce2ec432e440e582aa52c6 (diff) | |
| parent | 936a93775b7c4f2293f651f64c4139c82e19a164 (diff) | |
| download | linux-stable-7a6043cc2e863ab45016622c30879e555523ee13.tar.gz linux-stable-7a6043cc2e863ab45016622c30879e555523ee13.tar.bz2 linux-stable-7a6043cc2e863ab45016622c30879e555523ee13.zip | |
Merge tag 'drm-fixes-2022-01-07' of git://anongit.freedesktop.org/drm/drm
Pull drm fixes from Dave Airlie:
"There is only the amdgpu runtime pm regression fix in here:
amdgpu:
- suspend/resume fix
- fix runtime PM regression"
* tag 'drm-fixes-2022-01-07' of git://anongit.freedesktop.org/drm/drm:
drm/amdgpu: disable runpm if we are the primary adapter
fbdev: fbmem: add a helper to determine if an aperture is used by a fw fb
drm/amd/pm: keep the BACO feature enabled for suspend
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/fb.h b/include/linux/fb.h index 6f3db99ab990..3da95842b207 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -610,6 +610,7 @@ extern int remove_conflicting_pci_framebuffers(struct pci_dev *pdev, const char *name); extern int remove_conflicting_framebuffers(struct apertures_struct *a, const char *name, bool primary); +extern bool is_firmware_framebuffer(struct apertures_struct *a); extern int fb_prepare_logo(struct fb_info *fb_info, int rotate); extern int fb_show_logo(struct fb_info *fb_info, int rotate); extern char* fb_get_buffer_offset(struct fb_info *info, struct fb_pixmap *buf, u32 size); |