Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afa3b60c authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-switcheroo-fixes' into drm-testing 

* drm-switcheroo-fixes:
  drm/kms: disable/enable poll around switcheroo on/off
  drm/nouveau: fixup confusion over which handle the DSM is hanging off.
  drm/nouveau: attempt to get bios from ACPI v3
parents c09a3502 fbf81762

drivers/gpu/drm/drm_crtc_helper.c

+22 −6
Original line number Diff line number Diff line
@@ -860,19 +860,24 @@ static void output_poll_execute(struct slow_work *work) 
	}

}



void drm_kms_helper_poll_init(struct drm_device *dev)

void drm_kms_helper_poll_disable(struct drm_device *dev)

{

	if (!dev->mode_config.poll_enabled)

		return;

	delayed_slow_work_cancel(&dev->mode_config.output_poll_slow_work);

}

EXPORT_SYMBOL(drm_kms_helper_poll_disable);



void drm_kms_helper_poll_enable(struct drm_device *dev)

{

	struct drm_connector *connector;

	bool poll = false;

	struct drm_connector *connector;

	int ret;



	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {

		if (connector->polled)

			poll = true;

	}

	slow_work_register_user(THIS_MODULE);

	delayed_slow_work_init(&dev->mode_config.output_poll_slow_work,

			       &output_poll_ops);



	if (poll) {

		ret = delayed_slow_work_enqueue(&dev->mode_config.output_poll_slow_work, DRM_OUTPUT_POLL_PERIOD);
@@ -880,11 +885,22 @@ void drm_kms_helper_poll_init(struct drm_device *dev) 
			DRM_ERROR("delayed enqueue failed %d\n", ret);

	}

}

EXPORT_SYMBOL(drm_kms_helper_poll_enable);



void drm_kms_helper_poll_init(struct drm_device *dev)

{

	slow_work_register_user(THIS_MODULE);

	delayed_slow_work_init(&dev->mode_config.output_poll_slow_work,

			       &output_poll_ops);

	dev->mode_config.poll_enabled = true;



	drm_kms_helper_poll_enable(dev);

}

EXPORT_SYMBOL(drm_kms_helper_poll_init);



void drm_kms_helper_poll_fini(struct drm_device *dev)

{

	delayed_slow_work_cancel(&dev->mode_config.output_poll_slow_work);

	drm_kms_helper_poll_disable(dev);

	slow_work_unregister_user(THIS_MODULE);

}

EXPORT_SYMBOL(drm_kms_helper_poll_fini);

drivers/gpu/drm/i915/i915_dma.c

+3 −1
Original line number Diff line number Diff line
@@ -1399,12 +1399,14 @@ static void i915_switcheroo_set_state(struct pci_dev *pdev, enum vga_switcheroo_ 
	struct drm_device *dev = pci_get_drvdata(pdev);

	pm_message_t pmm = { .event = PM_EVENT_SUSPEND };

	if (state == VGA_SWITCHEROO_ON) {

		printk(KERN_INFO "i915: switched off\n");

		printk(KERN_INFO "i915: switched on\n");

		/* i915 resume handler doesn't set to D0 */

		pci_set_power_state(dev->pdev, PCI_D0);

		i915_resume(dev);

		drm_kms_helper_poll_enable(dev);

	} else {

		printk(KERN_ERR "i915: switched off\n");

		drm_kms_helper_poll_disable(dev);

		i915_suspend(dev, pmm);

	}

}

drivers/gpu/drm/nouveau/nouveau_acpi.c

+63 −8
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
static struct nouveau_dsm_priv {

	bool dsm_detected;

	acpi_handle dhandle;

	acpi_handle dsm_handle;

	acpi_handle rom_handle;

} nouveau_dsm_priv;



