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

Commit a1470890 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau: report LVDS as disconnected if lid closed 



Also adds a module option to ignore the status reported via ACPI, in case
we hit systems with broken ACPI.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 58d65b84

drivers/gpu/drm/nouveau/nouveau_connector.c

+7 −0
Original line number Diff line number Diff line
@@ -24,9 +24,12 @@ 
 *

 */



#include <acpi/button.h>



#include "drmP.h"

#include "drm_edid.h"

#include "drm_crtc_helper.h"



#include "nouveau_reg.h"

#include "nouveau_drv.h"

#include "nouveau_encoder.h"
@@ -235,6 +238,10 @@ nouveau_connector_detect(struct drm_connector *connector) 
	if (connector->connector_type == DRM_MODE_CONNECTOR_LVDS)

		nv_encoder = find_encoder_by_type(connector, OUTPUT_LVDS);

	if (nv_encoder && nv_connector->native_mode) {

#ifdef CONFIG_ACPI

		if (!nouveau_ignorelid && !acpi_lid_open())

			return connector_status_disconnected;

#endif

		nouveau_connector_set_encoder(connector, nv_encoder);

		return connector_status_connected;

	}

drivers/gpu/drm/nouveau/nouveau_drv.c

+4 −0
Original line number Diff line number Diff line
@@ -71,6 +71,10 @@ MODULE_PARM_DESC(uscript_tmds, "TMDS output script table ID (>=GeForce 8)"); 
int nouveau_uscript_tmds = -1;

module_param_named(uscript_tmds, nouveau_uscript_tmds, int, 0400);



MODULE_PARM_DESC(ignorelid, "Ignore ACPI lid status");

int nouveau_ignorelid = 0;

module_param_named(ignorelid, nouveau_ignorelid, int, 0400);



MODULE_PARM_DESC(tv_norm, "Default TV norm.\n"

		 "\t\tSupported: PAL, PAL-M, PAL-N, PAL-Nc, NTSC-M, NTSC-J,\n"

		 "\t\t\thd480i, hd480p, hd576i, hd576p, hd720p, hd1080i.\n"

drivers/gpu/drm/nouveau/nouveau_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -677,6 +677,7 @@ extern char *nouveau_tv_norm; 
extern int nouveau_reg_debug;

extern char *nouveau_vbios;

extern int nouveau_ctxfw;

extern int nouveau_ignorelid;



/* nouveau_state.c */

extern void nouveau_preclose(struct drm_device *dev, struct drm_file *);