The patch titled
uvesafb: Don't access VGA registers directly when running on non-x86
has been removed from the -mm tree. Its filename was
uvesafb-the-driver-core-dont-access-vga-registers-directly-when-running-on-non-x86.patch
This patch was dropped because it was folded into uvesafb-the-driver-core.patch
------------------------------------------------------
Subject: uvesafb: Don't access VGA registers directly when running on non-x86
From: Michal Januszewski <spock@xxxxxxxxxx>
The VGA registers are only available at their legacy IO locations on x86.
Don't try to access them when running on other arches.
Note that the code accessing them directly is just an optimization (limits
slow BIOS function calls). We don't lose any functionality by using BIOS
calls instead of it on non-x86.
Signed-off-by: Michal Januszewski <spock@xxxxxxxxxx>
Cc: Paul Mundt <lethal@xxxxxxxxxxxx>
Cc: Paulo Marques <pmarques@xxxxxxxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
Cc: "Antonino A. Daplas" <adaplas@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/video/uvesafb.c | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff -puN drivers/video/uvesafb.c~uvesafb-the-driver-core-dont-access-vga-registers-directly-when-running-on-non-x86 drivers/video/uvesafb.c
--- a/drivers/video/uvesafb.c~uvesafb-the-driver-core-dont-access-vga-registers-directly-when-running-on-non-x86
+++ a/drivers/video/uvesafb.c
@@ -19,8 +19,10 @@
#include <linux/io.h>
#include <linux/mutex.h>
#include <video/edid.h>
-#include <video/vga.h>
#include <video/uvesafb.h>
+#ifdef CONFIG_X86
+#include <video/vga.h>
+#endif
#ifdef CONFIG_MTRR
#include <asm/mtrr.h>
#endif
@@ -935,6 +937,7 @@ static int uvesafb_setpalette(struct uve
if (start + count > 256)
return -EINVAL;
+#ifdef CONFIG_X86
/* Use VGA registers if mode is VGA-compatible. */
if (i >= 0 && i < par->vbe_modes_cnt &&
par->vbe_modes[i].mode_attr & VBE_MODE_VGACOMPAT) {
@@ -957,8 +960,10 @@ static int uvesafb_setpalette(struct uve
"D" (entries), /* EDI */
"S" (&par->pmi_pal)); /* ESI */
}
-#endif
- else {
+#endif /* CONFIG_X86_32 */
+ else
+#endif /* CONFIG_X86 */
+ {
task = uvesafb_prep();
if (!task)
return -ENOMEM;
@@ -1102,6 +1107,7 @@ static int uvesafb_blank(int blank, stru
struct uvesafb_ktask *task;
int err = 1;
+#ifdef CONFIG_X86
if (par->vbe_ib.capabilities & VBE_CAP_VGACOMPAT) {
int loop = 10000;
u8 seq = 0, crtc17 = 0;
@@ -1124,7 +1130,9 @@ static int uvesafb_blank(int blank, stru
while (loop--);
vga_wcrt(NULL, 0x17, crtc17);
vga_wseq(NULL, 0x00, 0x03);
- } else {
+ } else
+#endif /* CONFIG_X86 */
+ {
task = uvesafb_prep();
if (!task)
return -ENOMEM;
_
Patches currently in -mm which might be from spock@xxxxxxxxxx are
fbdev-export-fb_destroy_modelist.patch
connector-change-connectors-max-message-size.patch
uvesafb-add-connector-entries.patch
uvesafb-the-driver-core.patch
uvesafb-the-driver-core-dont-access-vga-registers-directly-when-running-on-non-x86.patch
uvesafb-documentation.patch
uvesafb-documentation-uvesafb-add-info-about-pmipal-yrap-and-ypan-being-available-only-on-x86.patch
fbdev-find-mode-with-the-highest-safest-refresh-rate-in-fb_find_mode.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
