Merge tag 'drm-next-2020-10-15' of git://anongit.freedesktop.org/drm/drm
Pull drm updates from Dave Airlie:
"Not a major amount of change, the i915 trees got split into display
and gt trees to better facilitate higher level review, and there's a
major refactoring of i915 GEM locking to use more core kernel concepts
(like ww-mutexes). msm gets per-process pagetables, older AMD SI cards
get DC support, nouveau got a bump in displayport support with common
code extraction from i915.
Outside of drm this contains a couple of patches for hexint
moduleparams which you've acked, and a virtio common code tree that
you should also get via it's regular path.
New driver:
- Cadence MHDP8546 DisplayPort bridge driver
core:
- cross-driver scatterlist cleanups
- devm_drm conversions
- remove drm_dev_init
- devm_drm_dev_alloc conversion
ttm:
- lots of refactoring and cleanups
bridges:
- chained bridge support in more drivers
panel:
- misc new panels
scheduler:
- cleanup priority levels
displayport:
- refactor i915 code into helpers for nouveau
i915:
- split into display and GT trees
- WW locking refactoring in GEM
- execbuf2 extension mechanism
- syncobj timeline support
- GEN 12 HOBL display powersaving
- Rocket Lake display additions
- Disable FBC on Tigerlake
- Tigerlake Type-C + DP improvements
- Hotplug interrupt refactoring
amdgpu:
- Sienna Cichlid updates
- Navy Flounder updates
- DCE6 (SI) support for DC
- Plane rotation enabled
- TMZ state info ioctl
- PCIe DPC recovery support
- DC interrupt handling refactor
- OLED panel fixes
amdkfd:
- add SMI events for thermal throttling
- SMI interface events ioctl update
- process eviction counters
radeon:
- move to dma_ for allocations
- expose sclk via sysfs
msm:
- DSI support for sm8150/sm8250
- per-process GPU pagetable support
- Displayport support
mediatek:
- move HDMI phy driver to PHY
- convert mtk-dpi to bridge API
- disable mt2701 tmds
tegra:
- bridge support
exynos:
- misc cleanups
vc4:
- dual display cleanups
ast:
- cleanups
gma500:
- conversion to GPIOd API
hisilicon:
- misc reworks
ingenic:
- clock handling and format improvements
mcde:
- DSI support
mgag200:
- desktop g200 support
mxsfb:
- i.MX7 + i.MX8M
- alpha plane support
panfrost:
- devfreq support
- amlogic SoC support
ps8640:
- EDID from eDP retrieval
tidss:
- AM65xx YUV workaround
virtio:
- virtio-gpu exported resources
rcar-du:
- R8A7742, R8A774E1 and R8A77961 support
- YUV planar format fixes
- non-visible plane handling
- VSP device reference count fix
- Kconfig fix to avoid displaying disabled options in .config"
* tag 'drm-next-2020-10-15' of git://anongit.freedesktop.org/drm/drm: (1494 commits)
drm/ingenic: Fix bad revert
drm/amdgpu: Fix invalid number of character '{' in amdgpu_acpi_init
drm/amdgpu: Remove warning for virtual_display
drm/amdgpu: kfd_initialized can be static
drm/amd/pm: setup APU dpm clock table in SMU HW initialization
drm/amdgpu: prevent spurious warning
drm/amdgpu/swsmu: fix ARC build errors
drm/amd/display: Fix OPTC_DATA_FORMAT programming
drm/amd/display: Don't allow pstate if no support in blank
drm/panfrost: increase readl_relaxed_poll_timeout values
MAINTAINERS: Update entry for st7703 driver after the rename
Revert "gpu/drm: ingenic: Add option to mmap GEM buffers cached"
drm/amd/display: HDMI remote sink need mode validation for Linux
drm/amd/display: Change to correct unit on audio rate
drm/amd/display: Avoid set zero in the requested clk
drm/amdgpu: align frag_end to covered address space
drm/amdgpu: fix NULL pointer dereference for Renoir
drm/vmwgfx: fix regression in thp code due to ttm init refactor.
drm/amdgpu/swsmu: add interrupt work handler for smu11 parts
drm/amdgpu/swsmu: add interrupt work function
...
This commit is contained in:
Linus Torvalds
@@ -1725,7 +1725,6 @@ static bool fbcon_scroll(struct vc_data *vc, unsigned int t, unsigned int b,
|
||||
vc->vc_video_erase_char,
|
||||
vc->vc_size_row * count);
|
||||
return true;
|
||||
break;
|
||||
|
||||
case SCROLL_WRAP_MOVE:
|
||||
if (b - t - count > 3 * vc->vc_rows >> 2) {
|
||||
@@ -1816,7 +1815,6 @@ static bool fbcon_scroll(struct vc_data *vc, unsigned int t, unsigned int b,
|
||||
vc->vc_video_erase_char,
|
||||
vc->vc_size_row * count);
|
||||
return true;
|
||||
break;
|
||||
|
||||
case SCROLL_WRAP_MOVE:
|
||||
if (b - t - count > 3 * vc->vc_rows >> 2) {
|
||||
|
||||
@@ -777,7 +777,7 @@ fb_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
|
||||
|
||||
if (info->fbops->fb_read)
|
||||
return info->fbops->fb_read(info, buf, count, ppos);
|
||||
|
||||
|
||||
total_size = info->screen_size;
|
||||
|
||||
if (total_size == 0)
|
||||
@@ -842,7 +842,7 @@ fb_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
|
||||
|
||||
if (info->fbops->fb_write)
|
||||
return info->fbops->fb_write(info, buf, count, ppos);
|
||||
|
||||
|
||||
total_size = info->screen_size;
|
||||
|
||||
if (total_size == 0)
|
||||
@@ -1006,6 +1006,10 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* bitfill_aligned() assumes that it's at least 8x8 */
|
||||
if (var->xres < 8 || var->yres < 8)
|
||||
return -EINVAL;
|
||||
|
||||
ret = info->fbops->fb_check_var(var, info);
|
||||
|
||||
if (ret)
|
||||
@@ -1057,7 +1061,7 @@ EXPORT_SYMBOL(fb_set_var);
|
||||
|
||||
int
|
||||
fb_blank(struct fb_info *info, int blank)
|
||||
{
|
||||
{
|
||||
struct fb_event event;
|
||||
int ret = -EINVAL;
|
||||
|
||||
@@ -1433,7 +1437,7 @@ out:
|
||||
return res;
|
||||
}
|
||||
|
||||
static int
|
||||
static int
|
||||
fb_release(struct inode *inode, struct file *file)
|
||||
__acquires(&info->lock)
|
||||
__releases(&info->lock)
|
||||
@@ -1623,7 +1627,7 @@ static int do_register_framebuffer(struct fb_info *fb_info)
|
||||
fb_info->pixmap.access_align = 32;
|
||||
fb_info->pixmap.flags = FB_PIXMAP_DEFAULT;
|
||||
}
|
||||
}
|
||||
}
|
||||
fb_info->pixmap.offset = 0;
|
||||
|
||||
if (!fb_info->pixmap.blit_x)
|
||||
|
||||
Reference in New Issue
Block a user