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

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

Merge branch 'linux-4.10' of git://github.com/skeggsb/linux into drm-next 

- Initial atomic modesetting support.  Used for "legacy" KMS interfaces,
ioctl not exposed by default, but there is a commandline option to
enable it.
- Initial DP 1.2 MST support
- Misc other code cleanups + fixes

* 'linux-4.10' of git://github.com/skeggsb/linux: (64 commits)
  drm/nouveau/fifo/gf100-: protect channel preempt with subdev mutex
  drm/nouveau/gr: fallback to legacy paths during firmware lookup
  drm/nouveau/kms/nv50: initial support for DP 1.2 multi-stream
  drm/nouveau/kms/nv50: allow encoder update to be called from other modules
  drm/nouveau/kms/nv50: rename remaining nv50_crtc to nv50_head
  drm/nouveau/kms/nv50: remove code to create ctxdma for every framebuffer
  drm/nouveau/kms/nv50: remove code to support non-atomic page flips
  drm/nouveau/kms/nv50: remove code to support non-atomic connector properties
  drm/nouveau/kms/nv50: remove code to support non-atomic dpms
  drm/nouveau/kms/nv50: remove code to support non-atomic modesets
  drm/nouveau/kms/nv50: transition to atomic interfaces internally
  drm/nouveau/kms/nv50: turn mode_set_base_atomic() into a stub
  drm/nouveau/kms/nv50: convert encoder mode_fixup into an atomic_check()
  drm/nouveau/kms/nv50: clean-up encoder functions
  drm/nouveau/kms/nv50: ensure encoder normal power state is enabled at startup
  drm/nouveau/kms/nv50: prepare ctxdma interface to be usable with atomic
  drm/nouveau/kms/nv50: separate out cursor channel commit
  drm/nouveau/kms/nv50: separate out base channel commit
  drm/nouveau/kms/nv50: separate out vblank dmi commit
  drm/nouveau/kms/nv50: separate out procamp commit
  ...
parents 7b624ad8 b27add13

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

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

#include "nouveau_display.h"

#include "nvreg.h"



#include "disp.h"



struct nouveau_plane {

	struct drm_plane base;

drivers/gpu/drm/nouveau/include/nvif/cl5070.h

+17 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ struct nv50_disp_mthd_v1 { 
#define NV50_DISP_MTHD_V1_SOR_HDMI_PWR                                     0x22

#define NV50_DISP_MTHD_V1_SOR_LVDS_SCRIPT                                  0x23

#define NV50_DISP_MTHD_V1_SOR_DP_PWR                                       0x24

#define NV50_DISP_MTHD_V1_SOR_DP_MST_LINK                                  0x25

#define NV50_DISP_MTHD_V1_SOR_DP_MST_VCPI                                  0x26

#define NV50_DISP_MTHD_V1_PIOR_PWR                                         0x30

	__u8  method;

	__u16 hasht;
@@ -90,6 +92,21 @@ struct nv50_disp_sor_dp_pwr_v0 { 
	__u8  pad02[6];

};



struct nv50_disp_sor_dp_mst_link_v0 {

	__u8  version;

	__u8  state;

	__u8  pad02[6];

};



struct nv50_disp_sor_dp_mst_vcpi_v0 {

	__u8  version;

	__u8  pad01[1];

	__u8  start_slot;

	__u8  num_slots;

	__u16 pbn;

	__u16 aligned_pbn;

};



struct nv50_disp_pior_pwr_v0 {

	__u8  version;

	__u8  state;

drivers/gpu/drm/nouveau/include/nvif/object.h

+29 −0
Original line number Diff line number Diff line
@@ -66,6 +66,35 @@ void nvif_object_unmap(struct nvif_object *); 


#define nvif_mthd(a,b,c,d) nvif_object_mthd((a), (b), (c), (d))



struct nvif_mclass {

	s32 oclass;

	int version;

};



#define nvif_mclass(o,m) ({                                                    \

	struct nvif_object *object = (o);                                      \

	struct nvif_sclass *sclass;                                            \

	const typeof(m[0]) *mclass = (m);                                      \

	int ret = -ENODEV;                                                     \

	int cnt, i, j;                                                         \

                                                                               \

	cnt = nvif_object_sclass_get(object, &sclass);                         \

	if (cnt >= 0) {                                                        \

		for (i = 0; ret < 0 && mclass[i].oclass; i++) {                \

			for (j = 0; j < cnt; j++) {                            \

				if (mclass[i].oclass  == sclass[j].oclass &&   \

				    mclass[i].version >= sclass[j].minver &&   \

				    mclass[i].version <= sclass[j].maxver) {   \

					ret = i;                               \

					break;                                 \

				}                                              \

			}                                                      \

		}                                                              \

		nvif_object_sclass_put(&sclass);                               \

	}                                                                      \

	ret;                                                                   \

})



/*XXX*/

#include <core/object.h>

#define nvxx_object(a) ({                                                      \

drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h

+3 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ int gk104_fb_new(struct nvkm_device *, int, struct nvkm_fb **); 
int gk20a_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int gm107_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int gm200_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int gm20b_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int gp100_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int gp104_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
@@ -156,4 +157,6 @@ struct nvkm_ram_func { 
	int (*prog)(struct nvkm_ram *);

	void (*tidy)(struct nvkm_ram *);

};



extern const u8 gf100_pte_storage_type_map[256];

#endif

drivers/gpu/drm/nouveau/nouveau_bios.c

+3 −0
Original line number Diff line number Diff line
@@ -333,6 +333,9 @@ get_fp_strap(struct drm_device *dev, struct nvbios *bios) 
	if (bios->major_version < 5 && bios->data[0x48] & 0x4)

		return NVReadVgaCrtc5758(dev, 0, 0xf) & 0xf;



	if (drm->device.info.family >= NV_DEVICE_INFO_V0_MAXWELL)

		return nvif_rd32(device, 0x001800) & 0x0000000f;

	else

	if (drm->device.info.family >= NV_DEVICE_INFO_V0_TESLA)

		return (nvif_rd32(device, NV_PEXTDEV_BOOT_0) >> 24) & 0xf;

	else