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

Commit e7b07cee authored by Harry Wentland's avatar Harry Wentland Committed by Alex Deucher
Browse files

drm/amd/display: Merge amdgpu_dm_types and amdgpu_dm 



This separation stopped making sense a long time ago.

Signed-off-by: default avatarHarry Wentland <harry.wentland@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarHarry Wentland <Harry.Wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1515a47b

drivers/gpu/drm/amd/display/amdgpu_dm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 






AMDGPUDM = amdgpu_dm_types.o amdgpu_dm.o amdgpu_dm_irq.o amdgpu_dm_mst_types.o

AMDGPUDM = amdgpu_dm.o amdgpu_dm_irq.o amdgpu_dm_mst_types.o



ifneq ($(CONFIG_DRM_AMD_DC),)

AMDGPUDM += amdgpu_dm_services.o amdgpu_dm_helpers.o

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+3243 −2

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h

+105 −3
Original line number Diff line number Diff line
@@ -26,9 +26,9 @@ 
#ifndef __AMDGPU_DM_H__

#define __AMDGPU_DM_H__



/*

#include "linux/switch.h"

*/

#include <drm/drmP.h>

#include <drm/drm_atomic.h>

#include "dc.h"



/*

 * This file contains the definition for amdgpu_display_manager
@@ -173,4 +173,106 @@ struct amdgpu_connector *amdgpu_dm_find_first_crct_matching_connector( 
	struct drm_crtc *crtc,

	bool from_state_var);





struct amdgpu_framebuffer;

struct amdgpu_display_manager;

struct dc_validation_set;

struct dc_surface;

/* TODO rename to dc_stream_state */

struct  dc_stream;





struct dm_plane_state {

	struct drm_plane_state base;

	struct dc_surface *surface;

};



struct dm_crtc_state {

	struct drm_crtc_state base;

	struct dc_stream *stream;

};



#define to_dm_crtc_state(x)    container_of(x, struct dm_crtc_state, base)



struct dm_atomic_state {

	struct drm_atomic_state base;



	struct validate_context *context;

};



#define to_dm_atomic_state(x) container_of(x, struct dm_atomic_state, base)





/*TODO Jodan Hersen use the one in amdgpu_dm*/

int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm,

			struct amdgpu_plane *aplane,

			unsigned long possible_crtcs);

int amdgpu_dm_crtc_init(struct amdgpu_display_manager *dm,

			struct drm_plane *plane,

			uint32_t link_index);

int amdgpu_dm_connector_init(struct amdgpu_display_manager *dm,

			struct amdgpu_connector *amdgpu_connector,

			uint32_t link_index,

			struct amdgpu_encoder *amdgpu_encoder);

int amdgpu_dm_encoder_init(

	struct drm_device *dev,

	struct amdgpu_encoder *aencoder,

	uint32_t link_index);



void amdgpu_dm_crtc_destroy(struct drm_crtc *crtc);

void amdgpu_dm_connector_destroy(struct drm_connector *connector);

void amdgpu_dm_encoder_destroy(struct drm_encoder *encoder);



int amdgpu_dm_connector_get_modes(struct drm_connector *connector);



int amdgpu_dm_atomic_commit(

		struct drm_device *dev,

		struct drm_atomic_state *state,

		bool nonblock);



void amdgpu_dm_atomic_commit_tail(

	struct drm_atomic_state *state);



int amdgpu_dm_atomic_check(struct drm_device *dev,

				struct drm_atomic_state *state);



void amdgpu_dm_connector_funcs_reset(struct drm_connector *connector);

struct drm_connector_state *amdgpu_dm_connector_atomic_duplicate_state(

	struct drm_connector *connector);

int amdgpu_dm_connector_atomic_set_property(

	struct drm_connector *connector,

	struct drm_connector_state *state,

	struct drm_property *property,

	uint64_t val);



int amdgpu_dm_connector_atomic_get_property(

	struct drm_connector *connector,

	const struct drm_connector_state *state,

	struct drm_property *property,

	uint64_t *val);



int amdgpu_dm_get_encoder_crtc_mask(struct amdgpu_device *adev);



void amdgpu_dm_connector_init_helper(

	struct amdgpu_display_manager *dm,

	struct amdgpu_connector *aconnector,

	int connector_type,

	struct dc_link *link,

	int link_index);



int amdgpu_dm_connector_mode_valid(

	struct drm_connector *connector,

	struct drm_display_mode *mode);



void dm_restore_drm_connector_state(struct drm_device *dev, struct drm_connector *connector);



void amdgpu_dm_add_sink_to_freesync_module(

		struct drm_connector *connector,

		struct edid *edid);



void amdgpu_dm_remove_sink_from_freesync_module(

		struct drm_connector *connector);



extern const struct drm_encoder_helper_funcs amdgpu_dm_encoder_helper_funcs;



#endif /* __AMDGPU_DM_H__ */

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
#include "dc.h"

#include "amdgpu_dm.h"

#include "amdgpu_dm_irq.h"

#include "amdgpu_dm_types.h"



#include "dm_helpers.h"

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <drm/drm_atomic_helper.h>

#include "dm_services.h"

#include "amdgpu.h"

#include "amdgpu_dm_types.h"

#include "amdgpu_dm.h"

#include "amdgpu_dm_mst_types.h"



#include "dc.h"