projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FROMLIST: drm: Add HDMI 2.0 VIC support for AVI info-frames
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpu
/
drm
/
radeon
/
si.c
diff --git
a/drivers/gpu/drm/radeon/si.c
b/drivers/gpu/drm/radeon/si.c
index 07037e32dea327f935ef39e0bdafea8fb640b39a..f878d6962da58b4aed296c22e485846bc14183c4 100644
(file)
--- a/
drivers/gpu/drm/radeon/si.c
+++ b/
drivers/gpu/drm/radeon/si.c
@@
-2376,6
+2376,9
@@
static void dce6_program_watermarks(struct radeon_device *rdev,
c.full = dfixed_div(c, a);
priority_b_mark = dfixed_trunc(c);
priority_b_cnt |= priority_b_mark & PRIORITY_MARK_MASK;
c.full = dfixed_div(c, a);
priority_b_mark = dfixed_trunc(c);
priority_b_cnt |= priority_b_mark & PRIORITY_MARK_MASK;
+
+ /* Save number of lines the linebuffer leads before the scanout */
+ radeon_crtc->lb_vblank_lead_lines = DIV_ROUND_UP(lb_size, mode->crtc_hdisplay);
}
/* select wm A */
}
/* select wm A */
@@
-6848,7
+6851,7
@@
restart_ih:
if (queue_dp)
schedule_work(&rdev->dp_work);
if (queue_hotplug)
if (queue_dp)
schedule_work(&rdev->dp_work);
if (queue_hotplug)
- schedule_
work(&rdev->hotplug_work
);
+ schedule_
delayed_work(&rdev->hotplug_work, 0
);
if (queue_thermal && rdev->pm.dpm_enabled)
schedule_work(&rdev->pm.dpm.thermal.work);
rdev->ih.rptr = rptr;
if (queue_thermal && rdev->pm.dpm_enabled)
schedule_work(&rdev->pm.dpm.thermal.work);
rdev->ih.rptr = rptr;