diff options
Diffstat (limited to 'meta/recipes-devtools/qemu/files/Revert-vmware_vga-Add-back-some-info-in-local-state-.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/files/Revert-vmware_vga-Add-back-some-info-in-local-state-.patch | 114 |
1 files changed, 0 insertions, 114 deletions
diff --git a/meta/recipes-devtools/qemu/files/Revert-vmware_vga-Add-back-some-info-in-local-state-.patch b/meta/recipes-devtools/qemu/files/Revert-vmware_vga-Add-back-some-info-in-local-state-.patch deleted file mode 100644 index d56256e05c..0000000000 --- a/meta/recipes-devtools/qemu/files/Revert-vmware_vga-Add-back-some-info-in-local-state-.patch +++ /dev/null | |||
@@ -1,114 +0,0 @@ | |||
1 | From 2cf7df441ce4c36525ba4d2d040f8cb0b0c75f14 Mon Sep 17 00:00:00 2001 | ||
2 | From: Constantin Musca <constantinx.musca@intel.com> | ||
3 | Date: Fri, 7 Dec 2012 12:33:42 +0200 | ||
4 | Subject: [PATCH] Revert "vmware_vga: Add back some info in local state | ||
5 | partially reverting aa32b38c" | ||
6 | |||
7 | - this reverts commit 1f202568e0553b416483e5993f1bde219c22cf72 | ||
8 | - do not cache the DS depth (the depth might change) | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | Signed-off-by: Constantin Musca <constantinx.musca@intel.com> | ||
12 | --- | ||
13 | hw/vmware_vga.c | 30 +++++++++--------------------- | ||
14 | 1 file changed, 9 insertions(+), 21 deletions(-) | ||
15 | |||
16 | diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c | ||
17 | index 834588d..7c766fb 100644 | ||
18 | --- a/hw/vmware_vga.c | ||
19 | +++ b/hw/vmware_vga.c | ||
20 | @@ -39,8 +39,6 @@ struct vmsvga_state_s { | ||
21 | VGACommonState vga; | ||
22 | |||
23 | int invalidated; | ||
24 | - int depth; | ||
25 | - int bypp; | ||
26 | int enable; | ||
27 | int config; | ||
28 | struct { | ||
29 | @@ -57,9 +55,6 @@ struct vmsvga_state_s { | ||
30 | int new_height; | ||
31 | uint32_t guest; | ||
32 | uint32_t svgaid; | ||
33 | - uint32_t wred; | ||
34 | - uint32_t wgreen; | ||
35 | - uint32_t wblue; | ||
36 | int syncing; | ||
37 | |||
38 | MemoryRegion fifo_ram; | ||
39 | @@ -723,25 +718,25 @@ static uint32_t vmsvga_value_read(void *opaque, uint32_t address) | ||
40 | return SVGA_MAX_HEIGHT; | ||
41 | |||
42 | case SVGA_REG_DEPTH: | ||
43 | - return s->depth; | ||
44 | + return ds_get_depth(s->vga.ds); | ||
45 | |||
46 | case SVGA_REG_BITS_PER_PIXEL: | ||
47 | - return (s->depth + 7) & ~7; | ||
48 | + return ds_get_bits_per_pixel(s->vga.ds); | ||
49 | |||
50 | case SVGA_REG_PSEUDOCOLOR: | ||
51 | return 0x0; | ||
52 | |||
53 | case SVGA_REG_RED_MASK: | ||
54 | - return s->wred; | ||
55 | + return ds_get_rmask(s->vga.ds); | ||
56 | |||
57 | case SVGA_REG_GREEN_MASK: | ||
58 | - return s->wgreen; | ||
59 | + return ds_get_gmask(s->vga.ds); | ||
60 | |||
61 | case SVGA_REG_BLUE_MASK: | ||
62 | - return s->wblue; | ||
63 | + return ds_get_bmask(s->vga.ds); | ||
64 | |||
65 | case SVGA_REG_BYTES_PER_LINE: | ||
66 | - return s->bypp * s->new_width; | ||
67 | + return ds_get_bytes_per_pixel(s->vga.ds) * s->new_width; | ||
68 | |||
69 | case SVGA_REG_FB_START: { | ||
70 | struct pci_vmsvga_state_s *pci_vmsvga | ||
71 | @@ -806,7 +801,7 @@ static uint32_t vmsvga_value_read(void *opaque, uint32_t address) | ||
72 | return s->cursor.on; | ||
73 | |||
74 | case SVGA_REG_HOST_BITS_PER_PIXEL: | ||
75 | - return (s->depth + 7) & ~7; | ||
76 | + return ds_get_bits_per_pixel(s->vga.ds); | ||
77 | |||
78 | case SVGA_REG_SCRATCH_SIZE: | ||
79 | return s->scratch_size; | ||
80 | @@ -869,7 +864,7 @@ static void vmsvga_value_write(void *opaque, uint32_t address, uint32_t value) | ||
81 | break; | ||
82 | |||
83 | case SVGA_REG_BITS_PER_PIXEL: | ||
84 | - if (value != s->depth) { | ||
85 | + if (value != ds_get_bits_per_pixel(s->vga.ds)) { | ||
86 | printf("%s: Bad bits per pixel: %i bits\n", __func__, value); | ||
87 | s->config = 0; | ||
88 | } | ||
89 | @@ -1089,7 +1084,7 @@ static const VMStateDescription vmstate_vmware_vga_internal = { | ||
90 | .minimum_version_id_old = 0, | ||
91 | .post_load = vmsvga_post_load, | ||
92 | .fields = (VMStateField[]) { | ||
93 | - VMSTATE_INT32_EQUAL(depth, struct vmsvga_state_s), | ||
94 | + VMSTATE_UNUSED(4), /* was depth */ | ||
95 | VMSTATE_INT32(enable, struct vmsvga_state_s), | ||
96 | VMSTATE_INT32(config, struct vmsvga_state_s), | ||
97 | VMSTATE_INT32(cursor.id, struct vmsvga_state_s), | ||
98 | @@ -1142,13 +1137,6 @@ static void vmsvga_init(struct vmsvga_state_s *s, | ||
99 | vga_common_init(&s->vga); | ||
100 | vga_init(&s->vga, address_space, io, true); | ||
101 | vmstate_register(NULL, 0, &vmstate_vga_common, &s->vga); | ||
102 | - /* Save some values here in case they are changed later. | ||
103 | - * This is suspicious and needs more though why it is needed. */ | ||
104 | - s->depth = ds_get_bits_per_pixel(s->vga.ds); | ||
105 | - s->bypp = ds_get_bytes_per_pixel(s->vga.ds); | ||
106 | - s->wred = ds_get_rmask(s->vga.ds); | ||
107 | - s->wgreen = ds_get_gmask(s->vga.ds); | ||
108 | - s->wblue = ds_get_bmask(s->vga.ds); | ||
109 | } | ||
110 | |||
111 | static uint64_t vmsvga_io_read(void *opaque, hwaddr addr, unsigned size) | ||
112 | -- | ||
113 | 1.7.11.7 | ||
114 | |||