From 50ca8cc7c0fdd9ab16b8b66ffb301fface101fac Mon Sep 17 00:00:00 2001

From: Zack Rusin <zackr@vmware.com>

Date: Wed, 15 Dec 2021 13:41:47 -0500

Subject: drm/vmwgfx: Remove unused compile options

Git-commit: 50ca8cc7c0fdd9ab16b8b66ffb301fface101fac

Patch-mainline: v5.17-rc1

References: bsc#1152472

Before the driver had screen targets support we had to disable explicit

bringup of its infrastructure because it was breaking screen objects

support.

Since the implementation of screen targets landed there hasn't been a

reason to explicitly disable it and the options were never used.

Remove of all that unused code.

Signed-off-by: Zack Rusin <zackr@vmware.com>

Fixes: d80efd5cb3de ("drm/vmwgfx: Initial DX support")

Reviewed-by: Martin Krastev <krastevm@vmware.com>

Link: https://patchwork.freedesktop.org/patch/msgid/20211215184147.3688785-3-zack@kde.org

(cherry picked from commit 11343099d5ae6c7411da1425b6b162c89fb5bf10)

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>

Acked-by: Thomas Zimmermann <tzimmermann@suse.de>

---

 drivers/gpu/drm/vmwgfx/vmwgfx_drv.h  |    3 ---

 drivers/gpu/drm/vmwgfx/vmwgfx_mob.c  |   12 +++---------

 drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c |    4 ++--

 3 files changed, 5 insertions(+), 14 deletions(-)

--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h

+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h

@@ -61,11 +61,8 @@

 #define VMWGFX_DRIVER_MINOR 18

 #define VMWGFX_DRIVER_PATCHLEVEL 0

 #define VMWGFX_FIFO_STATIC_SIZE (1024*1024)

-#define VMWGFX_MAX_RELOCATIONS 2048

-#define VMWGFX_MAX_VALIDATIONS 2048

 #define VMWGFX_MAX_DISPLAYS 16

 #define VMWGFX_CMD_BOUNCE_INIT_SIZE 32768

-#define VMWGFX_ENABLE_SCREEN_TARGET_OTABLE 1

 /*

  * Perhaps we should have sysfs entries for these.

--- a/drivers/gpu/drm/vmwgfx/vmwgfx_mob.c

+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_mob.c

@@ -1,7 +1,7 @@

 // SPDX-License-Identifier: GPL-2.0 OR MIT

 /**************************************************************************

  *

- * Copyright 2012-2015 VMware, Inc., Palo Alto, CA., USA

+ * Copyright 2012-2021 VMware, Inc., Palo Alto, CA., USA

  *

  * Permission is hereby granted, free of charge, to any person obtaining a

  * copy of this software and associated documentation files (the

@@ -29,12 +29,6 @@

 #include "vmwgfx_drv.h"

-/*

- * If we set up the screen target otable, screen objects stop working.

- */

-

-#define VMW_OTABLE_SETUP_SUB ((VMWGFX_ENABLE_SCREEN_TARGET_OTABLE ? 0 : 1))

-

 #ifdef CONFIG_64BIT

 #define VMW_PPN_SIZE 8

 #define VMW_MOBFMT_PTDEPTH_0 SVGA3D_MOBFMT_PTDEPTH64_0

@@ -75,7 +69,7 @@ static const struct vmw_otable pre_dx_ta

 	{VMWGFX_NUM_GB_CONTEXT * SVGA3D_OTABLE_CONTEXT_ENTRY_SIZE, NULL, true},

 	{VMWGFX_NUM_GB_SHADER * SVGA3D_OTABLE_SHADER_ENTRY_SIZE, NULL, true},

 	{VMWGFX_NUM_GB_SCREEN_TARGET * SVGA3D_OTABLE_SCREEN_TARGET_ENTRY_SIZE,

-	 NULL, VMWGFX_ENABLE_SCREEN_TARGET_OTABLE}

+	 NULL, true}

 };

 static const struct vmw_otable dx_tables[] = {

@@ -84,7 +78,7 @@ static const struct vmw_otable dx_tables

 	{VMWGFX_NUM_GB_CONTEXT * SVGA3D_OTABLE_CONTEXT_ENTRY_SIZE, NULL, true},

 	{VMWGFX_NUM_GB_SHADER * SVGA3D_OTABLE_SHADER_ENTRY_SIZE, NULL, true},

 	{VMWGFX_NUM_GB_SCREEN_TARGET * SVGA3D_OTABLE_SCREEN_TARGET_ENTRY_SIZE,

-	 NULL, VMWGFX_ENABLE_SCREEN_TARGET_OTABLE},

+	 NULL, true},

 	{VMWGFX_NUM_DXCONTEXT * sizeof(SVGAOTableDXContextEntry), NULL, true},

 };

--- a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c

+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c

@@ -1865,8 +1865,8 @@ int vmw_kms_stdu_init_display(struct vmw

 	int i, ret;

-	/* Do nothing if Screen Target support is turned off */

-	if (!VMWGFX_ENABLE_SCREEN_TARGET_OTABLE || !dev_priv->has_mob)

+	/* Do nothing if there's no support for MOBs */

+	if (!dev_priv->has_mob)

 		return -ENOSYS;

 	if (!(dev_priv->capabilities & SVGA_CAP_GBOBJECTS))