Skip to content

Commit dfb9fdf

Browse files
author
Alex Shi
committed
Merge tag 'v4.4.71' into linux-linaro-lsk-v4.4
 This is the 4.4.71 stable release
2 parents 9fd33d0 + 4bbbc76 commit dfb9fdf

70 files changed

Lines changed: 562 additions & 288 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION = 4
22
PATCHLEVEL = 4
3-
SUBLEVEL = 70
3+
SUBLEVEL = 71
44
EXTRAVERSION =
55
NAME = Blurry Fish Butt
66

‎arch/sparc/include/asm/pgtable_32.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ extern unsigned long pfn_base;
9191
* ZERO_PAGE is a global shared page that is always zero: used
9292
* for zero-mapped memory areas etc..
9393
*/
94-
extern unsigned long empty_zero_page;
94+
extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];
9595

96-
#define ZERO_PAGE(vaddr) (virt_to_page(&empty_zero_page))
96+
#define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))
9797

9898
/*
9999
* In general all page table modifications should use the V8 atomic

‎arch/sparc/include/asm/setup.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ extern char reboot_command[];
1616
*/
1717
extern unsigned char boot_cpu_id;
1818

19-
extern unsigned long empty_zero_page;
19+
extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];
2020

2121
extern int serial_console;
2222
static inline int con_is_present(void)

‎arch/sparc/mm/init_32.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ void __init mem_init(void)
301301

302302

303303
/* Saves us work later. */
304-
memset((void *)&empty_zero_page, 0, PAGE_SIZE);
304+
memset((void *)empty_zero_page, 0, PAGE_SIZE);
305305

306306
i = last_valid_pfn >> ((20 - PAGE_SHIFT) + 5);
307307
i += 1;

