Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
drm/radeon/kms: fix i2c pad masks on rs4xx
These got lost in the last i2c cleanup. Fixes:
https://bugzilla.kernel.org/show_bug.cgi?id=23222
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
authored by Alex Deucher and committed by Dave Airlie be663057 95ccb0f3
+13
drivers/gpu/drm/radeon/radeon_combios.c
+13
drivers/gpu/drm/radeon/radeon_combios.c
···
571
}
572
573
if (clk_mask && data_mask) {
574
i2c.mask_clk_mask = clk_mask;
575
i2c.mask_data_mask = data_mask;
576
i2c.a_clk_mask = clk_mask;
···
580
i2c.en_data_mask = data_mask;
581
i2c.y_clk_mask = clk_mask;
582
i2c.y_data_mask = data_mask;
583
} else {
584
i2c.mask_clk_mask = RADEON_GPIO_EN_1;
585
i2c.mask_data_mask = RADEON_GPIO_EN_0;
586
i2c.a_clk_mask = RADEON_GPIO_A_1;
···
571
}
572
573
if (clk_mask && data_mask) {
574
+
/* system specific masks */
575
i2c.mask_clk_mask = clk_mask;
576
i2c.mask_data_mask = data_mask;
577
i2c.a_clk_mask = clk_mask;
···
579
i2c.en_data_mask = data_mask;
580
i2c.y_clk_mask = clk_mask;
581
i2c.y_data_mask = data_mask;
582
+
} else if ((ddc_line == RADEON_GPIOPAD_MASK) ||
583
+
(ddc_line == RADEON_MDGPIO_MASK)) {
584
+
/* default gpiopad masks */
585
+
i2c.mask_clk_mask = (0x20 << 8);
586
+
i2c.mask_data_mask = 0x80;
587
+
i2c.a_clk_mask = (0x20 << 8);
588
+
i2c.a_data_mask = 0x80;
589
+
i2c.en_clk_mask = (0x20 << 8);
590
+
i2c.en_data_mask = 0x80;
591
+
i2c.y_clk_mask = (0x20 << 8);
592
+
i2c.y_data_mask = 0x80;
593
} else {
594
+
/* default masks for ddc pads */
595
i2c.mask_clk_mask = RADEON_GPIO_EN_1;
596
i2c.mask_data_mask = RADEON_GPIO_EN_0;
597
i2c.a_clk_mask = RADEON_GPIO_A_1;