Commit 4a16dd9d authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/kms: switch to drm fbdev helpers 



This removes support for accelerated fbcon rendering, and fixes a number
of races/crashes/issues around suspend/resume/module unload etc.

Losing HW accelerated rendering isn't ideal, but it's been significantly
reduced in performance since the removal of accelerated scrolling in the
kernel anyway - not to mention, can be racey (skips cpu<->gpu sync) from
certain contexts.

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

drivers/gpu/drm/nouveau/Kbuild

+0 −4
Original line number Diff line number Diff line
@@ -54,10 +54,6 @@ nouveau-y += nouveau_bios.o 
nouveau-y += nouveau_connector.o

nouveau-y += nouveau_display.o

nouveau-y += nouveau_dp.o

nouveau-y += nouveau_fbcon.o

nouveau-y += nv04_fbcon.o

nouveau-y += nv50_fbcon.o

nouveau-y += nvc0_fbcon.o

include $(src)/dispnv04/Kbuild

include $(src)/dispnv50/Kbuild

drivers/gpu/drm/nouveau/dispnv04/crtc.c

+1 −9
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
 * DEALINGS IN THE SOFTWARE.

 */

#include <drm/drm_crtc_helper.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_fourcc.h>

#include <drm/drm_plane_helper.h>

#include <drm/drm_vblank.h>
@@ -37,7 +38,6 @@ 
#include "nouveau_crtc.h"

#include "hw.h"

#include "nvreg.h"

#include "nouveau_fbcon.h"

#include "disp.h"

#include "nouveau_dma.h"
@@ -915,14 +915,6 @@ nv04_crtc_mode_set_base_atomic(struct drm_crtc *crtc, 
			       struct drm_framebuffer *fb,

			       int x, int y, enum mode_set_atomic state)

{

	struct nouveau_drm *drm = nouveau_drm(crtc->dev);

	struct drm_device *dev = drm->dev;



	if (state == ENTER_ATOMIC_MODE_SET)

		nouveau_fbcon_accel_save_disable(dev);

	else

		nouveau_fbcon_accel_restore(dev);



	return nv04_crtc_do_mode_set_base(crtc, fb, x, y, true);

}

drivers/gpu/drm/nouveau/dispnv50/disp.c

+1 −2
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ 
#include "nouveau_connector.h"

#include "nouveau_encoder.h"

#include "nouveau_fence.h"

#include "nouveau_fbcon.h"



#include <subdev/bios/dp.h>
@@ -2446,7 +2445,7 @@ nv50_disp_atomic_state_alloc(struct drm_device *dev) 
static const struct drm_mode_config_funcs

nv50_disp_func = {

	.fb_create = nouveau_user_framebuffer_create,

	.output_poll_changed = nouveau_fbcon_output_poll_changed,

	.output_poll_changed = drm_fb_helper_output_poll_changed,

	.atomic_check = nv50_disp_atomic_check,

	.atomic_commit = nv50_disp_atomic_commit,

	.atomic_state_alloc = nv50_disp_atomic_state_alloc,

drivers/gpu/drm/nouveau/nouveau_display.c

+7 −3
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include <drm/drm_probe_helper.h>

#include <drm/drm_vblank.h>



#include "nouveau_fbcon.h"

#include "nouveau_crtc.h"

#include "nouveau_gem.h"

#include "nouveau_connector.h"
@@ -392,7 +391,7 @@ nouveau_user_framebuffer_create(struct drm_device *dev, 


static const struct drm_mode_config_funcs nouveau_mode_config_funcs = {

	.fb_create = nouveau_user_framebuffer_create,

	.output_poll_changed = nouveau_fbcon_output_poll_changed,

	.output_poll_changed = drm_fb_helper_output_poll_changed,

};
@@ -788,6 +787,9 @@ nouveau_display_suspend(struct drm_device *dev, bool runtime) 
{

	struct nouveau_display *disp = nouveau_display(dev);



	/* Disable console. */

	drm_fb_helper_set_suspend_unlocked(dev->fb_helper, true);



	if (drm_drv_uses_atomic_modeset(dev)) {

		if (!runtime) {

			disp->suspend = drm_atomic_helper_suspend(dev);
@@ -815,8 +817,10 @@ nouveau_display_resume(struct drm_device *dev, bool runtime) 
			drm_atomic_helper_resume(dev, disp->suspend);

			disp->suspend = NULL;

		}

		return;

	}



	/* Enable console. */

	drm_fb_helper_set_suspend_unlocked(dev->fb_helper, false);

}



int

drivers/gpu/drm/nouveau/nouveau_drm.c

+6 −8
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <drm/drm_aperture.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_drv.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_gem_ttm_helper.h>

#include <drm/drm_ioctl.h>

#include <drm/drm_vblank.h>
@@ -62,7 +63,6 @@ 
#include "nouveau_bios.h"

#include "nouveau_ioctl.h"

#include "nouveau_abi16.h"

#include "nouveau_fbcon.h"

#include "nouveau_fence.h"

#include "nouveau_debugfs.h"

#include "nouveau_usif.h"
@@ -611,7 +611,6 @@ nouveau_drm_device_init(struct drm_device *dev) 
	nouveau_hwmon_init(dev);

	nouveau_svm_init(drm);

	nouveau_dmem_init(drm);

	nouveau_fbcon_init(dev);

	nouveau_led_init(dev);



	if (nouveau_pmops_runtime()) {
@@ -655,7 +654,6 @@ nouveau_drm_device_fini(struct drm_device *dev) 
	}



	nouveau_led_fini(dev);

	nouveau_fbcon_fini(dev);

	nouveau_dmem_fini(drm);

	nouveau_svm_fini(drm);

	nouveau_hwmon_fini(dev);
@@ -809,6 +807,11 @@ static int nouveau_drm_probe(struct pci_dev *pdev, 
	if (ret)

		goto fail_drm_dev_init;



	if (nouveau_drm(drm_dev)->client.device.info.ram_size <= 32 * 1024 * 1024)

		drm_fbdev_generic_setup(drm_dev, 8);

	else

		drm_fbdev_generic_setup(drm_dev, 32);



	quirk_broken_nv_runpm(pdev);

	return 0;
@@ -865,8 +868,6 @@ nouveau_do_suspend(struct drm_device *dev, bool runtime) 
	nouveau_led_suspend(dev);



	if (dev->mode_config.num_crtc) {

		NV_DEBUG(drm, "suspending console...\n");

		nouveau_fbcon_set_suspend(dev, 1);

		NV_DEBUG(drm, "suspending display...\n");

		ret = nouveau_display_suspend(dev, runtime);

		if (ret)
@@ -940,8 +941,6 @@ nouveau_do_resume(struct drm_device *dev, bool runtime) 
	if (dev->mode_config.num_crtc) {

		NV_DEBUG(drm, "resuming display...\n");

		nouveau_display_resume(dev, runtime);

		NV_DEBUG(drm, "resuming console...\n");

		nouveau_fbcon_set_suspend(dev, 0);

	}



	nouveau_led_resume(dev);
@@ -1296,7 +1295,6 @@ static void nouveau_display_options(void) 
	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);