‎drivers/char/pcmcia/cm4040_cs.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ static ssize_t cm4040_write(struct file *filp, const char __user *buf,
374374

375375
rc = write_sync_reg(SCR_HOST_TO_READER_START, dev);
376376
if (rc <= 0) {
377-
DEBUGP(5, dev, "write_sync_reg c=%.2Zx\n", rc);
377+
DEBUGP(5, dev, "write_sync_reg c=%.2zx\n", rc);
378378
DEBUGP(2, dev, "<- cm4040_write (failed)\n");
379379
if (rc == -ERESTARTSYS)
380380
return rc;
@@ -387,7 +387,7 @@ static ssize_t cm4040_write(struct file *filp, const char __user *buf,
387387
for (i = 0; i < bytes_to_write; i++) {
388388
rc = wait_for_bulk_out_ready(dev);
389389
if (rc <= 0) {
390-
DEBUGP(5, dev, "wait_for_bulk_out_ready rc=%.2Zx\n",
390+
DEBUGP(5, dev, "wait_for_bulk_out_ready rc=%.2zx\n",
391391
rc);
392392
DEBUGP(2, dev, "<- cm4040_write (failed)\n");
393393
if (rc == -ERESTARTSYS)
@@ -403,7 +403,7 @@ static ssize_t cm4040_write(struct file *filp, const char __user *buf,
403403
rc = write_sync_reg(SCR_HOST_TO_READER_DONE, dev);
404404

405405
if (rc <= 0) {
406-
DEBUGP(5, dev, "write_sync_reg c=%.2Zx\n", rc);
406+
DEBUGP(5, dev, "write_sync_reg c=%.2zx\n", rc);
407407
DEBUGP(2, dev, "<- cm4040_write (failed)\n");
408408
if (rc == -ERESTARTSYS)
409409
return rc;

‎drivers/gpu/drm/gma500/psb_intel_lvds.c‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -783,20 +783,23 @@ void psb_intel_lvds_init(struct drm_device *dev,
783783
if (scan->type & DRM_MODE_TYPE_PREFERRED) {
784784
mode_dev->panel_fixed_mode =
785785
drm_mode_duplicate(dev, scan);
786+
DRM_DEBUG_KMS("Using mode from DDC\n");
786787
goto out; /* FIXME: check for quirks */
787788
}
788789
}
789790

790791
/* Failed to get EDID, what about VBT? do we need this? */
791-
if (mode_dev->vbt_mode)
792+
if (dev_priv->lfp_lvds_vbt_mode) {
792793
mode_dev->panel_fixed_mode =
793-
drm_mode_duplicate(dev, mode_dev->vbt_mode);
794+
drm_mode_duplicate(dev, dev_priv->lfp_lvds_vbt_mode);
794795

795-
if (!mode_dev->panel_fixed_mode)
796-
if (dev_priv->lfp_lvds_vbt_mode)
797-
mode_dev->panel_fixed_mode =
798-
drm_mode_duplicate(dev,
799-
dev_priv->lfp_lvds_vbt_mode);
796+
if (mode_dev->panel_fixed_mode) {
797+
mode_dev->panel_fixed_mode->type |=
798+
DRM_MODE_TYPE_PREFERRED;
799+
DRM_DEBUG_KMS("Using mode from VBT\n");
800+
goto out;
801+
}
802+
}
800803

801804
/*
802805
* If we didn't get EDID, try checking if the panel is already turned
@@ -813,6 +816,7 @@ void psb_intel_lvds_init(struct drm_device *dev,
813816
if (mode_dev->panel_fixed_mode) {
814817
mode_dev->panel_fixed_mode->type |=
815818
DRM_MODE_TYPE_PREFERRED;
819+
DRM_DEBUG_KMS("Using pre-programmed mode\n");
816820
goto out; /* FIXME: check for quirks */
817821
}
818822
}

‎drivers/gpu/drm/radeon/ci_dpm.c‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -776,6 +776,12 @@ bool ci_dpm_vblank_too_short(struct radeon_device *rdev)
776776
u32 vblank_time = r600_dpm_get_vblank_time(rdev);
777777
u32 switch_limit = pi->mem_gddr5 ? 450 : 300;
778778

779+
/* disable mclk switching if the refresh is >120Hz, even if the
780+
* blanking period would allow it
781+
*/
782+
if (r600_dpm_get_vrefresh(rdev) > 120)
783+
return true;
784+
779785
if (vblank_time < switch_limit)
780786
return true;
781787
else

‎drivers/gpu/drm/radeon/cik.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7762,7 +7762,7 @@ static inline void cik_irq_ack(struct radeon_device *rdev)
77627762
WREG32(DC_HPD5_INT_CONTROL, tmp);
77637763
}
77647764
if (rdev->irq.stat_regs.cik.disp_int_cont5 & DC_HPD6_INTERRUPT) {
7765-
tmp = RREG32(DC_HPD5_INT_CONTROL);
7765+
tmp = RREG32(DC_HPD6_INT_CONTROL);
77667766
tmp |= DC_HPDx_INT_ACK;
77677767
WREG32(DC_HPD6_INT_CONTROL, tmp);
77687768
}
@@ -7792,7 +7792,7 @@ static inline void cik_irq_ack(struct radeon_device *rdev)
77927792
WREG32(DC_HPD5_INT_CONTROL, tmp);
77937793
}
77947794
if (rdev->irq.stat_regs.cik.disp_int_cont5 & DC_HPD6_RX_INTERRUPT) {
7795-
tmp = RREG32(DC_HPD5_INT_CONTROL);
7795+
tmp = RREG32(DC_HPD6_INT_CONTROL);
77967796
tmp |= DC_HPDx_RX_INT_ACK;
77977797
WREG32(DC_HPD6_INT_CONTROL, tmp);
77987798
}

‎drivers/gpu/drm/radeon/evergreen.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4924,7 +4924,7 @@ static void evergreen_irq_ack(struct radeon_device *rdev)
49244924
WREG32(DC_HPD5_INT_CONTROL, tmp);
49254925
}
49264926
if (rdev->irq.stat_regs.evergreen.disp_int_cont5 & DC_HPD6_INTERRUPT) {
4927-
tmp = RREG32(DC_HPD5_INT_CONTROL);
4927+
tmp = RREG32(DC_HPD6_INT_CONTROL);
49284928
tmp |= DC_HPDx_INT_ACK;
49294929
WREG32(DC_HPD6_INT_CONTROL, tmp);
49304930
}
@@ -4955,7 +4955,7 @@ static void evergreen_irq_ack(struct radeon_device *rdev)
49554955
WREG32(DC_HPD5_INT_CONTROL, tmp);
49564956
}
49574957
if (rdev->irq.stat_regs.evergreen.disp_int_cont5 & DC_HPD6_RX_INTERRUPT) {
4958-
tmp = RREG32(DC_HPD5_INT_CONTROL);
4958+
tmp = RREG32(DC_HPD6_INT_CONTROL);
49594959
tmp |= DC_HPDx_RX_INT_ACK;
49604960
WREG32(DC_HPD6_INT_CONTROL, tmp);
49614961
}

‎drivers/gpu/drm/radeon/r600.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3945,7 +3945,7 @@ static void r600_irq_ack(struct radeon_device *rdev)
39453945
WREG32(DC_HPD5_INT_CONTROL, tmp);
39463946
}
39473947
if (rdev->irq.stat_regs.r600.disp_int_cont2 & DC_HPD6_INTERRUPT) {
3948-
tmp = RREG32(DC_HPD5_INT_CONTROL);
3948+
tmp = RREG32(DC_HPD6_INT_CONTROL);
39493949
tmp |= DC_HPDx_INT_ACK;
39503950
WREG32(DC_HPD6_INT_CONTROL, tmp);
39513951
}

0 commit comments

Comments
 (0)