Commit 703fa264 authored by Pierre Moreau's avatar Pierre Moreau Committed by Ben Skeggs
Browse files

drm/nouveau: Display Nouveau boot options at launch 



It can help to remove any ambiguity about which options were passed to Nouveau,
especially in case the user had some options set in /etc/modprobe.d/*.conf that
he forgot about, as they won't appear in a dmesg.

Signed-off-by: default avatarPierre Moreau <pierre.morrow@free.fr>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent a2410f5a

drivers/gpu/drm/nouveau/nouveau_chan.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#include "nouveau_abi16.h"



MODULE_PARM_DESC(vram_pushbuf, "Create DMA push buffers in VRAM");

static int nouveau_vram_pushbuf;

int nouveau_vram_pushbuf;

module_param_named(vram_pushbuf, nouveau_vram_pushbuf, int, 0400);



int

drivers/gpu/drm/nouveau/nouveau_chan.h

+2 −0
Original line number Diff line number Diff line
@@ -47,4 +47,6 @@ int nouveau_channel_new(struct nouveau_drm *, struct nvif_device *, 
void nouveau_channel_del(struct nouveau_channel **);

int  nouveau_channel_idle(struct nouveau_channel *);



extern int nouveau_vram_pushbuf;



#endif

drivers/gpu/drm/nouveau/nouveau_connector.c

+3 −3
Original line number Diff line number Diff line
@@ -45,15 +45,15 @@ 
#include <nvif/event.h>



MODULE_PARM_DESC(tv_disable, "Disable TV-out detection");

static int nouveau_tv_disable = 0;

int nouveau_tv_disable = 0;

module_param_named(tv_disable, nouveau_tv_disable, int, 0400);



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

static int nouveau_ignorelid = 0;

int nouveau_ignorelid = 0;

module_param_named(ignorelid, nouveau_ignorelid, int, 0400);



MODULE_PARM_DESC(duallink, "Allow dual-link TMDS (default: enabled)");

static int nouveau_duallink = 1;

int nouveau_duallink = 1;

module_param_named(duallink, nouveau_duallink, int, 0400);



struct nouveau_encoder *

drivers/gpu/drm/nouveau/nouveau_connector.h

+4 −0
Original line number Diff line number Diff line
@@ -105,4 +105,8 @@ nouveau_crtc_connector_get(struct nouveau_crtc *nv_crtc) 
struct drm_connector *

nouveau_connector_create(struct drm_device *, int index);



extern int nouveau_tv_disable;

extern int nouveau_ignorelid;

extern int nouveau_duallink;



#endif /* __NOUVEAU_CONNECTOR_H__ */

drivers/gpu/drm/nouveau/nouveau_drm.c

+20 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
#include "nouveau_fence.h"

#include "nouveau_debugfs.h"

#include "nouveau_usif.h"

#include "nouveau_connector.h"



MODULE_PARM_DESC(config, "option string to pass to driver core");

static char *nouveau_config;
@@ -1028,6 +1029,23 @@ static int nouveau_pmops_runtime_idle(struct device *dev) 
	return 1;

}



static void nouveau_display_options(void)

{

	DRM_DEBUG_DRIVER("Loading Nouveau with parameters:\n");



	DRM_DEBUG_DRIVER("... tv_disable   : %d\n", nouveau_tv_disable);

	DRM_DEBUG_DRIVER("... ignorelid    : %d\n", nouveau_ignorelid);

	DRM_DEBUG_DRIVER("... duallink     : %d\n", nouveau_duallink);

	DRM_DEBUG_DRIVER("... nofbaccel    : %d\n", nouveau_nofbaccel);

	DRM_DEBUG_DRIVER("... config       : %s\n", nouveau_config);

	DRM_DEBUG_DRIVER("... debug        : %s\n", nouveau_debug);

	DRM_DEBUG_DRIVER("... noaccel      : %d\n", nouveau_noaccel);

	DRM_DEBUG_DRIVER("... modeset      : %d\n", nouveau_modeset);

	DRM_DEBUG_DRIVER("... runpm        : %d\n", nouveau_runtime_pm);

	DRM_DEBUG_DRIVER("... vram_pushbuf : %d\n", nouveau_vram_pushbuf);

	DRM_DEBUG_DRIVER("... pstate       : %d\n", nouveau_pstate);

}



static const struct dev_pm_ops nouveau_pm_ops = {

	.suspend = nouveau_pmops_suspend,

	.resume = nouveau_pmops_resume,
@@ -1093,6 +1111,8 @@ nouveau_drm_init(void) 
	driver_platform = driver_stub;

	driver_platform.set_busid = drm_platform_set_busid;



	nouveau_display_options();



	if (nouveau_modeset == -1) {

#ifdef CONFIG_VGA_CONSOLE

		if (vgacon_text_force())

CRA Git | Maintained and supported by SUSTech CRA and CCSE