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

Commit 59c0f578 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nv50-nvc0: rename disp->evo to disp->master 



More appropriate, and we're about to be using more than just the master
EVO channel.

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

drivers/gpu/drm/nouveau/nv50_crtc.c

+6 −6
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ nv50_crtc_blank(struct nouveau_crtc *nv_crtc, bool blanked) 
{

	struct drm_device *dev = nv_crtc->base.dev;

	struct drm_nouveau_private *dev_priv = dev->dev_private;

	struct nouveau_channel *evo = nv50_display(dev)->evo;

	struct nouveau_channel *evo = nv50_display(dev)->master;

	int index = nv_crtc->index, ret;



	NV_DEBUG_KMS(dev, "index %d\n", nv_crtc->index);
@@ -135,7 +135,7 @@ static int 
nv50_crtc_set_dither(struct nouveau_crtc *nv_crtc, bool on, bool update)

{

	struct drm_device *dev = nv_crtc->base.dev;

	struct nouveau_channel *evo = nv50_display(dev)->evo;

	struct nouveau_channel *evo = nv50_display(dev)->master;

	int ret;



	NV_DEBUG_KMS(dev, "\n");
@@ -185,7 +185,7 @@ nv50_crtc_set_scale(struct nouveau_crtc *nv_crtc, int scaling_mode, bool update) 
	struct nouveau_connector *nv_connector =

		nouveau_crtc_connector_get(nv_crtc);

	struct drm_device *dev = nv_crtc->base.dev;

	struct nouveau_channel *evo = nv50_display(dev)->evo;

	struct nouveau_channel *evo = nv50_display(dev)->master;

	struct drm_display_mode *native_mode = NULL;

	struct drm_display_mode *mode = &nv_crtc->base.mode;

	uint32_t outX, outY, horiz, vert;
@@ -459,7 +459,7 @@ static void 
nv50_crtc_commit(struct drm_crtc *crtc)

{

	struct drm_device *dev = crtc->dev;

	struct nouveau_channel *evo = nv50_display(dev)->evo;

	struct nouveau_channel *evo = nv50_display(dev)->master;

	struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);

	int ret;
@@ -493,7 +493,7 @@ nv50_crtc_do_mode_set_base(struct drm_crtc *crtc, 
	struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);

	struct drm_device *dev = nv_crtc->base.dev;

	struct drm_nouveau_private *dev_priv = dev->dev_private;

	struct nouveau_channel *evo = nv50_display(dev)->evo;

	struct nouveau_channel *evo = nv50_display(dev)->master;

	struct drm_framebuffer *drm_fb = nv_crtc->base.fb;

	struct nouveau_framebuffer *fb = nouveau_framebuffer(drm_fb);

	int ret, format;
@@ -616,7 +616,7 @@ nv50_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *mode, 
		   struct drm_framebuffer *old_fb)

{

	struct drm_device *dev = crtc->dev;

	struct nouveau_channel *evo = nv50_display(dev)->evo;

	struct nouveau_channel *evo = nv50_display(dev)->master;

	struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);

	struct nouveau_connector *nv_connector = NULL;

	uint32_t hsync_dur,  vsync_dur, hsync_start_to_end, vsync_start_to_end;

drivers/gpu/drm/nouveau/nv50_cursor.c

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ nv50_cursor_show(struct nouveau_crtc *nv_crtc, bool update) 
{

	struct drm_device *dev = nv_crtc->base.dev;

	struct drm_nouveau_private *dev_priv = dev->dev_private;

	struct nouveau_channel *evo = nv50_display(dev)->evo;

	struct nouveau_channel *evo = nv50_display(dev)->master;

	int ret;



	NV_DEBUG_KMS(dev, "\n");
@@ -73,7 +73,7 @@ nv50_cursor_hide(struct nouveau_crtc *nv_crtc, bool update) 
{

	struct drm_device *dev = nv_crtc->base.dev;

	struct drm_nouveau_private *dev_priv = dev->dev_private;

	struct nouveau_channel *evo = nv50_display(dev)->evo;

	struct nouveau_channel *evo = nv50_display(dev)->master;

	int ret;



	NV_DEBUG_KMS(dev, "\n");

drivers/gpu/drm/nouveau/nv50_dac.c

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ nv50_dac_disconnect(struct drm_encoder *encoder) 
{

	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);

	struct drm_device *dev = encoder->dev;

	struct nouveau_channel *evo = nv50_display(dev)->evo;

	struct nouveau_channel *evo = nv50_display(dev)->master;

	int ret;



	if (!nv_encoder->crtc)
@@ -215,7 +215,7 @@ nv50_dac_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode, 
{

	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);

	struct drm_device *dev = encoder->dev;

	struct nouveau_channel *evo = nv50_display(dev)->evo;

	struct nouveau_channel *evo = nv50_display(dev)->master;

	struct nouveau_crtc *crtc = nouveau_crtc(encoder->crtc);

	uint32_t mode_ctl = 0, mode_ctl2 = 0;

	int ret;

drivers/gpu/drm/nouveau/nv50_display.c

+2 −2
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ nv50_display_init(struct drm_device *dev) 
	ret = nv50_evo_init(dev);

	if (ret)

		return ret;

	evo = nv50_display(dev)->evo;

	evo = nv50_display(dev)->master;



	nv_wr32(dev, NV50_PDISPLAY_OBJECTS, (evo->ramin->vinst >> 8) | 9);
@@ -202,7 +202,7 @@ static int nv50_display_disable(struct drm_device *dev) 
{

	struct drm_nouveau_private *dev_priv = dev->dev_private;

	struct nv50_display *disp = nv50_display(dev);

	struct nouveau_channel *evo = disp->evo;

	struct nouveau_channel *evo = disp->master;

	struct drm_crtc *drm_crtc;

	int ret, i;

drivers/gpu/drm/nouveau/nv50_display.h

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



struct nv50_display {

	struct nouveau_channel *evo;

	struct nouveau_channel *master;

	u32 evo_alloc;



	struct {