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

Commit 3addc4e3 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'linux-4.6' of git://github.com/skeggsb/linux into drm-fixes 

Single nouveau regression fix
* 'linux-4.6' of git://github.com/skeggsb/linux:
  drm/nouveau/kms: fix setting of default values for dithering properties
parents 762ce445 38bdcfc1

drivers/gpu/drm/nouveau/nouveau_connector.c

+2 −2
Original line number Diff line number Diff line
@@ -1276,18 +1276,18 @@ nouveau_connector_create(struct drm_device *dev, int index) 
		break;

	default:

		if (disp->dithering_mode) {

			nv_connector->dithering_mode = DITHERING_MODE_AUTO;

			drm_object_attach_property(&connector->base,

						   disp->dithering_mode,

						   nv_connector->

						   dithering_mode);

			nv_connector->dithering_mode = DITHERING_MODE_AUTO;

		}

		if (disp->dithering_depth) {

			nv_connector->dithering_depth = DITHERING_DEPTH_AUTO;

			drm_object_attach_property(&connector->base,

						   disp->dithering_depth,

						   nv_connector->

						   dithering_depth);

			nv_connector->dithering_depth = DITHERING_DEPTH_AUTO;

		}

		break;

	}