Skip to content

Commit ac0761d

Browse files
torvaldstorvalds
committed
Merge tag 'fbdev-for-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev
Pull fbdev updates from Helge Deller: "Fixes: - omap: use threaded IRQ for LCD DMA - omapfb: Fix an OF node leak in dss_of_port_get_parent_device() - vga16fb: fix orig_video_isVGA confusion Updates & cleanups: - hdmi: Remove unused hdmi_infoframe_check - omapfb: - Remove unused hdmi5_core_handle_irqs - Use of_property_present() to test existence of DT property - Use syscon_regmap_lookup_by_phandle_args - efifb: Change the return value type to void - lcdcfb: Use backlight helper - udlfb: Use const 'struct bin_attribute' callback - radeon: Use const 'struct bin_attribute' callbacks - sm501fb: Use str_enabled_disabled() helper in sm501fb_init_fb()" * tag 'fbdev-for-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev: fbdev: lcdcfb: Use backlight helper fbdev: vga16fb: fix orig_video_isVGA confusion fbdev: omapfb: Use syscon_regmap_lookup_by_phandle_args fbdev: omapfb: Use of_property_present() to test existence of DT property fbdev: sm501fb: Use str_enabled_disabled() helper in sm501fb_init_fb() fbdev: omap: use threaded IRQ for LCD DMA fbdev: omapfb: Fix an OF node leak in dss_of_port_get_parent_device() fbdev: efifb: Change the return value type to void fbdev: omapfb: Remove unused hdmi5_core_handle_irqs video: hdmi: Remove unused hdmi_infoframe_check fbdev: radeon: Use const 'struct bin_attribute' callbacks fbdev: udlfb: Use const 'struct bin_attribute' callback
2 parents ab18b8f + d08e783 commit ac0761d

13 files changed

Lines changed: 23 additions & 78 deletions

File tree

