From: Roman Kiryanov rkir@google.com
Address issues pointed by checkpatch.pl
Signed-off-by: Roman Kiryanov rkir@google.com --- drivers/video/fbdev/goldfishfb.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/video/fbdev/goldfishfb.c b/drivers/video/fbdev/goldfishfb.c index 3b70044773b6..de29c4ff77e5 100644 --- a/drivers/video/fbdev/goldfishfb.c +++ b/drivers/video/fbdev/goldfishfb.c @@ -124,6 +124,7 @@ static int goldfish_fb_check_var(struct fb_var_screeninfo *var, static int goldfish_fb_set_par(struct fb_info *info) { struct goldfish_fb *fb = container_of(info, struct goldfish_fb, fb); + if (fb->rotation != fb->fb.var.rotate) { info->fix.line_length = info->var.xres * 2; fb->rotation = fb->fb.var.rotate; @@ -148,13 +149,14 @@ static int goldfish_fb_pan_display(struct fb_var_screeninfo *var, wait_event_timeout(fb->wait, fb->base_update_count != base_update_count, HZ / 15); if (fb->base_update_count == base_update_count) - pr_err("goldfish_fb_pan_display: timeout waiting for base update\n"); + pr_err("%s: timeout waiting for base update\n", __func__); return 0; }
static int goldfish_fb_blank(int blank, struct fb_info *info) { struct goldfish_fb *fb = container_of(info, struct goldfish_fb, fb); + switch (blank) { case FB_BLANK_NORMAL: writel(1, fb->reg_base + FB_SET_BLANK);
From: Yu Ning yu.ning@intel.com
Follow the same way in which ACPI was enabled for goldfish battery. See commit d3be10e for details.
Note that this patch also depends on commit af33cac.
Signed-off-by: Yu Ning yu.ning@intel.com Signed-off-by: Roman Kiryanov rkir@google.com --- drivers/video/fbdev/goldfishfb.c | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/drivers/video/fbdev/goldfishfb.c b/drivers/video/fbdev/goldfishfb.c index de29c4ff77e5..01732858b60d 100644 --- a/drivers/video/fbdev/goldfishfb.c +++ b/drivers/video/fbdev/goldfishfb.c @@ -26,6 +26,7 @@ #include <linux/interrupt.h> #include <linux/ioport.h> #include <linux/platform_device.h> +#include <linux/acpi.h>
enum { FB_GET_WIDTH = 0x00, @@ -312,12 +313,19 @@ static const struct of_device_id goldfish_fb_of_match[] = { }; MODULE_DEVICE_TABLE(of, goldfish_fb_of_match);
+static const struct acpi_device_id goldfish_fb_acpi_match[] = { + { "GFSH0004", 0 }, + { }, +}; +MODULE_DEVICE_TABLE(acpi, goldfish_fb_acpi_match); + static struct platform_driver goldfish_fb_driver = { .probe = goldfish_fb_probe, .remove = goldfish_fb_remove, .driver = { .name = "goldfish_fb", .of_match_table = goldfish_fb_of_match, + .acpi_match_table = ACPI_PTR(goldfish_fb_acpi_match), } };
[ + linux-fbdev ML ]
Hi,
On Thursday, May 31, 2018 03:02:51 PM rkir@google.com wrote:
From: Yu Ning yu.ning@intel.com
Follow the same way in which ACPI was enabled for goldfish battery. See commit d3be10e for details.
No commit d3be10e in upstream and -next kernels?
Note that this patch also depends on commit af33cac.
ditto for commit af33ac
also commits should be described with the following format:
tag with the first 12 characters of the SHA-1 ID, and the one line summary, i.e.:
e21d2170f366 ("video: remove unnecessary platform_set_drvdata()")
Best regards, -- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics
From: Christoffer Dall christoffer.dall@linaro.org
User space Android code identifies pixclock == 0 as a sign for emulation and will set the frame rate to 60 fps when reading this value, which is the desired outcome.
Change-Id: I759bf518bf6683446bc786bf1be3cafa02dd8d42 Signed-off-by: Christoffer Dall christoffer.dall@linaro.org Signed-off-by: Peter Maydell peter.maydell@linaro.org --- drivers/video/fbdev/goldfishfb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/fbdev/goldfishfb.c b/drivers/video/fbdev/goldfishfb.c index 01732858b60d..3a9e5f1b758e 100644 --- a/drivers/video/fbdev/goldfishfb.c +++ b/drivers/video/fbdev/goldfishfb.c @@ -237,7 +237,7 @@ static int goldfish_fb_probe(struct platform_device *pdev) fb->fb.var.activate = FB_ACTIVATE_NOW; fb->fb.var.height = readl(fb->reg_base + FB_GET_PHYS_HEIGHT); fb->fb.var.width = readl(fb->reg_base + FB_GET_PHYS_WIDTH); - fb->fb.var.pixclock = 10000; + fb->fb.var.pixclock = 0;
fb->fb.var.red.offset = 11; fb->fb.var.red.length = 5;
[ + linux-fbdev ML ]
On Thursday, May 31, 2018 03:02:52 PM rkir@google.com wrote:
From: Christoffer Dall christoffer.dall@linaro.org
User space Android code identifies pixclock == 0 as a sign for emulation and will set the frame rate to 60 fps when reading this value, which is the desired outcome.
Change-Id: I759bf518bf6683446bc786bf1be3cafa02dd8d42
please drop your local Change-Id from the upstream kernel submissions
Signed-off-by: Christoffer Dall christoffer.dall@linaro.org Signed-off-by: Peter Maydell peter.maydell@linaro.org
your S-o-b line is also needed
Best regards, -- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics
Hi,
thank you for reviewing our patches. I sent "v2".
Regards, Roman. On Fri, Jun 8, 2018 at 9:24 AM Bartlomiej Zolnierkiewicz b.zolnierkie@samsung.com wrote:
[ + linux-fbdev ML ]
On Thursday, May 31, 2018 03:02:52 PM rkir@google.com wrote:
From: Christoffer Dall christoffer.dall@linaro.org
User space Android code identifies pixclock == 0 as a sign for emulation and will set the frame rate to 60 fps when reading this value, which is the desired outcome.
Change-Id: I759bf518bf6683446bc786bf1be3cafa02dd8d42
please drop your local Change-Id from the upstream kernel submissions
Signed-off-by: Christoffer Dall christoffer.dall@linaro.org Signed-off-by: Peter Maydell peter.maydell@linaro.org
your S-o-b line is also needed
Best regards,
Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics
dri-devel@lists.freedesktop.org
-
Bartlomiej Zolnierkiewicz -
rkir＠google.com -
Roman Kiryanov