This removes a few chunks of code that do nothing useful.
* MAX_MRS was not used anywhere.
* The MMIO offset switch block had only a default case.
* Generating mip maps for the texture is a waste of time as the
texture is only used for read-out to a system memory buffer.
* The trace range callbacks are used only when the device is
handled by the (2D-only) UEFI guest driver, not by the macOS
guest driver, hence the lack of observed use in the vmapple
machine which does not use UEFI. Making these no-ops could
potentially be harmful, whereas leaving them unimplemented
is explicitly supported according to the framework header
docs.
Signed-off-by: Phil Dennis-Jordan <p...@philjordan.eu>
---
hw/display/apple-gfx.m | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
diff --git a/hw/display/apple-gfx.m b/hw/display/apple-gfx.m
index 8b0459f969..b10c060d9a 100644
--- a/hw/display/apple-gfx.m
+++ b/hw/display/apple-gfx.m
@@ -28,8 +28,6 @@
#define TYPE_APPLE_GFX "apple-gfx"
-#define MAX_MRS 512
-
static const PGDisplayCoord_t apple_gfx_modes[] = {
{ .x = 1440, .y = 1080 },
{ .x = 1280, .y = 1024 },
@@ -149,11 +147,7 @@ static uint64_t apple_gfx_read(void *opaque, hwaddr
offset, unsigned size)
AppleGFXState *s = opaque;
uint64_t res = 0;
- switch (offset) {
- default:
- res = [s->pgdev mmioReadAtOffset:offset];
- break;
- }
+ res = [s->pgdev mmioReadAtOffset:offset];
trace_apple_gfx_read(offset, res);
@@ -248,7 +242,6 @@ static void apple_gfx_fb_update_display(void *opaque)
}
id<MTLBlitCommandEncoder> blitCommandEncoder = [mipmapCommandBuffer
blitCommandEncoder];
- [blitCommandEncoder generateMipmapsForTexture:s->texture];
[blitCommandEncoder endEncoding];
[mipmapCommandBuffer commit];
[mipmapCommandBuffer waitUntilCompleted];
@@ -460,14 +453,6 @@ static void apple_gfx_realize(DeviceState *dev, Error
**errp)
}
};
- desc.addTraceRange = ^(PGPhysicalMemoryRange_t * _Nonnull range,
PGTraceRangeHandler _Nonnull handler) {
- /* Never saw this called. Return a bogus pointer so we catch access. */
- return (PGTraceRange_t *)(void *)(uintptr_t)0x4242;
- };
-
- desc.removeTraceRange = ^(PGTraceRange_t * _Nonnull range) {
- /* Never saw this called. Nothing to do. */
- };
s->pgdev = PGNewDeviceWithDescriptor(desc);
[disp_desc init];
--
2.39.3 (Apple Git-146)