‎drivers/video/fbdev/aty/radeon_base.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2199,7 +2199,7 @@ static ssize_t radeon_show_one_edid(char *buf, loff_t off, size_t count, const u
21992199

22002200

22012201
static ssize_t radeon_show_edid1(struct file *filp, struct kobject *kobj,
2202-
struct bin_attribute *bin_attr,
2202+
const struct bin_attribute *bin_attr,
22032203
char *buf, loff_t off, size_t count)
22042204
{
22052205
struct device *dev = kobj_to_dev(kobj);
@@ -2211,7 +2211,7 @@ static ssize_t radeon_show_edid1(struct file *filp, struct kobject *kobj,
22112211

22122212

22132213
static ssize_t radeon_show_edid2(struct file *filp, struct kobject *kobj,
2214-
struct bin_attribute *bin_attr,
2214+
const struct bin_attribute *bin_attr,
22152215
char *buf, loff_t off, size_t count)
22162216
{
22172217
struct device *dev = kobj_to_dev(kobj);
@@ -2227,7 +2227,7 @@ static const struct bin_attribute edid1_attr = {
22272227
.mode = 0444,
22282228
},
22292229
.size = EDID_LENGTH,
2230-
.read = radeon_show_edid1,
2230+
.read_new = radeon_show_edid1,
22312231
};
22322232

22332233
static const struct bin_attribute edid2_attr = {
@@ -2236,7 +2236,7 @@ static const struct bin_attribute edid2_attr = {
22362236
.mode = 0444,
22372237
},
22382238
.size = EDID_LENGTH,
2239-
.read = radeon_show_edid2,
2239+
.read_new = radeon_show_edid2,
22402240
};
22412241

22422242
static int radeonfb_pci_register(struct pci_dev *pdev,

‎drivers/video/fbdev/efifb.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ static const struct fb_ops efifb_ops = {
275275
.fb_setcolreg = efifb_setcolreg,
276276
};
277277

278-
static int efifb_setup(struct screen_info *si, char *options)
278+
static void efifb_setup(struct screen_info *si, char *options)
279279
{
280280
char *this_opt;
281281

@@ -299,8 +299,6 @@ static int efifb_setup(struct screen_info *si, char *options)
299299
use_bgrt = false;
300300
}
301301
}
302-
303-
return 0;
304302
}
305303

306304
static inline bool fb_base_is_valid(struct screen_info *si)

‎drivers/video/fbdev/omap/lcd_dma.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,8 +432,8 @@ static int __init omap_init_lcd_dma(void)
432432

433433
spin_lock_init(&lcd_dma.lock);
434434

435-
r = request_irq(INT_DMA_LCD, lcd_dma_irq_handler, 0,
436-
"LCD DMA", NULL);
435+
r = request_threaded_irq(INT_DMA_LCD, NULL, lcd_dma_irq_handler,
436+
IRQF_ONESHOT, "LCD DMA", NULL);
437437
if (r != 0)
438438
pr_err("unable to request IRQ for LCD DMA (error %d)\n", r);
439439

‎drivers/video/fbdev/omap2/omapfb/dss/dispc.c‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3933,18 +3933,13 @@ static int dispc_bind(struct device *dev, struct device *master, void *data)
39333933
return -ENODEV;
39343934
}
39353935

3936-
if (np && of_property_read_bool(np, "syscon-pol")) {
3937-
dispc.syscon_pol = syscon_regmap_lookup_by_phandle(np, "syscon-pol");
3936+
if (np && of_property_present(np, "syscon-pol")) {
3937+
dispc.syscon_pol = syscon_regmap_lookup_by_phandle_args(np, "syscon-pol",
3938+
1, &dispc.syscon_pol_offset);
39383939
if (IS_ERR(dispc.syscon_pol)) {
39393940
dev_err(&pdev->dev, "failed to get syscon-pol regmap\n");
39403941
return PTR_ERR(dispc.syscon_pol);
39413942
}
3942-
3943-
if (of_property_read_u32_index(np, "syscon-pol", 1,
3944-
&dispc.syscon_pol_offset)) {
3945-
dev_err(&pdev->dev, "failed to get syscon-pol offset\n");
3946-
return -EINVAL;
3947-
}
39483943
}
39493944

39503945
pm_runtime_enable(&pdev->dev);

‎drivers/video/fbdev/omap2/omapfb/dss/dss-of.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ struct device_node *dss_of_port_get_parent_device(struct device_node *port)
3636
np = of_get_next_parent(np);
3737
}
3838

39+
of_node_put(np);
3940
return NULL;
4041
}
4142

‎drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -567,23 +567,6 @@ static void hdmi_core_enable_interrupts(struct hdmi_core_data *core)
567567
REG_FLD_MOD(core->base, HDMI_CORE_IH_MUTE, 0x0, 1, 0);
568568
}
569569

