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

Commit e225f446 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau: rename nvd0_display to nv50_display to reflect reality since merge 



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

drivers/gpu/drm/nouveau/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ nouveau-y += nv04_dac.o nv04_dfp.o nv04_tv.o nv17_tv.o nv17_tv_modes.o 
nouveau-y += nv04_crtc.o nv04_display.o nv04_cursor.o



# drm/kms/nv50-

nouveau-y += nvd0_display.o

nouveau-y += nv50_display.o



# drm/pm

nouveau-y += nouveau_pm.o nouveau_volt.o nouveau_perf.o

drivers/gpu/drm/nouveau/nouveau_crtc.h

+0 −7
Original line number Diff line number Diff line
@@ -82,13 +82,6 @@ static inline struct drm_crtc *to_drm_crtc(struct nouveau_crtc *crtc) 
	return &crtc->base;

}



int nv50_crtc_create(struct drm_device *dev, int index);

int nv50_crtc_cursor_set(struct drm_crtc *drm_crtc, struct drm_file *file_priv,

			 uint32_t buffer_handle, uint32_t width,

			 uint32_t height);

int nv50_crtc_cursor_move(struct drm_crtc *drm_crtc, int x, int y);



int nv04_cursor_init(struct nouveau_crtc *);

int nv50_cursor_init(struct nouveau_crtc *);



#endif /* __NOUVEAU_CRTC_H__ */

drivers/gpu/drm/nouveau/nouveau_display.c

+2 −2
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ nouveau_display_create(struct drm_device *dev) 
		if (nv_device(drm->device)->card_type < NV_50)

			ret = nv04_display_create(dev);

		else

			ret = nvd0_display_create(dev);

			ret = nv50_display_create(dev);

		if (ret)

			goto disp_create_err;
@@ -657,7 +657,7 @@ nouveau_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb, 


	/* Emit a page flip */

	if (nv_device(drm->device)->card_type >= NV_50) {

		ret = nvd0_display_flip_next(crtc, fb, chan, 0);

		ret = nv50_display_flip_next(crtc, fb, chan, 0);

		if (ret) {

			mutex_unlock(&chan->cli->mutex);

			goto fail_unreserve;

drivers/gpu/drm/nouveau/nouveau_encoder.h

+0 −4
Original line number Diff line number Diff line
@@ -97,9 +97,5 @@ void nouveau_dp_dpms(struct drm_encoder *, int mode, u32 datarate, 


struct nouveau_connector *

nouveau_encoder_connector_get(struct nouveau_encoder *encoder);

int nv50_sor_create(struct drm_connector *, struct dcb_output *);

void nv50_sor_dp_calc_tu(struct drm_device *, int, int, u32, u32);

int nv50_dac_create(struct drm_connector *, struct dcb_output *);





#endif /* __NOUVEAU_ENCODER_H__ */

drivers/gpu/drm/nouveau/nvd0_display.c→drivers/gpu/drm/nouveau/nv50_display.c

+254 −254

File changed and moved.

Preview size limit exceeded, changes collapsed.