Skip to content

Commit

Permalink
drm/nouveau/kms/nv50-: Expose nv50_outp_atom in disp.h
Browse files Browse the repository at this point in the history
In order to make sure that we flush disable updates at the right time
when disabling CRCs, we'll need to be able to look at the outp state to
see if we're changing it at the same time that we're disabling CRCs.

So, expose the struct in disp.h.

Signed-off-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Ben Skeggs <bskeggs@redhat.com>
Acked-by: Dave Airlie <airlied@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200627194657.156514-8-lyude@redhat.com
  • Loading branch information
Lyude Paul committed Jul 16, 2020
1 parent dbdaf71 commit ebec884
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 18 deletions.
18 changes: 0 additions & 18 deletions drivers/gpu/drm/nouveau/dispnv50/disp.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,24 +57,6 @@

#include <subdev/bios/dp.h>

/******************************************************************************
* Atomic state
*****************************************************************************/

struct nv50_outp_atom {
struct list_head head;

struct drm_encoder *encoder;
bool flush_disable;

union nv50_outp_atom_mask {
struct {
bool ctrl:1;
};
u8 mask;
} set, clr;
};

/******************************************************************************
* EVO channel
*****************************************************************************/
Expand Down
14 changes: 14 additions & 0 deletions drivers/gpu/drm/nouveau/dispnv50/disp.h
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,20 @@ struct nv50_dmac {
struct mutex lock;
};

struct nv50_outp_atom {
struct list_head head;

struct drm_encoder *encoder;
bool flush_disable;

union nv50_outp_atom_mask {
struct {
bool ctrl:1;
};
u8 mask;
} set, clr;
};

int nv50_dmac_create(struct nvif_device *device, struct nvif_object *disp,
const s32 *oclass, u8 head, void *data, u32 size,
u64 syncbuf, struct nv50_dmac *dmac);
Expand Down

0 comments on commit ebec884

Please sign in to comment.