570-
int hdmi5_core_handle_irqs(struct hdmi_core_data *core)
571-
{
572-
void __iomem *base = core->base;
573-
574-
REG_FLD_MOD(base, HDMI_CORE_IH_FC_STAT0, 0xff, 7, 0);
575-
REG_FLD_MOD(base, HDMI_CORE_IH_FC_STAT1, 0xff, 7, 0);
576-
REG_FLD_MOD(base, HDMI_CORE_IH_FC_STAT2, 0xff, 7, 0);
577-
REG_FLD_MOD(base, HDMI_CORE_IH_AS_STAT0, 0xff, 7, 0);
578-
REG_FLD_MOD(base, HDMI_CORE_IH_PHY_STAT0, 0xff, 7, 0);
579-
REG_FLD_MOD(base, HDMI_CORE_IH_I2CM_STAT0, 0xff, 7, 0);
580-
REG_FLD_MOD(base, HDMI_CORE_IH_CEC_STAT0, 0xff, 7, 0);
581-
REG_FLD_MOD(base, HDMI_CORE_IH_VP_STAT0, 0xff, 7, 0);
582-
REG_FLD_MOD(base, HDMI_CORE_IH_I2CMPHY_STAT0, 0xff, 7, 0);
583-
584-
return 0;
585-
}
586-
587570
void hdmi5_configure(struct hdmi_core_data *core, struct hdmi_wp_data *wp,
588571
struct hdmi_config *cfg)
589572
{

‎drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,6 @@ struct csc_table {
283283

284284
int hdmi5_read_edid(struct hdmi_core_data *core, u8 *edid, int len);
285285
void hdmi5_core_dump(struct hdmi_core_data *core, struct seq_file *s);
286-
int hdmi5_core_handle_irqs(struct hdmi_core_data *core);
287286
void hdmi5_configure(struct hdmi_core_data *core, struct hdmi_wp_data *wp,
288287
struct hdmi_config *cfg);
289288
int hdmi5_core_init(struct platform_device *pdev, struct hdmi_core_data *core);

‎drivers/video/fbdev/sh_mobile_lcdcfb.c‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2123,11 +2123,7 @@ sh_mobile_lcdc_channel_fb_init(struct sh_mobile_lcdc_chan *ch,
21232123
static int sh_mobile_lcdc_update_bl(struct backlight_device *bdev)
21242124
{
21252125
struct sh_mobile_lcdc_chan *ch = bl_get_data(bdev);
2126-
int brightness = bdev->props.brightness;
2127-
2128-
if (bdev->props.power != BACKLIGHT_POWER_ON ||
2129-
bdev->props.state & (BL_CORE_SUSPENDED | BL_CORE_FBBLANK))
2130-
brightness = 0;
2126+
int brightness = backlight_get_brightness(bdev);
21312127

21322128
ch->bl_brightness = brightness;
21332129
return ch->cfg->bl_info.set_brightness(brightness);

‎drivers/video/fbdev/sm501fb.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include <linux/clk.h>
2828
#include <linux/console.h>
2929
#include <linux/io.h>
30+
#include <linux/string_choices.h>
3031

3132
#include <linux/uaccess.h>
3233
#include <asm/div64.h>
@@ -1712,8 +1713,8 @@ static int sm501fb_init_fb(struct fb_info *fb, enum sm501_controller head,
17121713
BUG();
17131714
}
17141715

1715-
dev_info(info->dev, "fb %s %sabled at start\n",
1716-
fbname, enable ? "en" : "dis");
1716+
dev_info(info->dev, "fb %s %s at start\n",
1717+
fbname, str_enabled_disabled(enable));
17171718

17181719
/* check to see if our routing allows this */
17191720

‎drivers/video/fbdev/udlfb.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1416,7 +1416,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
14161416

14171417
static ssize_t edid_show(
14181418
struct file *filp,
1419-
struct kobject *kobj, struct bin_attribute *a,
1419+
struct kobject *kobj, const struct bin_attribute *a,
14201420
char *buf, loff_t off, size_t count) {
14211421
struct device *fbdev = kobj_to_dev(kobj);
14221422
struct fb_info *fb_info = dev_get_drvdata(fbdev);
@@ -1438,7 +1438,7 @@ static ssize_t edid_show(
14381438

14391439
static ssize_t edid_store(
14401440
struct file *filp,
1441-
struct kobject *kobj, struct bin_attribute *a,
1441+
struct kobject *kobj, const struct bin_attribute *a,
14421442
char *src, loff_t src_off, size_t src_size) {
14431443
struct device *fbdev = kobj_to_dev(kobj);
14441444
struct fb_info *fb_info = dev_get_drvdata(fbdev);
@@ -1482,8 +1482,8 @@ static const struct bin_attribute edid_attr = {
14821482
.attr.name = "edid",
14831483
.attr.mode = 0666,
14841484
.size = EDID_LENGTH,
1485-
.read = edid_show,
1486-
.write = edid_store
1485+
.read_new = edid_show,
1486+
.write_new = edid_store
14871487
};
14881488

14891489
static const struct device_attribute fb_device_attrs[] = {

0 commit comments

Comments
 (0)