static const char nouveau_dsm_muid[] = {
@@ -107,9 +107,9 @@ static int nouveau_dsm_set_discrete_state(acpi_handle handle, enum vga_switchero 
static int nouveau_dsm_switchto(enum vga_switcheroo_client_id id)

{

	if (id == VGA_SWITCHEROO_IGD)

		return nouveau_dsm_switch_mux(nouveau_dsm_priv.dsm_handle, NOUVEAU_DSM_LED_STAMINA);

		return nouveau_dsm_switch_mux(nouveau_dsm_priv.dhandle, NOUVEAU_DSM_LED_STAMINA);

	else

		return nouveau_dsm_switch_mux(nouveau_dsm_priv.dsm_handle, NOUVEAU_DSM_LED_SPEED);

		return nouveau_dsm_switch_mux(nouveau_dsm_priv.dhandle, NOUVEAU_DSM_LED_SPEED);

}



static int nouveau_dsm_power_state(enum vga_switcheroo_client_id id,
@@ -118,7 +118,7 @@ static int nouveau_dsm_power_state(enum vga_switcheroo_client_id id, 
	if (id == VGA_SWITCHEROO_IGD)

		return 0;



	return nouveau_dsm_set_discrete_state(nouveau_dsm_priv.dsm_handle, state);

	return nouveau_dsm_set_discrete_state(nouveau_dsm_priv.dhandle, state);

}



static int nouveau_dsm_init(void)
@@ -151,18 +151,18 @@ static bool nouveau_dsm_pci_probe(struct pci_dev *pdev) 
	dhandle = DEVICE_ACPI_HANDLE(&pdev->dev);

	if (!dhandle)

		return false;



	status = acpi_get_handle(dhandle, "_DSM", &nvidia_handle);

	if (ACPI_FAILURE(status)) {

		return false;

	}



	ret= nouveau_dsm(nvidia_handle, NOUVEAU_DSM_SUPPORTED,

	ret = nouveau_dsm(dhandle, NOUVEAU_DSM_SUPPORTED,

			  NOUVEAU_DSM_SUPPORTED_FUNCTIONS, &result);

	if (ret < 0)

		return false;



	nouveau_dsm_priv.dhandle = dhandle;

	nouveau_dsm_priv.dsm_handle = nvidia_handle;

	return true;

}
@@ -173,6 +173,7 @@ static bool nouveau_dsm_detect(void) 
	struct pci_dev *pdev = NULL;

	int has_dsm = 0;

	int vga_count = 0;



	while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev)) != NULL) {

		vga_count++;
@@ -180,7 +181,7 @@ static bool nouveau_dsm_detect(void) 
	}



	if (vga_count == 2 && has_dsm) {

		acpi_get_name(nouveau_dsm_priv.dsm_handle, ACPI_FULL_PATHNAME, &buffer);

		acpi_get_name(nouveau_dsm_priv.dhandle, ACPI_FULL_PATHNAME, &buffer);

		printk(KERN_INFO "VGA switcheroo: detected DSM switching method %s handle\n",

		       acpi_method_name);

		nouveau_dsm_priv.dsm_detected = true;
@@ -204,3 +205,57 @@ void nouveau_unregister_dsm_handler(void) 
{

	vga_switcheroo_unregister_handler();

}



/* retrieve the ROM in 4k blocks */

static int nouveau_rom_call(acpi_handle rom_handle, uint8_t *bios,

			    int offset, int len)

{

	acpi_status status;

	union acpi_object rom_arg_elements[2], *obj;

	struct acpi_object_list rom_arg;

	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL};



	rom_arg.count = 2;

	rom_arg.pointer = &rom_arg_elements[0];



	rom_arg_elements[0].type = ACPI_TYPE_INTEGER;

	rom_arg_elements[0].integer.value = offset;



	rom_arg_elements[1].type = ACPI_TYPE_INTEGER;

	rom_arg_elements[1].integer.value = len;



	status = acpi_evaluate_object(rom_handle, NULL, &rom_arg, &buffer);

	if (ACPI_FAILURE(status)) {

		printk(KERN_INFO "failed to evaluate ROM got %s\n", acpi_format_exception(status));

		return -ENODEV;

	}

	obj = (union acpi_object *)buffer.pointer;

	memcpy(bios+offset, obj->buffer.pointer, len);

	kfree(buffer.pointer);

	return len;

}



bool nouveau_acpi_rom_supported(struct pci_dev *pdev)

{

	acpi_status status;

	acpi_handle dhandle, rom_handle;



	if (!nouveau_dsm_priv.dsm_detected)

		return false;



	dhandle = DEVICE_ACPI_HANDLE(&pdev->dev);

	if (!dhandle)

		return false;



	status = acpi_get_handle(dhandle, "_ROM", &rom_handle);

	if (ACPI_FAILURE(status))

		return false;



	nouveau_dsm_priv.rom_handle = rom_handle;

	return true;

}



int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len)

{

	return nouveau_rom_call(nouveau_dsm_priv.rom_handle, bios, offset, len);

}

drivers/gpu/drm/nouveau/nouveau_bios.c

+20 −0
Original line number Diff line number Diff line
@@ -178,6 +178,25 @@ static void load_vbios_pci(struct drm_device *dev, uint8_t *data) 
	pci_disable_rom(dev->pdev);

}



static void load_vbios_acpi(struct drm_device *dev, uint8_t *data)

{

	int i;

	int ret;

	int size = 64 * 1024;



	if (!nouveau_acpi_rom_supported(dev->pdev))

		return;



	for (i = 0; i < (size / ROM_BIOS_PAGE); i++) {

		ret = nouveau_acpi_get_bios_chunk(data,

						  (i * ROM_BIOS_PAGE),

						  ROM_BIOS_PAGE);

		if (ret <= 0)

			break;

	}

	return;

}



struct methods {

	const char desc[8];

	void (*loadbios)(struct drm_device *, uint8_t *);
@@ -191,6 +210,7 @@ static struct methods nv04_methods[] = { 
};



static struct methods nv50_methods[] = {

	{ "ACPI", load_vbios_acpi, true },

	{ "PRAMIN", load_vbios_pramin, true },

	{ "PROM", load_vbios_prom, false },

	{ "PCIROM", load_vbios_pci, true },

drivers/gpu/drm/nouveau/nouveau_drv.h

+5 −0
Original line number Diff line number Diff line
@@ -851,12 +851,17 @@ extern int nouveau_dma_init(struct nouveau_channel *); 
extern int  nouveau_dma_wait(struct nouveau_channel *, int slots, int size);



/* nouveau_acpi.c */

#define ROM_BIOS_PAGE 4096

#if defined(CONFIG_ACPI)

void nouveau_register_dsm_handler(void);

void nouveau_unregister_dsm_handler(void);

int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len);

bool nouveau_acpi_rom_supported(struct pci_dev *pdev);

#else

static inline void nouveau_register_dsm_handler(void) {}

static inline void nouveau_unregister_dsm_handler(void) {}

static inline bool nouveau_acpi_rom_supported(struct pci_dev *pdev) { return false; }

static inline int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len) { return -EINVAL; }

#endif



/* nouveau_backlight.c */